Commit Graph

378 Commits

Author SHA1 Message Date
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
46441b94c9 Removed redundant argument 2020-04-03 23:09:00 +02:00
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
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
9e9fb7c4b2 Merge remote-tracking branch 'origin/drawTesting' 2020-04-03 22:12:38 +02:00
e78099deb1 Moved sprite group initialization higher in order 2020-04-03 22:08:27 +02:00
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
46712749b6 Added alpha draw method 2020-04-02 18:31:21 +02:00
f535da1594 Added basic events 2020-04-02 17:30:25 +02:00
e8a8739c9d Paths are now relative to runnable script 2020-04-02 16:55:19 +02:00
db2f12846d Added runnable script 2020-04-02 16:54:55 +02:00
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
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
1c28b3a644 Initialized classes & file structure 2020-03-31 21:47:09 +02:00
eaef37c5a2 Spelling 2020-03-02 18:42:01 +00:00
6c8037c603 initial commit 2020-03-02 19:41:00 +01:00