Feature potion#7
Open
brunagcf wants to merge 48 commits into
Open
Conversation
new file: "__pycache__/fun\303\247oes.cpython-311.pyc" new file: __pycache__/jogador.cpython-311.pyc new file: "fun\303\247oes.py" new file: jogador.py
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc modified: jogador.py modified: main.py
modified: jogador.py new file: water.py new file: world.py modified: __pycache__/button.cpython-311.pyc modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc modified: img/3.png modified: img/5.png modified: main.py __pycache__/water.cpython-311.pyc __pycache__/world.cpython-311.pyc
modified: "__pycache__/fun\303\247oes.cpython-311.pyc"
modified: __pycache__/jogador.cpython-311.pyc
new file: __pycache__/water.cpython-311.pyc
new file: __pycache__/world.cpython-311.pyc
modified: img/3.png
modified: img/5.png
modified: main.py
modified: __pycache__/jogador.cpython-311.pyc modified: __pycache__/water.cpython-311.pyc modified: __pycache__/world.cpython-311.pyc modified: img/3.png modified: img/5.png deleted: img/7.png modified: main.py deleted: water.py deleted: world.py
modified: __pycache__/water.cpython-311.pyc modified: __pycache__/world.cpython-311.pyc modified: img/3.png modified: img/5.png deleted: img/7.png modified: main.py deleted: water.py deleted: world.py
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc new file: __pycache__/main.cpython-311.pyc modified: img/6.png
new file: img/8.png
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc modified: __pycache__/main.cpython-311.pyc modified: world.py
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc modified: __pycache__/main.cpython-311.pyc modified: jogador.py modified: level1_data.csv modified: main.py modified: world.py
modified: world.py modified: __pycache__/button.cpython-311.pyc modified: "__pycache__/fun\303\247oes.cpython-311.pyc"
modified: "__pycache__/fun\303\247oes.cpython-311.pyc"
Feature/world
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: world.py
Feature/world
deleted: 4.png deleted: 5.png modified: __pycache__/button.cpython-311.pyc modified: "__pycache__/fun\303\247oes.cpython-311.pyc" deleted: personagem/Attack.1.png deleted: personagem/Attack.2.png deleted: personagem/Attack.3.png deleted: personagem/Attack.4.png deleted: personagem/Attack.5.png deleted: personagem/Attack.6.png deleted: personagem/Attack.png deleted: personagem/Death.1.png deleted: personagem/Death.2.png deleted: personagem/Death.3.png deleted: personagem/Death.4.png deleted: personagem/Death.5.png deleted: personagem/Death.6.png deleted: personagem/Death.png deleted: personagem/Hurt.1.png deleted: personagem/Hurt.2.png deleted: personagem/Hurt.png deleted: personagem/Idle.1.png deleted: personagem/Idle.2.png deleted: personagem/Idle.3.png deleted: personagem/Idle.4.png deleted: personagem/Idle.png deleted: personagem/Walk.1.png deleted: personagem/Walk.2.png deleted: personagem/Walk.3.png deleted: personagem/Walk.4.png deleted: personagem/Walk.5.png deleted: personagem/Walk.6.png deleted: personagem/Walk.png modified: world.py personagem/Attack/ personagem/Death/ personagem/Hurt/ personagem/Idle/ personagem/Walk/
deleted: 5.png modified: __pycache__/button.cpython-311.pyc modified: "__pycache__/fun\303\247oes.cpython-311.pyc" renamed: personagem/Attack.png -> personagem/Attack/0.png renamed: personagem/Attack.1.png -> personagem/Attack/1.png renamed: personagem/Attack.2.png -> personagem/Attack/2.png renamed: personagem/Attack.3.png -> personagem/Attack/3.png renamed: personagem/Attack.4.png -> personagem/Attack/4.png renamed: personagem/Attack.5.png -> personagem/Attack/5.png renamed: personagem/Attack.6.png -> personagem/Attack/6.png renamed: personagem/Death.png -> personagem/Death/0.png renamed: personagem/Death.1.png -> personagem/Death/1.png renamed: personagem/Death.2.png -> personagem/Death/2.png renamed: personagem/Death.3.png -> personagem/Death/3.png renamed: personagem/Death.4.png -> personagem/Death/4.png renamed: personagem/Death.5.png -> personagem/Death/5.png renamed: personagem/Death.6.png -> personagem/Death/6.png renamed: personagem/Hurt.png -> personagem/Hurt/0.png renamed: personagem/Hurt.1.png -> personagem/Hurt/1.png renamed: personagem/Hurt.2.png -> personagem/Hurt/2.png renamed: personagem/Idle.png -> personagem/Idle/0.png renamed: personagem/Idle.1.png -> personagem/Idle/1.png renamed: personagem/Idle.2.png -> personagem/Idle/2.png renamed: personagem/Idle.3.png -> personagem/Idle/3.png renamed: personagem/Idle.4.png -> personagem/Idle/4.png renamed: personagem/Walk.png -> personagem/Walk/0.png renamed: personagem/Walk.1.png -> personagem/Walk/1.png renamed: personagem/Walk.2.png -> personagem/Walk/2.png renamed: personagem/Walk.3.png -> personagem/Walk/3.png renamed: personagem/Walk.4.png -> personagem/Walk/4.png renamed: personagem/Walk.5.png -> personagem/Walk/5.png renamed: personagem/Walk.6.png -> personagem/Walk/6.png modified: world.py
modified: personagem/Attack/1.png modified: personagem/Attack/2.png modified: personagem/Attack/3.png modified: personagem/Attack/4.png modified: personagem/Attack/5.png deleted: personagem/Attack/6.png modified: personagem/Death/0.png modified: personagem/Death/1.png modified: personagem/Death/2.png modified: personagem/Death/3.png modified: personagem/Death/4.png modified: personagem/Death/5.png deleted: personagem/Death/6.png modified: personagem/Hurt/0.png modified: personagem/Hurt/1.png deleted: personagem/Hurt/2.png modified: personagem/Idle/0.png modified: personagem/Idle/1.png modified: personagem/Idle/2.png modified: personagem/Idle/3.png deleted: personagem/Idle/4.png modified: personagem/Walk/0.png modified: personagem/Walk/1.png modified: personagem/Walk/2.png modified: personagem/Walk/3.png modified: personagem/Walk/4.png modified: personagem/Walk/5.png deleted: personagem/Walk/6.png modified: world.py
new file: 5.png modified: __pycache__/jogador.cpython-311.pyc modified: img/2.png modified: level1_data.csv modified: world.py
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc modified: main.py
Feature/world
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc new file: __pycache__/life.cpython-311.pyc modified: life.py modified: world.py
…into dev_branch
modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc modified: __pycache__/life.cpython-311.pyc modified: level1_data.csv renamed: world.py -> teste_vida.py
new file: __pycache__/enemies.cpython-311.pyc modified: "__pycache__/fun\303\247oes.cpython-311.pyc" modified: __pycache__/jogador.cpython-311.pyc modified: __pycache__/life.cpython-311.pyc new file: __pycache__/potion.cpython-311.pyc modified: editing_level.py modified: enemies.py modified: level1_data.csv new file: potion.py renamed: rato/idle/Idle_01.png -> rato/idle/0.png renamed: rato/idle/Idle_02.png -> rato/idle/1.png renamed: rato/idle/Idle_03.png -> rato/idle/2.png renamed: rato/idle/Idle_04.png -> rato/idle/3.png renamed: rato/idle/Idle_05.png -> rato/idle/4.png renamed: rato/idle/Idle_06.png -> rato/idle/5.png renamed: rato/idle/Idle_07.png -> rato/idle/6.png renamed: rato/idle/Idle_08.png -> rato/idle/7.png deleted: rato/idle/Idle.png modified: teste_vida.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
5 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.
No description provided.