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

257 Commits

Author SHA1 Message Date
Marcin Kostrzewski
05ce54933d Merge remote-tracking branch 'origin/passingEvents' into passingEvents 2020-04-05 23:53:25 +02:00
Marcin Kostrzewski
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
Marcin Kostrzewski
7b34e04665 Fixed syntax 2020-04-05 23:43:15 +02:00
Marcin Kostrzewski
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
Marcin Kostrzewski
c46745f8c0 Merge remote-tracking branch 'origin/MapNew' into EntityCreator 2020-04-05 23:15:28 +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
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
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
Marcin Kostrzewski
d7ff3037cd Added sprite removal method 2020-04-05 21:06:45 +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
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
Wirus
16e361540e Map: delete import Player 2020-04-05 15:51:16 +02:00
Wirus
6a1fe72cab Game: correct declarative order 
Map: collidableTerrain list
 2020-04-05 15:41:42 +02:00
Wirus
c338d6caa1 Merge remote-tracking branch 'origin/Player' into MapNew 2020-04-05 14:54:59 +02:00
Wirus
9d9cd159a0 addEntity method in Map 2020-04-05 14:53:54 +02:00
Marcin Kostrzewski
a264ac7cb1 Refactor to fixed Entity class 2020-04-05 14:52:30 +02:00
Marcin Kostrzewski
d88670f456 Fixed retarded Entity implementation 2020-04-05 14:52:19 +02:00
Marcin Kostrzewski
6efd5652dd Implemented proper player movement 2020-04-05 14:49:37 +02:00
Marcin Kostrzewski
e184e6417b Entity now inherits from pygame.sprite.Sprite 2020-04-05 14:06:56 +02:00
Michał Czekański
8b126f636b Fix adding functions to invoke in UiButton 2020-04-04 21:37:42 +02:00
Michał Czekański
65c9171428 Fix writing console lines when line ind is too small or too big 2020-04-04 21:37:25 +02:00
Marcin Kostrzewski
277a84b72e Added player movement 2020-04-04 21:33:39 +02:00
Marcin Kostrzewski
8c1dad0101 Added move and rotate function 2020-04-04 21:33:24 +02:00
Marcin Kostrzewski
d16711068a Initial player implementation 2020-04-04 20:54:11 +02:00
Marcin Kostrzewski
5e021ca087 Added constructor params 2020-04-04 20:53:33 +02:00
Marcin Kostrzewski
c454d8d328 Updated entity class 2020-04-04 20:53:13 +02:00
Michał Czekański
bf166232f3 Add method addingLines to UiConsole and fix writing on console 2020-04-04 20:49:02 +02:00
jonspacz
9b7011a010 Fixed Collidable and made pickupable 
TODO - make object disappear after pickup
 2020-04-04 20:21:37 +02:00
Marcin Kostrzewski
3d5c8690ff Merge remote-tracking branch 'origin/entities_branch' into Player 2020-04-04 20:06:29 +02:00
Michał Czekański
41b7cd2a3f Fix font assignment in UiButton and UiText init() 2020-04-04 19:24:47 +02:00
Michał Czekański
3ff1b1b7bc Add method writing lines on UiConsole 2020-04-04 19:24:04 +02:00
Michał Czekański
e8a961cddd Fix generating UiConsole image 2020-04-04 18:40:56 +02:00
Michał Czekański
c9e6fac345 Add UiConsole class with __init__ 2020-04-04 18:37:18 +02:00
Michał Czekański
b01eaafdc4 Add invoking functions when UiButton click 2020-04-04 18:26:19 +02:00
Michał Czekański
6fc3a3155d Add button colors parameter, make code clearer in UiButton 2020-04-04 15:48:51 +02:00
Michał Czekański
74a08be69f Add UiButton class 2020-04-04 02:29:33 +02:00
Michał Czekański
429248c4b5 Add method updating UiBar fill 2020-04-04 01:52:01 +02:00
Michał Czekański
8dd2522b16 Add UiText class 2020-04-04 00:35:40 +02:00
Michał Czekański
5e76932a55 Add UiBar class 2020-04-04 00:35:22 +02:00
Michał Czekański
ed1d057be2 Add UiImage class 2020-04-04 00:35:07 +02:00
Marcin Kostrzewski
46441b94c9 Removed redundant argument 2020-04-03 23:09:00 +02:00
Marcin Kostrzewski
6c702dca51 Merge branch 'MapNew' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew 
 Conflicts:
	src/game/Map.py
	src/game/TerrainTile.py
 2020-04-03 23:07:45 +02:00
Marcin Kostrzewski
9ef8d99c61 Fixed map rendering 2020-04-03 23:07:12 +02:00
Michał Czekański
bb29d0cd1f Make UiElement inherit from pygame.sprite.Sprite 2020-04-03 22:55:22 +02:00
Marcin Kostrzewski
9e9fb7c4b2 Merge remote-tracking branch 'origin/drawTesting' 2020-04-03 22:12:38 +02:00
Marcin Kostrzewski
e78099deb1 Moved sprite group initialization higher in order 2020-04-03 22:08:27 +02:00
Marcin Kostrzewski
fcac23a878 Implemented timer functionality 2020-04-03 22:08:12 +02:00
Mateusz Tylka
815eb79452 refactor TerrainTile 2020-04-03 20:23:36 +02:00
Mateusz Tylka
9f95091ff6 gitignore 2020-04-03 19:57:44 +02:00
Mateusz Tylka
6719525d1b gitignore 2020-04-03 19:56:03 +02:00
Mateusz Tylka
5b60ddb8da add all folders 2020-04-03 19:49:53 +02:00
Mateusz Tylka
1e179598f6 drawTerrain in Map class, examle map draw 2020-04-03 19:36:13 +02:00
Marcin Kostrzewski
46712749b6 Added alpha draw method 2020-04-02 18:31:21 +02:00
Marcin Kostrzewski
f535da1594 Added basic events 2020-04-02 17:30:25 +02:00
Marcin Kostrzewski
e8a8739c9d Paths are now relative to runnable script 2020-04-02 16:55:19 +02:00
Marcin Kostrzewski
db2f12846d Added runnable script 2020-04-02 16:54:55 +02:00
Marcin Kostrzewski
14fac73279 Implemented screen initialization 2020-04-02 16:49:03 +02:00
jonspacz
9efad498f7 changed Interactable, Collidable, Npc, Entity 2020-04-02 16:22:17 +02:00
Marcin Kostrzewski
5e33e55396 initialized pygame 2020-04-02 15:50:47 +02:00
jonspacz
ef798b02e7 Added method to collidable to check if a collision occurred. Added = None to each attribute in Entity to stop errors from showing 2020-04-02 13:38:14 +02:00
jonspacz
ff29e52a8d added 4 methods to Statistics class 2020-04-01 14:46:49 +02:00
Marcin Kostrzewski
1c28b3a644 Initialized classes & file structure 2020-03-31 21:47:09 +02:00