Commit Graph

284 Commits

Author SHA1 Message Date
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
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
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
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
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
f7e99ede60 Items - restore Dropping & Saving module 2023-01-06 03:44:07 +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
cc35b2ab4a Two Cave Labirynth Maps 2023-01-05 20:04: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
kabix09
442a3617f1 Lumberjack - getting reward after quest 2023-01-05 17:04:33 +01:00
7d1334a38c River interaction 2023-01-05 16:52:03 +01:00
d2460212e4 Fix Enemy damage and Health 2023-01-05 15:50:18 +01:00
f2215c3638 Merge remote-tracking branch 'origin/master' 2023-01-05 15:20:45 +01:00
7913c208a7 Added Catacombs Grid
Some small changes as well
2023-01-05 15:14:07 +01:00
Jakub Sztuba
45cbbc3b3d Wizard Animation Upgrade 2023-01-05 14:53:42 +01:00
dee01d65e6 Merge remote-tracking branch 'origin/master' 2023-01-05 12:42:44 +01:00
b03354517c Cave tilemap 2023-01-05 12:42:32 +01:00
Jakub Sztuba
d1406637d2 Wizard animation added 2023-01-05 01:53:38 +01:00
kabix09
7be4e6556f Missions - saving II 2023-01-04 00:13:19 +01:00
kabix09
a704b2a878 Merge branch 'master' into mission 2023-01-03 23:01:13 +01:00
de82e91d9f Wizard Astar fix 2023-01-02 19:31:45 +01:00
3aedf89a34 Merge remote-tracking branch 'origin/master' 2023-01-02 15:09:26 +01:00
1ca244f1d5 Wizard and enemies collision fix 2023-01-02 15:05:45 +01:00
70faab2f32 Added interactive fireplace in the inn 2023-01-02 15:02:08 +01:00
Jakub Sztuba
3b51c083ae First part of controls rebinding 2023-01-02 00:37:49 +01:00
kabix09
b72537003b Dialoges - saving II 2023-01-02 00:22:39 +01:00
2acc73213c Prepared a function that grants random camera movement (drunk effect) 2022-12-31 19:03:46 +01:00
f9085d0165 Added falling leaves on OutsideWizardsHouse, FirstVillage and Cementary maps 2022-12-31 18:11:19 +01:00
59facabc27 Added a script to switch fireplace asset on E press 2022-12-31 16:36:02 +01:00
51c5bf6750 Added a level bar border on level up 2022-12-31 12:31:06 +01:00
1e75635cec Added new enemies prefabs
Added game icon
2022-12-30 12:23:04 +01:00
kabix09
77dd3c396f Merge remote-tracking branch 'origin/master' 2022-12-29 21:05:48 +01:00
kabix09
d64d8cd1a7 Catacombs - add minion spwaner 2022-12-29 21:04:25 +01:00
7adeac5a12 Fixes 2022-12-29 20:02:32 +01:00
23657a87f0 Merge branch 'melania-dev' 2022-12-29 16:51:41 +01:00
d5886a233b Panel adjustments 2022-12-29 16:50:35 +01:00
kabix09
b9b745d4fc Rolback master changes on Cementary 2022-12-29 16:45:10 +01:00
88d885a820 Merge remote-tracking branch 'origin/master' 2022-12-29 14:26:34 +01:00
28fa29288c Health potion use 2022-12-29 14:25:07 +01:00
Jakub Sztuba
1e6583af25 Lighting in Dungeon.unity 2022-12-29 03:22:45 +01:00
Jakub Sztuba
7f9a7ec9f8 Progress and changes in procedural generation of Dungeon 2022-12-29 01:53:03 +01:00
Jakub Sztuba
1b7825ab20 Added async chests animations 2022-12-29 00:56:54 +01:00
445b62d581 Added more elements with collision on the cementary map 2022-12-28 19:07:56 +01:00
1794d60f77 Improved collision on the cementary map 2022-12-28 18:44:01 +01:00
7577aa269c text panels - fix distance opening II 2022-12-28 17:22:11 +01:00
1d73510e36 Added items and dialogues
Also saving enemies fix
2022-12-28 16:21:08 +01:00
Jakub Sztuba
ec0b413931 Added music to scenes and also fixed crab animation 2022-12-28 01:23:51 +01:00
Jakub Sztuba
1e8b4603ab Added door animation in FirstVillage.unity 2022-12-27 23:12:37 +01:00
Jakub Sztuba
8cd1232d79 Enemies speed correction 2022-12-27 22:45:40 +01:00
7b934dc745 Added interactives on CaveEntrance
Also added objects and items
2022-12-27 21:07:59 +01:00
b3eb19b8e7 Merge branch 'master' into melania-dev 2022-12-27 16:51:28 +01:00
c3f5fd2c53 Added door interaction
Also minor fixes
2022-12-27 16:40:50 +01:00
60bbb25ed4 Finished collision on FirstVillage and InnVillage maps 2022-12-26 16:53:37 +01:00
3d1dedca64 Added collision for trees on cementary map 2022-12-26 16:18:02 +01:00
kabix09
886eec8984 Add Player Skills panel 2022-12-25 03:39:31 +01:00
kabix09
eee953e85f Merge branch 'shop' 2022-12-24 15:28:23 +01:00
kabix09
d622536f1e Add Account Balance module 2022-12-24 15:27:45 +01:00
6fa923d9c7 Minor additions and fixes 2022-12-23 18:26:28 +01:00
kabix09
a84dcf0dcb Items effects template 2022-12-22 03:38:00 +01:00
kabix09
2591ed3e74 Make chest creating more flexible II 2022-12-21 23:32:51 +01:00
kabix09
8e3f89a6f7 Make chest creating more flexible 2022-12-21 17:12:47 +01:00
29a13e824f Shop fix 2022-12-20 23:57:14 +01:00
d79bc6de22 Merge branch 'melania-dev' 2022-12-20 23:27:21 +01:00
ed7cfaaebf Unify monsters and minor fixes
Added items, fixed msg chests
2022-12-20 23:25:25 +01:00
kabix09
e26bbce901 Wizard - first action - fix
Dialogue add base trigger
2022-12-20 15:23:09 +01:00
kabix09
9d97accd5b Merge branch 'shop' 2022-12-20 04:37:36 +01:00
kabix09
00f210e83c Wizard - first action 2022-12-20 04:37:00 +01:00
772ccaaed1 Minor changes to enemies 2022-12-19 22:11:22 +01:00
87ff9a76ed Unified health and exp bars across all the maps 2022-12-18 19:41:50 +01:00
5bdac7a034 Added a functionality on tab hold 2022-12-18 19:19:57 +01:00
fc4ef01514 Minor graphic fixes 2022-12-18 14:31:12 +01:00
c076e0018c Merge branch 'collision' 2022-12-17 21:51:38 +01:00
c0eef4b509 Added collision on the firstVillage map 2022-12-17 21:47:51 +01:00
Jakub Sztuba
1a060735d5 Dungeon Generator fix 2022-12-16 14:03:39 +01:00
Jakub Sztuba
b53bdf3bd9 Bug fixes with Bats and other NPCs. Also modified map generator flood fill algorithm. 2022-12-16 14:03:23 +01:00
dd1e87bdab Cementary map finishing touches 2022-12-15 20:23:43 +01:00
69c94b7b06 Added collision inside the inn & Added a damage dealing plant model 2022-12-14 00:26:11 +01:00
kabix09
d90ca46069 Reset player after finishing introduction 2022-12-13 02:28:49 +01:00
kabix09
b61f7bd694 BUILD FIX - chests position 2022-12-13 01:03:03 +01:00
366cccf79f Added Cementary Map 2022-12-12 23:53:07 +01:00