Michał Czekański
|
73ef580489
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
# Conflicts:
# src/entities/Player.py
|
2020-04-06 00:01:04 +02:00 |
|
Michał Czekański
|
076a377cda
|
Add pass after empty elif in Player
|
2020-04-06 00:00:00 +02:00 |
|
jonspacz
|
732d938e9a
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:59:32 +02:00 |
|
Michał Czekański
|
b56269888c
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:59:13 +02:00 |
|
jonspacz
|
c7793f5c43
|
added rock as a non-pickupable entity
|
2020-04-05 23:59:07 +02:00 |
|
Michał Czekański
|
932073d72a
|
Reformat file Ui.py
|
2020-04-05 23:58:45 +02:00 |
|
|
|
2af94a27e9
|
Fixed filename
|
2020-04-05 23:58:03 +02:00 |
|
Michał Czekański
|
4985794b44
|
Add updating time in top left corner
|
2020-04-05 23:57:53 +02:00 |
|
Michał Czekański
|
0add2066e2
|
Add method updating text in UiText
|
2020-04-05 23:57:28 +02:00 |
|
|
|
05ce54933d
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:53:25 +02:00 |
|
|
|
7d5c07c598
|
Fixed filename
|
2020-04-05 23:53:15 +02:00 |
|
Michał Czekański
|
f7fb38b7ff
|
Bring timer back to Game class
|
2020-04-05 23:51:22 +02:00 |
|
Michał Czekański
|
df83f13bef
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:45:48 +02:00 |
|
Michał Czekański
|
17125f9dd9
|
Add passing events, stats to update Ui when handling events
|
2020-04-05 23:45:19 +02:00 |
|
Michał Czekański
|
0fb5f925d2
|
Add method updating ui based on player stats
|
2020-04-05 23:44:31 +02:00 |
|
jonspacz
|
46e2b601f4
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:44:28 +02:00 |
|
jonspacz
|
1c287d65d4
|
fixed statistics
|
2020-04-05 23:43:53 +02:00 |
|
Michał Czekański
|
a60a46cc53
|
Add method returning stats field from Player
|
2020-04-05 23:43:40 +02:00 |
|
jonspacz
|
a7d7ff840a
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:43:26 +02:00 |
|
jonspacz
|
86d9efe837
|
Merge branch 'passingEvents' of C:\Users\Paul\Desktop\DSZI_Survival with conflicts.
|
2020-04-05 23:43:23 +02:00 |
|
|
|
7b34e04665
|
Fixed syntax
|
2020-04-05 23:43:15 +02:00 |
|
|
|
a06ce53fc1
|
Implemented getEntityOnCoord method
|
2020-04-05 23:42:41 +02:00 |
|
Michał Czekański
|
df040b54f8
|
Merge remote-tracking branch 'origin/Player' into passingEvents
|
2020-04-05 23:26:19 +02:00 |
|
Michał Czekański
|
fd3f7180c8
|
Import Timer in Game class
|
2020-04-05 23:24:51 +02:00 |
|
Michał Czekański
|
a28fab0956
|
Merge branch 'UI' into passingEvents
# Conflicts:
# src/game/Screen.py
|
2020-04-05 23:23:30 +02:00 |
|
|
|
c46745f8c0
|
Merge remote-tracking branch 'origin/MapNew' into EntityCreator
|
2020-04-05 23:15:28 +02:00 |
|
|
|
91c5ca4e98
|
Added entities images
|
2020-04-05 23:14:56 +02:00 |
|
|
|
617ee0c2c2
|
Added sample entities
|
2020-04-05 23:14:34 +02:00 |
|
|
|
864877b866
|
Added loading sprites from json
|
2020-04-05 23:14:21 +02:00 |
|
Michał Czekański
|
967146e45c
|
Add drawing all Ui elems in on screen init
|
2020-04-05 22:58:32 +02:00 |
|
Michał Czekański
|
c822a1bfd4
|
Add calculating pos ui elems in Ui.__init__
|
2020-04-05 22:58:06 +02:00 |
|
|
|
1ef4d65045
|
Implemented loading entities from json
|
2020-04-05 22:49:50 +02:00 |
|
Michał Czekański
|
e73fc03fc4
|
Change how UiText renders text
Now UiText renders specified rect surface and on this surface blits text.
|
2020-04-05 22:37:37 +02:00 |
|
|
|
15a2010c5d
|
Merge remote-tracking branch 'origin/entities_branch' into EntityCreator
# Conflicts:
# src/entities/Collidable.py
|
2020-04-05 22:20:06 +02:00 |
|
|
|
b386eca2f4
|
Merge remote-tracking branch 'origin/entities_branch' into EntityCreator
# Conflicts:
# src/entities/Collidable.py
|
2020-04-05 22:18:06 +02:00 |
|
Michał Czekański
|
7f624fe56e
|
Use colors enum properly in Ui class
|
2020-04-05 22:16:09 +02:00 |
|
Michał Czekański
|
9ddcec6d73
|
Add fields for params in __init__ in UiText
|
2020-04-05 22:15:23 +02:00 |
|
|
|
5c80033a0b
|
Added getStatistic method & enum
|
2020-04-05 22:04:40 +02:00 |
|
|
|
dc7023adfa
|
Fixed: statistics now change by invoking methods instead of variable change
|
2020-04-05 22:02:15 +02:00 |
|
|
|
a0bbee30d1
|
Player movement now costs stamina
|
2020-04-05 21:59:40 +02:00 |
|
|
|
f4e2799009
|
Player class now has statistics
|
2020-04-05 21:59:26 +02:00 |
|
Michał Czekański
|
d6945f2bed
|
Move up initialization of bar height in Ui class
|
2020-04-05 21:58:36 +02:00 |
|
|
|
c5fddf144d
|
Merge remote-tracking branch 'origin/master' into Player
|
2020-04-05 21:56:59 +02:00 |
|
Michał Czekański
|
097dbf1bf4
|
Merge remote-tracking branch 'origin/Time' into UI
|
2020-04-05 21:56:00 +02:00 |
|
|
|
d9c4e9b97b
|
Added timer to main loop
|
2020-04-05 21:54:35 +02:00 |
|
Wirus
|
2f605c2919
|
Game: change player spawnpoint
|
2020-04-05 21:53:10 +02:00 |
|
jonspacz
|
46b9ce8f95
|
changed id to size
|
2020-04-05 21:52:52 +02:00 |
|
Wirus
|
3c8f3e817f
|
Merge branch 'Player' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew
|
2020-04-05 21:49:52 +02:00 |
|
|
|
46d018dbfd
|
Fixed wrong spawnpoint coords
|
2020-04-05 21:48:55 +02:00 |
|
Michał Czekański
|
aec4ddf2d3
|
Add method returning specified screen part width
|
2020-04-05 21:48:43 +02:00 |
|
