Skip to content

Teste #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brunagcf wants to merge 91 commits into
base: dev_projeto
Choose a base branch
from
Open

Teste #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
dc6930f
Delete MOSTRAR HJ
Labourguignonn Apr 26, 2023
601066b
Delete personagemback.py
Labourguignonn Apr 26, 2023
058c2d8
modified: __pycache__/button.cpython-311.pyc
brunagcf Apr 26, 2023
e685cd9
modified: __pycache__/button.cpython-311.pyc
Apr 26, 2023
7abbcd1
new file: codigoruss.py
fabriely Apr 27, 2023
5d0eca2
modified: __pycache__/button.cpython-311.pyc
fabriely Apr 27, 2023
7a56e7d
modified: jogador.py
fabriely Apr 27, 2023
513cc0a
modified: __pycache__/jogador.cpython-311.pyc
fabriely Apr 27, 2023
356a2d7
modified: __pycache__/button.cpython-311.pyc
Apr 27, 2023
36049af
new file: img/7.png
Apr 27, 2023
91251ba
classes juntas
fabriely Apr 27, 2023
7767f27
modified: __pycache__/button.cpython-311.pyc
Apr 27, 2023
81a0cff
modified: world.py
Apr 27, 2023
4057e40
modified: __pycache__/button.cpython-311.pyc
fabriely Apr 27, 2023
c956f0f
modified: "fun\303\247oes.py"
Apr 28, 2023
c849623
modified: __pycache__/button.cpython-311.pyc
Apr 28, 2023
980f5d8
Update world.py
fabriely Apr 28, 2023
b5976fa
Update level1_data.csv
fabriely Apr 28, 2023
8dc3aeb
Add HealthBar Class in life.py
matnrocha Apr 28, 2023
ca072f0
Create faby testa
Labourguignonn Apr 29, 2023
6e9b20c
deleted: faby testa
Apr 30, 2023
713e3ef
Merge pull request #3 from Labourguignonn/feature/world
Labourguignonn Apr 30, 2023
50445c5
Update world.py
Labourguignonn Apr 30, 2023
3ef80e7
modified: __pycache__/button.cpython-311.pyc
Apr 30, 2023
2f8dc5f
Merge pull request #4 from Labourguignonn/feature/world
Labourguignonn Apr 30, 2023
5437089
feature Life mod
matnrocha Apr 30, 2023
0b6d023
Deleting "__pycache__"
matnrocha Apr 30, 2023
b7ae26f
Merge branch 'feature-life' into dev_branch
matnrocha Apr 30, 2023
367f0a5
Add files via upload
Labourguignonn May 1, 2023
c3ef25a
modified: codigoruss.py
fabriely May 1, 2023
30cd77c
deleted: 4.png
fabriely May 1, 2023
e81613c
modified: world.py
fabriely May 2, 2023
bf48f46
modified: personagem/Attack/0.png
fabriely May 2, 2023
1f7c2d7
Update level1_data.csv
Labourguignonn May 2, 2023
b34c690
Delete 2.png
Labourguignonn May 2, 2023
5b45ddb
Add files via upload
Labourguignonn May 2, 2023
83a4ee8
new file: 4.png
fabriely May 2, 2023
946f45d
modified: __pycache__/button.cpython-311.pyc
May 2, 2023
23a5f05
Merge pull request #5 from Labourguignonn/feature/world
Labourguignonn May 2, 2023
c44ec72
Rename main.py to editing_level.py
Labourguignonn May 2, 2023
cd5fc60
Rename world.py to main.py
Labourguignonn May 2, 2023
2efdb77
modified: __pycache__/button.cpython-311.pyc
fabriely May 2, 2023
95c34be
Merge branch 'dev_branch' of https://github.com/Labourguignonn/JOGO-I…
fabriely May 2, 2023
0738eed
modified: __pycache__/button.cpython-311.pyc
May 2, 2023
5f8296e
classe dos inimigos adicionado
PedroCLins May 3, 2023
a1c7cdc
Add files via upload
Labourguignonn May 4, 2023
1af5a70
modified: __pycache__/button.cpython-311.pyc
May 4, 2023
6797b19
modified: __pycache__/button.cpython-311.pyc
fabriely May 4, 2023
a78c4d6
modified: enemies.py
fabriely May 5, 2023
4ce0452
modified: __pycache__/enemies.cpython-311.pyc
fabriely May 5, 2023
5ef8d80
modified: teste_vida.py
fabriely May 5, 2023
a8529fa
modified: potion.py
fabriely May 5, 2023
5a6d2e7
deleted: "fun\303\247oes.py"
fabriely May 5, 2023
6bfc443
modified: teste_vida.py
fabriely May 5, 2023
657edbb
modified: img/enemy/Death/0.png
fabriely May 5, 2023
3ed2795
new file: BG.jpg
fabriely May 5, 2023
7307077
Create Attack
fabriely May 5, 2023
6d2e9b9
Delete Attack
fabriely May 5, 2023
6614c0e
modified: teste_vida.py
fabriely May 5, 2023
adf29dc
renamed: teste_vida.py -> antigo.py
fabriely May 5, 2023
d5e160c
Merge branch 'teste' of https://github.com/Labourguignonn/JOGO-IP int…
fabriely May 5, 2023
43253dc
Adiciona história-Menu
matnrocha May 6, 2023
c793b8e
Melhorando Menu
matnrocha May 6, 2023
d747f90
Add files via upload
brunagcf May 6, 2023
10e1cfd
Delete Hurt.png
fabriely May 6, 2023
cfadb92
Fix menu
matnrocha May 6, 2023
56e2739
Merge branch 'teste' of https://github.com/Labourguignonn/JOGO-IP int…
matnrocha May 6, 2023
1a67428
Nova imagem menu
matnrocha May 6, 2023
810ccf4
muda menu
matnrocha May 6, 2023
c72310c
colocando background no menu
matnrocha May 6, 2023
1d4bb4b
Cria table no menu
matnrocha May 6, 2023
5492be2
Contador e animacao consertados
brunagcf May 6, 2023
dc76ad6
Delete 0.png
Labourguignonn May 7, 2023
eec5870
Delete 1.png
Labourguignonn May 7, 2023
6e46e35
Delete 2.png
Labourguignonn May 7, 2023
f502e77
Delete 3.png
Labourguignonn May 7, 2023
3840962
Delete 4.png
Labourguignonn May 7, 2023
8080d92
Delete 5.png
Labourguignonn May 7, 2023
55854bf
Add files via upload
Labourguignonn May 7, 2023
264a383
modified: jogador.py
May 7, 2023
0180f78
cria botão restart
matnrocha May 7, 2023
b0519f2
new file: Minecraftia-Regular.ttf
May 7, 2023
da75776
Merge branch 'teste' of https://github.com/Labourguignonn/JOGO-IP int…
May 7, 2023
25b1b29
muda tela de menu
matnrocha May 7, 2023
2fa26ec
coloca frase no game over
matnrocha May 7, 2023
8fa592f
frase no game over
matnrocha May 7, 2023
29a8834
muda estética menu
matnrocha May 7, 2023
29ba1b1
mudança na frase de game over
matnrocha May 7, 2023
6f5add8
fix bugs in game over
matnrocha May 7, 2023
4bc21c9
corrige bug morte
matnrocha May 7, 2023
95f7108
readme
brunagcf May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added BG.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
356 changes: 0 additions & 356 deletions CODIGOATUAL
View file
Open in desktop

This file was deleted.

Loading