|
|
80128684ae
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# environment.md
|
2020-04-06 12:37:17 +02:00 |
|
|
|
748e317e2e
|
Merge remote-tracking branch 'origin/development'
# Conflicts:
# environment.md
|
2020-04-06 12:37:01 +02:00 |
|
|
|
b8a5946a0e
|
Zaktualizuj 'environment.md'
|
2020-04-06 10:36:49 +00:00 |
|
|
|
4b37121db0
|
Zaktualizuj 'environment.md'
|
2020-04-06 10:34:59 +00:00 |
|
|
|
a1dedef0a1
|
Zaktualizuj 'environment.md'
|
2020-04-06 10:32:18 +00:00 |
|
|
|
3da41bb019
|
Merge remote-tracking branch 'origin/development' into development
|
2020-04-06 12:31:53 +02:00 |
|
|
|
8f65ce87e2
|
Entities load using abs path
|
2020-04-06 12:31:44 +02:00 |
|
|
|
01d56ed7c1
|
Zaktualizuj 'environment.md'
|
2020-04-06 10:31:36 +00:00 |
|
|
|
d22f54a6b8
|
Zaktualizuj 'environment.md'
|
2020-04-06 10:30:47 +00: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 |
|
Wirus
|
8feaf9fac5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# environment.md
|
2020-04-06 12:28:54 +02:00 |
|
Wirus
|
68100781d3
|
correct image url
|
2020-04-06 12:28:34 +02:00 |
|
|
|
d7baa358a7
|
Zaktualizuj 'environment.md'
|
2020-04-06 10:27:42 +00:00 |
|
|
|
25334193df
|
Zaktualizuj 'environment.md'
|
2020-04-06 10:27:00 +00:00 |
|
Wirus
|
6e96b1dfd6
|
Merge remote-tracking branch 'origin/master'
|
2020-04-06 12:23:12 +02:00 |
|
Wirus
|
3e3a393886
|
add image adventure.png needed to raport
|
2020-04-06 12:22:54 +02:00 |
|
Wirus
|
d2f95c7bcc
|
correct newline in environment.md
|
2020-04-06 12:16:04 +02:00 |
|
Wirus
|
3f07785fbc
|
add structure.pdf and environment.md 80% progress in raport
|
2020-04-06 12:11:25 +02:00 |
|
|
|
e3b3fdd74f
|
Events won't be handled if the player is dead
|
2020-04-06 12:05:57 +02:00 |
|
|
|
605bf55ebf
|
Changed player texture
|
2020-04-06 11:56:06 +02:00 |
|
|
|
f1232956a0
|
Player cannot rotate dead
|
2020-04-06 11:55:56 +02:00 |
|
|
|
a275678e3f
|
Implemented player death mechanism
|
2020-04-06 11:51:46 +02:00 |
|
|
|
5a600eff11
|
Added gravestone texture
|
2020-04-06 11:51:35 +02:00 |
|
|
|
d94495fe13
|
Extended requirements info
|
2020-04-06 11:28:47 +02:00 |
|
|
|
1ca6b861dd
|
Updated README.md
|
2020-04-06 11:27:38 +02:00 |
|
|
|
04a3eaf928
|
Merge remote-tracking branch 'origin/master'
|
2020-04-06 11:13:17 +02:00 |
|
|
|
c080816908
|
Removed obsolete Collidable class
|
2020-04-06 11:12:49 +02:00 |
|
|
|
82081212ac
|
More level design
|
2020-04-06 11:12:31 +02:00 |
|
|
|
e49ef3013c
|
Firepit regenerates more stamina
|
2020-04-06 11:07:20 +02:00 |
|
|
|
5542acc443
|
Player may now self regenerate stamina
|
2020-04-06 11:03:01 +02:00 |
|
|
|
6994f39864
|
Player cannot walk if it runs out of stamina
|
2020-04-06 10:57:44 +02:00 |
|
|
|
4a33b6e761
|
Level design i guess
|
2020-04-06 10:55:47 +02:00 |
|
|
|
60baa30aee
|
Added tree texture
|
2020-04-06 10:55:38 +02:00 |
|
|
|
2b9a9d3c0c
|
Added drinkable river
|
2020-04-06 10:47:10 +02:00 |
|
|
|
02ca45748a
|
Added firepit that replenishes your stamina
|
2020-04-06 10:40:39 +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 |
|
|
|
c6ab7cc2f4
|
Refactor: interactable now has methods from pickupable
|
2020-04-06 10:29:43 +02:00 |
|
|
|
c69c923d31
|
Lowered walking fatigue values
|
2020-04-06 10:26:16 +02:00 |
|
|
|
903a406c74
|
Added invoking sprites update() method every frame
|
2020-04-06 10:25:28 +02:00 |
|
|
|
052e56836b
|
Player now passively looses stats
|
2020-04-06 10:25:01 +02:00 |
|
|
|
8339797409
|
Removed unnecessary line
|
2020-04-06 09:56:07 +02:00 |
|
|
|
318f7881a1
|
Fixed imports
|
2020-04-06 09:54:51 +02:00 |
|
|
|
0c46a6ec32
|
Run.py refactor
|
2020-04-06 09:53:27 +02:00 |
|
Michał Czekański
|
50d8f78ac8
|
Fix thirst console info print
|
2020-04-06 01:08:31 +02:00 |
|
|
|
998c6c0094
|
Merge remote-tracking branch 'origin/passingEvents'
|
2020-04-06 01:01:27 +02:00 |
|
Wirus
|
f68445bb3c
|
remove ugly rock texture
|
2020-04-06 01:01:20 +02:00 |
|
Michał Czekański
|
13e478eb3f
|
Merge remote-tracking branch 'origin/passingEvents' into passingEvents
|
2020-04-06 01:00:40 +02:00 |
|
