Commit Graph

370 Commits

Author SHA1 Message Date
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
kabix09
ecaddbd69a Added First Wizard Quest - part II 2023-01-07 17:50:25 +01:00
40a3a24db8 Bat fix 2023-01-07 17:14:18 +01:00
eae2c02ff8 Catacombs collision
and minor fixes
2023-01-07 16:51:46 +01:00
Jakub Sztuba
a6c2841226 Keybinding saving improvement 2023-01-07 12:02:47 +01:00
Jakub Sztuba
ec1368d90a Changing of controls Attack and Settings progress 2023-01-07 02:56:38 +01:00
Jakub Sztuba
54c4d1728c Merge remote-tracking branch 'origin/master' 2023-01-07 00:39:32 +01:00
Jakub Sztuba
9f36774efb Main Menu Upgrade 2023-01-07 00:39:19 +01:00
6f557f1b96 Merge remote-tracking branch 'origin/master' 2023-01-06 21:56:56 +01:00
bbf40b4bc8 Added First Wizard Quest
Also some items
2023-01-06 21:54:50 +01:00
Jakub Sztuba
cc6146631b Fix for starting new game window on first run 2023-01-06 21:52:59 +01:00
Jakub Sztuba
134500c1eb Dungeon coords searching method and minor fix with player name input 2023-01-06 18:17:42 +01:00
1458c07489 Drop Items Prepared and Linked 2023-01-06 14:50:12 +01:00
kabix09
10c03b5183 Items - fix pickable ability 2023-01-06 13:32:35 +01:00
kabix09
f7e99ede60 Items - restore Dropping & Saving module 2023-01-06 03:44:07 +01:00
kabix09
2d088ba775 Merge remote-tracking branch 'origin/master' 2023-01-05 21:24:18 +01:00
kabix09
3e861d2ac3 Respown & Save fix 2023-01-05 21:23:01 +01:00
Jakub Sztuba
a5e7b7e44b Merge remote-tracking branch 'origin/master' 2023-01-05 21:19:23 +01:00
Jakub Sztuba
55ace96194 Many minor fixes 2023-01-05 21:19:05 +01:00
e64d15eac8 Added maps to settings 2023-01-05 20:44:09 +01:00
Jakub Sztuba
f5121ad3c7 Merge remote-tracking branch 'origin/master' 2023-01-05 20:13:56 +01:00
Jakub Sztuba
070c832631 Added controls letter on entrance 2023-01-05 20:13:14 +01:00
c5f009b82a Merge branch 'melania-dev' 2023-01-05 20:05:27 +01:00
cc35b2ab4a Two Cave Labirynth Maps 2023-01-05 20:04:44 +01:00
kabix09
71d7ff164a Merge remote-tracking branch 'origin/master' 2023-01-05 20:03:08 +01:00
kabix09
aa3e62b78e Add chests animations 2023-01-05 20:02:44 +01:00
f33b97299c Added Crab Venom 2023-01-05 17:25:30 +01:00
d2aaa677b1 Merge branch 'master' into melania-dev 2023-01-05 17:06:15 +01:00
6c05124b6a Merge remote-tracking branch 'origin/master' 2023-01-05 17:05:51 +01:00
kabix09
442a3617f1 Lumberjack - getting reward after quest 2023-01-05 17:04:33 +01:00