Commit Graph

349 Commits

Author SHA1 Message Date
Jakub Sztuba
946eb8f9dd Add missing file to block door 2023-01-15 01:14:18 +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
Jakub Sztuba
0ae19723f8 Dungeon campfires random placement and portal modification 2023-01-13 16:25:57 +01:00
Jakub Sztuba
b58bf4c32d Merge remote-tracking branch 'origin/master' 2023-01-13 14:11:35 +01:00
Jakub Sztuba
6877176a0a NodeMap for A* improvement 2023-01-13 14:11:17 +01:00
Jakub Sztuba
f4c3020cfb Wizard A* escaping improvement 2023-01-13 14:11:01 +01:00
kabix09
48832ab428 Merge remote-tracking branch 'origin/master' 2023-01-12 15:25:47 +01:00
kabix09
153bf64d12 First Village - quest - fix 2023-01-12 15:22:49 +01:00
344ee42722 Added Tombstone Dialogue 2023-01-11 22:17:32 +01:00
6c380faeab Improved script allowing to move tombstones 2023-01-11 14:14:33 +01:00
032689eeca Added moving tombstones 2023-01-11 13:53:27 +01:00
80df686805 Minor additions 2023-01-10 23:55:41 +01:00
104b638ee6 Merge branch 'master' into melania-dev 2023-01-10 21:45:22 +01:00
kabix09
5f4715845b Merge remote-tracking branch 'origin/master' 2023-01-10 21:21:31 +01:00
kabix09
fdd1a9b2ce Final battle - battle in dungeons caves 2023-01-10 21:20:48 +01:00
Jakub Sztuba
76ea31ad06 Player fist speedboost disconnection 2023-01-10 04:23:56 +01:00
Jakub Sztuba
0a26e22b6b Final controls keybinding for first two maps 2023-01-10 04:21:36 +01:00
3d309a02b6 Merge branch 'master' into melania-dev 2023-01-09 21:45:42 +01:00
3fcc2112cf Archibald quest tryfix 2023-01-09 21:41:53 +01:00
kabix09
1734e15690 Dungeon - missing tiledata 2023-01-09 00:50:12 +01:00
kabix09
d8a2a7f9bc Merge remote-tracking branch 'origin/master' 2023-01-09 00:44:22 +01:00
kabix09
fb55c363fa Dungeon - missing teleport 2023-01-09 00:43:56 +01:00
b0ef696fac Kill quest prepared 2023-01-08 21:20:24 +01:00
Jakub Sztuba
16bb98b37e Added enemies to Pathway 2023-01-08 19:23:34 +01:00
Jakub Sztuba
ec13948a4c Added prepared TheCave map 2023-01-08 18:50:10 +01:00
kabix09
ca4cf6fbb9 Dungeon - escaping wizard 2023-01-08 14:08:12 +01:00
Jakub Sztuba
8a16fd554d Collision fixes on Pathway 2023-01-08 13:57:43 +01:00
Jakub Sztuba
529fe0b95c Merge remote-tracking branch 'origin/master' 2023-01-07 23:49:03 +01:00
Jakub Sztuba
3f03a27ac8 Dungeon - teleports order behaviour 2023-01-07 23:46:54 +01:00
Jakub Sztuba
6ae48cdc19 Added Forest map 2023-01-07 23:00:43 +01:00
5fce97e4f3 Pathway map 2023-01-07 22:28:47 +01:00
5ad18a1b4c Pathway map 2023-01-07 21:49:57 +01:00
Jakub Sztuba
556c396959 Add more levels 2023-01-07 21:02:30 +01:00
5a5fa8a04a Minor changes
(cherry picked from commit 8e504d04364c0983e67fcccfa0eb09af2949002f)
2023-01-07 20:24:54 +01:00
Jakub Sztuba
0206216db0 New Map Start
(cherry picked from commit d2a3f5f1db)
2023-01-07 20:24:50 +01:00
Jakub Sztuba
996b5022d7 Catacombs - finishing touches 2023-01-07 20:21:00 +01:00
Jakub Sztuba
d2a3f5f1db New Map Start 2023-01-07 18:43:04 +01:00
kabix09
90c426bff3 Merge remote-tracking branch 'origin/master' 2023-01-07 17:51:56 +01:00