Michał Czekański
508401d0a3
Merge branch 'master' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival
2020-04-06 15:45:47 +02:00
Michał Czekański
69313b0984
Add antialiasing
2020-04-06 15:45:05 +02:00
1bfa195616
Zaktualizuj 'environment.md'
2020-04-06 12:34:05 +00:00
d32384edde
Zaktualizuj 'environment.md'
2020-04-06 12:27:51 +00:00
90cd79b34d
Zaktualizuj 'environment.md'
2020-04-06 12:26:58 +00:00
94daee9f79
Zaktualizuj 'environment.md'
2020-04-06 12:26:28 +00:00
Wirus
b47e577356
new screenshot
2020-04-06 13:55:03 +02:00
Michał Czekański
774d186653
Add "s" after printing time alive
2020-04-06 13:51:05 +02:00
Michał Czekański
b0891c3e48
Merge branch 'writingInfoToConsole'
2020-04-06 13:50:01 +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
Michał Czekański
2893b4dd2c
Merge branch 'writingInfoToConsole' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into writingInfoToConsole
2020-04-06 13:44:39 +02:00
deec08cec7
Changed alive checking
2020-04-06 13:42:56 +02:00
dd16e77c33
Zaktualizuj 'environment.md'
2020-04-06 11:42:10 +00:00
Michał Czekański
9d8768cb15
Add method updating console on player's death
2020-04-06 13:41:33 +02:00
Wirus
10898acc10
Merge remote-tracking branch 'origin/master'
2020-04-06 13:40:19 +02:00
Wirus
ec0c3adc97
Edit structure.pdf
2020-04-06 13:40:06 +02:00
1716cb9190
Zaktualizuj 'environment.md'
2020-04-06 11:31:36 +00:00
a534f2fed3
Zaktualizuj 'environment.md'
2020-04-06 11:22:10 +00: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
178115cc4d
Add method updating console on player interaction in Ui and fix bar updating
2020-04-06 13:20:04 +02:00
89f2a44d43
Zaktualizuj 'environment.md'
2020-04-06 11:17:39 +00:00
ae7c5c64ca
Zaktualizuj 'environment.md'
2020-04-06 11:17:00 +00:00
2c60019b41
Zaktualizuj 'environment.md'
2020-04-06 11:15:45 +00:00
Wirus
c09a67dc2f
Correct Reprezentacja Wiedzy and make Poradnik
2020-04-06 13:14:06 +02:00
Michał Czekański
156f9977e0
Add ui updates on player pickup in EventManager
2020-04-06 13:13:47 +02:00
Michał Czekański
01511757a0
Change console updates
...
Added updateOnPlayerPickup method and modified updateBasedOnPlayerStats so that is used in former method.
Now info is written only on player pickup so that there is no spam.
2020-04-06 13:13:28 +02:00
134d09247e
Zaktualizuj 'environment.md'
2020-04-06 10:46:17 +00:00
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
