Commit Graph

358 Commits

Author SHA1 Message Date
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
Michał Czekański
880c0af3c2 Move updating time text view to Ui class 2020-04-06 01:00:02 +02:00
Wirus
260f5db5b1 remove ugly rock texture 2020-04-06 00:59:57 +02:00
Michał Czekański
ee20ac3214 Add appending time stamps before console lines 2020-04-06 00:55:43 +02:00
d45eb55b28 Hunger now rises instead of falling 2020-04-06 00:53:51 +02:00
49666ee664 Changed entity effect values 2020-04-06 00:53:20 +02:00
b110ee9f34 Hunger now starts from 0 2020-04-06 00:52:34 +02:00
6b279ce47f Merge remote-tracking branch 'origin/passingEvents' 2020-04-06 00:51:14 +02:00
325adc7de5 Merge remote-tracking branch 'origin/passingEvents' into passingEvents 2020-04-06 00:50:20 +02:00
3dd6a4a7e7 Implemented fatigue system 2020-04-06 00:50:12 +02:00
Michał Czekański
a0abfdf11e Merge remote-tracking branch 'origin/passingEvents' into passingEvents 2020-04-06 00:49:20 +02:00
3e5b64cb61 Aktualizacja README.md 2020-04-05 22:49:05 +00:00
Michał Czekański
04898fc27b Fix console scrolling 2020-04-06 00:45:52 +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
a45befd4fa Implemented getFacingCoord method 2020-04-06 00:39:58 +02:00
Michał Czekański
53417ecab9 Merge remote-tracking branch 'origin/passingEvents' into passingEvents 2020-04-06 00:11:12 +02:00
Michał Czekański
679cc3f9f4 Add writing to console when player stats change 2020-04-06 00:10:40 +02:00
Wirus
b2b7c7810d delete ',' after false 2020-04-06 00:07:13 +02:00
Michał Czekański
30896285db Add value field in Bar class 2020-04-06 00:06:19 +02:00
Wirus
e8e9cca0bb Merge remote-tracking branch 'origin/passingEvents' into passingEvents
# Conflicts:
#	data/mapdata/mapEntities.json
2020-04-06 00:03:06 +02:00
Wirus
38b6adc8a1 add bush and rabbit in mapEntities 2020-04-06 00:01:16 +02:00
Michał Czekański
73ef580489 Merge remote-tracking branch 'origin/passingEvents' into passingEvents
# Conflicts:
#	src/entities/Player.py
2020-04-06 00:01:04 +02:00
Michał Czekański
076a377cda Add pass after empty elif in Player 2020-04-06 00:00:00 +02:00
jonspacz
732d938e9a Merge remote-tracking branch 'origin/passingEvents' into passingEvents 2020-04-05 23:59:32 +02:00
Michał Czekański
b56269888c Merge remote-tracking branch 'origin/passingEvents' into passingEvents 2020-04-05 23:59:13 +02:00
jonspacz
c7793f5c43 added rock as a non-pickupable entity 2020-04-05 23:59:07 +02:00
Michał Czekański
932073d72a Reformat file Ui.py 2020-04-05 23:58:45 +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
0add2066e2 Add method updating text in UiText 2020-04-05 23:57:28 +02:00
05ce54933d Merge remote-tracking branch 'origin/passingEvents' into passingEvents 2020-04-05 23:53:25 +02:00
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