PyCut v1.1.1 #39
Merged
PyCut v1.1.1 #39
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k3Y//WaFUx8bdKUapy0rJ8I72l/IFU7U1hjOAXXwe7DtxnLbTb2ICF+DngaXI6hC toeJH20Xks9pGV1UuRtVdELU4kz+0o/CBAOP2uAIg+qE/4U8uRxjsqx3PWmoKg8b IeMsJtOan6lS2ryPUdgQIFwKPRkPclzTitnXmWaBxFaHSTGnc8C+mpUJ4sGkpMA0 7TTN3QBlIeS89Goz8vKiSVnnnMK+W765GvNyedPEC32ECtsGT2NmjeuoFgs3tARs XnJDSU8FycB8zgqsVBYb/MdQ26SIlKV8l29oCUgOL8V7c1gb0ym1ZQOymb6FSlmM B1zcR9I5VpsohNAO9z8BX/ixAHbOc+z2O1WsxHOxiC9eMiwePJp5PNrF2pEQQj27 ffRF83ZzbXT1XBpcxj9flqThaPmBWLwZV6SkXxVGHmK+VAlLzJ8ZAbAnN4UGAENh EzH+/YAMvGGtJ0H2HIx5uOeD6WeQ2/FS9G3XjLUkO1QwwkRddtW42EjDMmW3o2hx XHikFSx+PeDj3VKwmFwR2kJ+f9g7rHAkDNokkNkf7FBVeFiymJmG8ZLkXLZJqDlP KMuJfxn5fzyudBLCqbBm+6MkW8CJ24fTfjTaTgnLZWf4I5IQxLcQ9G4coyS9+zMF t54tWOjuwRHWqrLyZFvI =Nkjc -----END PGP SIGNATURE----- Add some more prerequisites to running that we discovered
Title screen for PyCut
clickable and hoverable buttons and a quit button
adjusted object styles to properly reflect state
moved image assets to game/assets/img
updated PyCut to initialize once
get screen from pygame display
added demo pizza with crust
…ey have not changed.
…ey have not changed.
…scene.py, added a static background object in game_scene.
|
Ooh, wow, this is big. When I have some time, I'll try to dive deeper to see what the issue is with the merge conflict(s). Will take a little bit of rebasing magic. @tcreeds @adf5051 @PatrickGormley When you get a chance, if you could do a bulletpoint changelog, I'll go ahead and formally cut a release after merging this PR in. A changelog will make it 10x easier to write up. Thanks for your help improving PyCut this semester! 💯 💯 💯 |
jwflory
approved these changes
Jan 17, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added advanced mode and optimized rendering.