Commit Graph

373 Commits

Author SHA1 Message Date
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
7db7398c75 Merge branch 'master' into melania-dev 2022-12-28 16:25:20 +01:00
1d73510e36 Added items and dialogues
Also saving enemies fix
2022-12-28 16:21:08 +01:00
kabix09
f1603bbefe text panels - fix distance opening 2022-12-28 16:16: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
86e3d81913 Fixed patrolling enemies' animations on OutsideWizardsHouse map 2022-12-27 23:36:19 +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
kabix09
4373cdc48d Mission - add module template 2022-12-27 15:24:26 +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
92a1c69685 Dialogues - after fix 2022-12-24 20:16:41 +01:00
kabix09
713b7ffa59 Fix language in panels headers 2022-12-24 16:11:17 +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
kabix09
7de447ac73 Shop - allow to trade non equippable items 2022-12-24 13:29:15 +01:00
6fa923d9c7 Minor additions and fixes 2022-12-23 18:26:28 +01:00
kabix09
b6983edc19 Dialogues - add free sentences interaction 2022-12-23 16:02:04 +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
kabix09
2280e5fc15 Shop fix II 2022-12-21 12:20:49 +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
kabix09
c006e4a8ee Shop - open after dialogue 2022-12-20 03:30:37 +01:00
772ccaaed1 Minor changes to enemies 2022-12-19 22:11:22 +01:00
kabix09
43e1d817d7 Merge branch 'master' into shop 2022-12-19 03:43:24 +01:00
kabix09
88ab6bcee7 Add Shop module
Add Shop panel & saving module
2022-12-19 03:34:45 +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