Open
Conversation
Author
|
test |
# Conflicts: # mixtape_jump.py
# Conflicts: # mixtape_jump.py
# Conflicts: # mixtape_jump.py
# Conflicts: # mixtape_jump.py
initialized the rapper amount in list initialized the score initialized the probability of spawn Given __init__ created score label created title specified location of image player
# Conflicts: # mixtape_jump.py
initializes text that follows string rapperScore allows function to be called when rapperScore changes adds the widget on screen
# Conflicts: # mixtape_jump.py
Created multiple enemy objects Created a positions and movements of the rappers randomized positions to create difficulty only x movements added a new list that appends solely for scores
screen function when pressed (kivy) triggers player to move up or fall down
created function gameOver(self) created function restart_button(obj) created initalizaiton of restart button changes update of clock created the touch release of button
created function gameOver(self) created function restart_button(obj) created initalizaiton of restart button changes update of clock created the touch release of button
created parameter to refer to time created random integer to spawn rappers created difficulty scaling as time passes by with minProb created collision statement scheduling clock times removing rappers from temporary list as well as append score to rapperScore call k.update() 60 times /second
created parameter to refer to time created random integer to spawn rappers created difficulty scaling as time passes by with minProb created collision statement scheduling clock times removing rappers from temporary list as well as append score to rapperScore call k.update() 60 times /second
Initializes the game created holder for buttons and initialization initialize app linked to GUI created clock schedule add app as a widget
Initializes the game created holder for buttons and initialization initialize app linked to GUI created clock schedule add app as a widget
# Conflicts: # mixtape_jump.py
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
testing merge