Mateusz
|
d44274397d
|
describe sprites costs
|
2020-04-25 23:34:49 +02:00 |
|
Mateusz
|
4d6de52e8c
|
add cost attribute
|
2020-04-25 23:33:55 +02:00 |
|
Michał Czekański
|
7d9dd06d09
|
Add import new class in Game.py
|
2020-04-25 23:19:41 +02:00 |
|
Michał Czekański
|
0084750629
|
Add todo at TerrainTile class
|
2020-04-25 23:18:29 +02:00 |
|
|
|
e37a17cadd
|
Added getTileOnCoord method
|
2020-04-25 22:49:57 +02:00 |
|
|
|
5ca1a0b4d0
|
New movement testing
|
2020-04-25 22:02:21 +02:00 |
|
Michał Czekański
|
3f7ed1e4b3
|
Add updating console on players death and closing game after time delay
|
2020-04-06 13:48:36 +02:00 |
|
|
|
deec08cec7
|
Changed alive checking
|
2020-04-06 13:42:56 +02:00 |
|
Michał Czekański
|
b22e69712c
|
Add updating ui bars and updating console on interaction in EventManager
|
2020-04-06 13:20:28 +02:00 |
|
Michał Czekański
|
156f9977e0
|
Add ui updates on player pickup in EventManager
|
2020-04-06 13:13:47 +02:00 |
|
|
|
748e317e2e
|
Merge remote-tracking branch 'origin/development'
# Conflicts:
# environment.md
|
2020-04-06 12:37:01 +02:00 |
|
|
|
89cf106432
|
Loads tiles from file properly on all platforms
|
2020-04-06 12:30:21 +02:00 |
|
|
|
479c6eece7
|
Game now knows the abs path of the program
|
2020-04-06 12:30:03 +02:00 |
|
|
|
e3b3fdd74f
|
Events won't be handled if the player is dead
|
2020-04-06 12:05:57 +02:00 |
|
|
|
87c7198199
|
Player can now interact with interactable entities
|
2020-04-06 10:38:12 +02:00 |
|
|
|
9e7c4f1ae0
|
Map can now load interactable entities
|
2020-04-06 10:35:58 +02:00 |
|
|
|
6d1dc4ffb7
|
Refactor Interactable.py and Pickupable.py
|
2020-04-06 10:33:29 +02:00 |
|
|
|
903a406c74
|
Added invoking sprites update() method every frame
|
2020-04-06 10:25:28 +02:00 |
|
|
|
318f7881a1
|
Fixed imports
|
2020-04-06 09:54:51 +02:00 |
|
Michał Czekański
|
880c0af3c2
|
Move updating time text view to Ui class
|
2020-04-06 01:00:02 +02:00 |
|
Wirus
|
cfd3b05981
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-06 00:43:35 +02:00 |
|
Wirus
|
752284a90d
|
transparent textures
|
2020-04-06 00:43:20 +02:00 |
|
|
|
9a5556ff7b
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
# Conflicts:
# src/entities/Player.py
|
2020-04-06 00:41:37 +02:00 |
|
|
|
bc8474b4c5
|
Player can now pick up items
|
2020-04-06 00:40:16 +02:00 |
|
Michał Czekański
|
b56269888c
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-05 23:59:13 +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
|
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 |
|
