Commit Graph

385 Commits

Author SHA1 Message Date
jakszt
a4aa84e952 Merge branch 'final' 2023-01-17 17:41:49 +02:00
jakszt
c97e18b9a3 Fix wizard HP 2023-01-17 17:40:55 +02:00
Jakub Sztuba
5bacdb308e Wizard animation and Cave fix 2023-01-17 16:39:59 +01:00
jakszt
c28ea23a36 Fix enemies health 2023-01-17 15:57:57 +02:00
dff01847ec Improved BossThugs collider size for killing 2023-01-17 12:30:53 +01:00
178d4291ff BossThug fix 2023-01-17 10:29:43 +01:00
d45e206ca0 Merge branch 'master' into theendpanel 2023-01-17 00:59:54 +01:00
fb65df05db Added the end game panel 2023-01-17 00:56:35 +01:00
Jakub Sztuba
a776c8d6bb Player speedboost fix 2023-01-17 00:49:06 +01:00
2e38bfd35b Bug fix 2023-01-17 00:26:37 +01:00
Jakub Sztuba
06b2e4f0be Merge remote-tracking branch 'origin/master' 2023-01-17 00:17:01 +01:00
Jakub Sztuba
98be70d531 Battle Wizard animation 2023-01-17 00:16:43 +01:00
7f584d874c Merge branch 'melania-dev' 2023-01-16 23:41:55 +01:00
68bb4a3d8d Final Wizard@ 2023-01-16 23:41:46 +01:00
b4ef22db57 Final Wizard@ 2023-01-16 23:32:35 +01:00
0ab53a4c20 Dialogue For Puzzle info 2023-01-16 22:28:17 +01:00
38540b2eab Limited movement when health <= 0 2023-01-16 00:22:07 +01:00
7ad703817c Merge branch 'melania-dev' 2023-01-15 23:33:50 +01:00
4dcb6c0aca Blocked Cave
Minor fixes
2023-01-15 23:28:30 +01:00
6b12caccca MainMenu improvements 2023-01-15 23:25:18 +01:00
a72b8badd6 Merge branch 'master' into FixesAndImprovements 2023-01-15 23:18:11 +01:00
ddafaea2dc Added a Boss bar & fixed collision with tombstones 2023-01-15 23:15:59 +01:00
Jakub Sztuba
318a38a140 Fix for controls and music on TheCave.unity and Pathway.unity 2023-01-15 22:21:47 +01:00
f7206111ec Merge remote-tracking branch 'origin/master' 2023-01-15 22:00:34 +01:00
53d47e9d7e Fixes 2023-01-15 21:57:49 +01:00
Jakub Sztuba
5fdc85f50e Music for new maps and minor fix 2023-01-15 21:08:32 +01:00
Jakub Sztuba
41ffa9ecb4 Gold Ore Save
Checked inventory on all maps
2023-01-15 14:44:01 +01:00
Jakub Sztuba
6d31162207 Main plot - wizard letter - fix door 2023-01-15 14:13:11 +01:00
Jakub Sztuba
5594c1c996 Merge remote-tracking branch 'origin/master' 2023-01-15 13:48:28 +01:00
Jakub Sztuba
bb41c00411 Account Balance - missing save on door 2023-01-15 13:48:26 +01:00
Jakub Sztuba
adaed47e87 Quest language fix 2023-01-15 13:29:43 +01:00
Jakub Sztuba
7eef897267 Many minor fixes 2023-01-15 02:23:58 +01:00
Jakub Sztuba
3ff42053c4 Merge remote-tracking branch 'origin/master' 2023-01-15 01:14:58 +01:00
Jakub Sztuba
946eb8f9dd Add missing file to block door 2023-01-15 01:14:18 +01:00
0149b8a19f NPC Speed Fix 2023-01-15 00:57:51 +01:00
a41293eaa4 VIF Very Important Fix 2023-01-15 00:53:40 +01:00
8c933cc75a Tombstone puzzle 2023-01-14 22:38:58 +01:00
kabix09
486e5e58c7 Merge remote-tracking branch 'origin/master' 2023-01-14 20:26:54 +01:00
kabix09
4d0c68cc53 Main Plot - wizard scrool 2023-01-14 20:15:04 +01:00
147b81ae7f Lumberjack dialogue, last map
Minor fixes
2023-01-14 19:14:07 +01:00
kabix09
4d3c3051df Wizard - fix parameters 2023-01-14 14:41:46 +01:00
kabix09
eb3f0d1cc2 Merge remote-tracking branch 'origin/master' 2023-01-14 11:00:22 +01:00
kabix09
0c8542ef64 Main plot - wizard letter 2023-01-14 10:58:04 +01:00
873b3788fc Merge branch 'melania-dev' 2023-01-13 23:38:49 +01:00
e38bfee21b Merge commit 'd15781a09c' into melania-dev 2023-01-13 23:22:56 +01:00
e483fa8295 Merge remote-tracking branch 'origin/master' 2023-01-13 22:07:58 +01:00
89f1f46a4a Wizard Dialogue 2023-01-13 21:55:27 +01:00
d15781a09c Added script with a death effect on Wizard 2023-01-13 21:25:56 +01:00
Jakub Sztuba
df05408237 Game controls keybinding - final implementation 2023-01-13 21:17:48 +01:00
Jakub Sztuba
ac71c14074 Fire damage and collider in Dungeon 2023-01-13 18:11:55 +01:00