s444409/DSZI_Survival
s444409/DSZI_Survival
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
305 Commits 13 Branches 0 Tags 10 MiB
649b61a84e
Commit Graph

305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcin Kostrzewski
c46745f8c0 Merge remote-tracking branch 'origin/MapNew' into EntityCreator 2020-04-05 23:15:28 +02:00
Marcin Kostrzewski
91c5ca4e98 Added entities images 2020-04-05 23:14:56 +02:00
Marcin Kostrzewski
617ee0c2c2 Added sample entities 2020-04-05 23:14:34 +02:00
Marcin Kostrzewski
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
Marcin Kostrzewski
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
Marcin Kostrzewski
15a2010c5d Merge remote-tracking branch 'origin/entities_branch' into EntityCreator 
# Conflicts:
#	src/entities/Collidable.py
 2020-04-05 22:20:06 +02:00
Marcin Kostrzewski
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
Marcin Kostrzewski
5c80033a0b Added getStatistic method & enum 2020-04-05 22:04:40 +02:00
Marcin Kostrzewski
dc7023adfa Fixed: statistics now change by invoking methods instead of variable change 2020-04-05 22:02:15 +02:00
Marcin Kostrzewski
a0bbee30d1 Player movement now costs stamina 2020-04-05 21:59:40 +02:00
Marcin Kostrzewski
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
Marcin Kostrzewski
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
Marcin Kostrzewski
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
Marcin Kostrzewski
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
Wirus
55fb38aa0a add water texture to Map 2020-04-05 21:46:04 +02:00
Michał Czekański
900e8e2203 Add ui fields in Ui class 2020-04-05 21:39:08 +02:00
jonspacz
404d2f1b50 deleted not needed Map elements from Pickupable 2020-04-05 21:36:58 +02:00
jonspacz
a9ca435cca Merge remote-tracking branch 'origin/MapNew' into MapNew 
# Conflicts:
#	src/entities/Collidable.py
 2020-04-05 21:29:11 +02:00
Wirus
061455605d Merge branch 'entities_branch' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew 2020-04-05 22:44:43 +02:00
Wirus
5446217628 add rabbit.png 2020-04-05 22:20:01 +02:00
Wirus
cceb1d50c6 add sand texture to map 2020-04-05 22:07:37 +02:00
Wirus
36fbdbab62 Map: removeSpriteFromMap 2020-04-05 21:18:11 +02:00
Wirus
93f3df85fe Merge branch 'MapNew' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew 2020-04-05 21:12:34 +02:00
jonspacz
242635038a Merge remote-tracking branch 'origin/MapNew' into MapNew 2020-04-05 21:11:42 +02:00
Marcin Kostrzewski
d7ff3037cd Added sprite removal method 2020-04-05 21:06:45 +02:00
jonspacz
b2c8333c93 Merge branch 'MapNew' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew 2020-04-05 20:50:17 +02:00
Marcin Kostrzewski
c91c82d80a Fixed bug: not being able to rotate with specific collisions 2020-04-05 20:47:24 +02:00
Marcin Kostrzewski
8557eabb97 Merge remote-tracking branch 'origin/MapNew' 2020-04-05 20:37:12 +02:00
jonspacz
057f711317 Removed Collidable because was not useful finished todo in pickupable and added Statistics to contstructor 2020-04-05 20:34:45 +02:00
Marcin Kostrzewski
161e869e9f Merge remote-tracking branch 'origin/Player' 
# Conflicts:
#	src/game/Game.py
 2020-04-05 20:33:21 +02:00
jonspacz
169a931329 Merge remote-tracking branch 'origin/MapNew' into entities_branch 
# Conflicts:
#	src/entities/Collidable.py
 2020-04-05 20:27:21 +02:00
jonspacz
78929e44c3 Merge branch 'entities_branch' into MapNew 
# Conflicts:
#	src/entities/Collidable.py
 2020-04-05 20:25:46 +02:00
Wirus
f399ba0d53 add entity to collidables in Map method 2020-04-05 20:24:28 +02:00
Wirus
c121519605 move collision to Map class 2020-04-05 20:20:37 +02:00
Wirus
853a3b1601 Map: collidable group of sprites 
TerrainTile: position attributes
EventManager: collision method
 2020-04-05 19:08:08 +02:00
Michał Czekański
cbb9508c19 Add method addLinesToConsoleAndScrollToDisplayThem in UiConsole 2020-04-05 19:06:15 +02:00