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 |
|
jonspacz
|
46e2b601f4
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:44:28 +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
|
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 |
|
|
|
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 |
|
|
|
1ef4d65045
|
Implemented loading entities from json
|
2020-04-05 22:49:50 +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 |
|
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 |
|
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 |
|
Wirus
|
cceb1d50c6
|
add sand texture to map
|
2020-04-05 22:07:37 +02:00 |
|
|
|
d7ff3037cd
|
Added sprite removal method
|
2020-04-05 21:06:45 +02:00 |
|
|
|
c91c82d80a
|
Fixed bug: not being able to rotate with specific collisions
|
2020-04-05 20:47:24 +02:00 |
|
|
|
8557eabb97
|
Merge remote-tracking branch 'origin/MapNew'
|
2020-04-05 20:37:12 +02:00 |
|
|
|
161e869e9f
|
Merge remote-tracking branch 'origin/Player'
# Conflicts:
# src/game/Game.py
|
2020-04-05 20:33: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 |
|
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 |
|
|
|
6efd5652dd
|
Implemented proper player movement
|
2020-04-05 14:49:37 +02:00 |
|
|
|
277a84b72e
|
Added player movement
|
2020-04-04 21:33:39 +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 |
|
|
|
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
|
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 |
|
|
|
14fac73279
|
Implemented screen initialization
|
2020-04-02 16:49:03 +02:00 |
|
|
|
5e33e55396
|
initialized pygame
|
2020-04-02 15:50:47 +02:00 |
|
|
|
1c28b3a644
|
Initialized classes & file structure
|
2020-03-31 21:47:09 +02:00 |
|
