Commit Graph

229 Commits

Author SHA1 Message Date
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
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
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
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
Jakub Sztuba
8cbd050faf Merge branch 'master' of https://git.wmi.amu.edu.pl/s452674/Scriptum 2022-12-12 01:08:04 +01:00
Jakub Sztuba
eb6fb128f9 Added new enemies animations and connected them with A* pathfinding 2022-12-12 00:58:56 +01:00
d22ddde6bf Letter Fix 2022-12-12 00:13:00 +01:00
cd678552bb Added Enemies in Cave
Also prepared Wizard Script
2022-12-11 23:06:16 +01:00
f0edea12e1 Added Wizard Dialogue
Fixed Dialogue and Grid bugs
2022-12-11 13:04:06 +01:00
Jakub Sztuba
b408f0fbe4 Added door animation and fixed thugs movement 2022-12-10 02:24:32 +01:00
Jakub Sztuba
c991563aa4 Procedural generation progress and some animations 2022-12-07 21:59:27 +01:00
kabix09
25fedfae64 Hot Fix - confused casting Items types 2022-12-06 23:35:24 +01:00
kabix09
cc9c34930f Fix - dialogue structure 2022-12-06 21:35:17 +01:00
kabix09
ba894215fa Hot Fix - fix speaker name in dialogue panel header 2022-12-06 03:10:36 +01:00
kabix09
78405a418e Hot Fix - pickable items 2022-12-06 02:39:33 +01:00
kabix09
7186bef546 Hot Fix - game status & saving chests 2022-12-06 01:27:02 +01:00
kabix09
20f5ebe048 Fix dialogue modifications 2022-12-04 20:48:40 +01:00
kabix09
fb692e1bb8 Extends dialogue panels module
Add multi-threading dialogue system
2022-12-02 02:11:37 +01:00
kabix09
ea1a5790ef BUILD - hot fix after merge 2022-11-28 00:52:47 +01:00
kabix09
ccbc5a2db0 Merge branch 'refactoring' into saving-module 2022-11-24 03:48:23 +01:00
kabix09
deae883c68 Merge remote-tracking branch 'origin/master' into saving-module 2022-11-24 03:12:48 +01:00
kabix09
bccbc439e7 Panel refactoring - player equipment 2022-11-24 03:03:30 +01:00
kabix09
7f4aec84b3 Panel refactoring - chest & make chast dynamics 2022-11-19 17:02:31 +01:00
cf353876ea Added functional strength points 2022-11-15 12:32:28 +01:00
fbe444689f Added functional defense points 2022-11-14 23:04:29 +01:00
2e2aae16f8 Unified health module & added health points 2022-11-14 22:22:08 +01:00
Jakub Sztuba
80bf5ceef9 Added chest-openings' animations, fixed knocbacks and improeved A* pathfinding 2022-11-10 16:00:57 +01:00
kabix09
792bcb8466 Panel refactoring - player inventory 2022-11-07 23:06:06 +01:00
Jakub Sztuba
01b0d5ca21 Added A* pathfinding for NPCs 2022-11-07 22:18:28 +01:00
kabix09
db575614ec Panel refactoring - player quests 2022-11-06 20:46:25 +01:00
be7009c578 Health Fixed
After respawn health fixed. Also added new map.
2022-11-05 20:25:40 +01:00
9d243eadf7 Merge branch 'melania-dev' 2022-11-03 20:32:08 +01:00
f661c7e20f Fixed bugs
Fixed spawn bug
2022-11-03 20:30:40 +01:00
kabix09
1d8d474024 Merge branch 'jakszt-thuganimations' 2022-10-24 21:01:20 +02:00
Jakub Sztuba
6f5586a203 Added thug animations 2022-10-24 12:31:09 +02:00
0df889176b Added a level up pop up message 2022-10-23 15:56:31 +02:00
f19efeed73 Improved leveling up system 2022-10-23 13:29:22 +02:00
19755048d1 Added Level Bar 2022-10-23 00:21:54 +02:00
kabix09
71ea0a7208 Merge branch 'jakfit-dialogue-module' 2022-10-22 09:45:28 +02:00
kabix09
f77280e722 Fix - add missing meta files 2022-10-22 09:45:09 +02:00
kabix09
ae17d7d651 Merge branch 'jakfit-dialogue-module' 2022-10-20 23:39:22 +02:00
kabix09
006091c8c3 Add dialogue to Boss Thug 2022-10-20 23:30:19 +02:00
e55ba2f7f1 Added a basic leveling up system 2022-10-16 21:35:56 +02:00
kabix09
9b6aa76586 Merge branch 'master' into jakfit-dialogue-module 2022-10-16 19:42:57 +02:00
kabix09
09058f1451 Add Panels and Dialogue module 2022-10-16 19:40:44 +02:00
Jakub Sztuba
5d89daef4a Walking speed correction and sword/pickaxe attack handling 2022-10-11 01:44:52 +07:00
eef1697737 Add thugs status tmp saving logic 2022-10-03 01:12:13 +02:00
ce019b2dd2 Fixed loading of player position and health 2022-10-01 19:28:26 +02:00
2e648df55e Fixed player position
Added automatic player appearance, fixed teleports
2022-10-01 15:39:24 +02:00
5da90f0810 Changed font in main menu 2022-09-26 20:30:46 +02:00
alilas2
4512319172 Translated GUI on the cave map & fixed minor bugs 2022-08-09 21:49:35 +02:00
70cefd6336 Translated most elements on CaveEntrance map 2022-07-24 13:01:29 -05:00
8bb7111610 Fixed bat movement & disabled walking while using a pickaxe 2022-07-22 13:40:41 -05:00
Jakub Sztuba
5b23681f05 Added pickaxe animation 2022-06-21 03:57:04 +02:00
8a905457b4 Enemies movement improvement in cave
Added NPC attack in cave
2022-06-21 01:09:06 +02:00
kabix09
271ee166e5 Finish first quest 2022-06-20 22:31:48 +02:00
alilas2
3c32c3bba4 Added dialogue panel allowing player to turn in quests 2022-06-20 20:50:48 +02:00
kabix09
774930c876 Extends warehouse api 2022-06-20 18:45:26 +02:00
kabix09
1794b60fb0 Add chest saving manager system for user items 2022-06-20 01:04:56 +02:00
kabix09
ce358dafcb Add inventory saving manager system for user items
Fix inventory slots bug
2022-06-19 14:48:04 +02:00
kabix09
306c2f85c3 Add quest saving manager system for user tasks
Add base auto saving when change scene
2022-06-19 14:47:46 +02:00
kabix09
602c94726a Add scene manager for items
Start rebuild Save & Load game system
2022-06-19 01:25:49 +02:00
kabix09
af2542f26d Add gold ore drop 2022-06-16 20:00:19 +02:00
alilas2
81360ff25c Improvements to Save & Load Game system 2022-06-15 19:54:44 +02:00
alilas2
7223cebdd9 Added enemy status, health status and NPC dialogue status to save & load game system 2022-06-15 16:32:14 +02:00
alilas2
8b81da0d32 Improved collision & fixed settings button 2022-06-15 14:59:30 +02:00
Jakub Sztuba
bf1a63828e Open Inventory panel on I press 2022-06-14 22:06:01 +02:00
Jakub Sztuba
0a07120b68 Added fist attack animation 2022-06-14 21:20:02 +02:00
alilas2
5c26f64469 Improved the dialogue system, so that as a player we can accept a quest 2022-06-14 15:54:28 +02:00
kabix09
44c9fe619d Add Lumberjack quest 2022-06-13 23:33:19 +02:00
Jakub Sztuba
68ec3ed791 Added health recovering feature 2022-06-13 17:38:09 +02:00
7088193887 Added health bar 2022-06-12 20:14:11 +02:00
alilas2
d352ad391f Improved possible action panel 2022-06-12 17:18:43 +02:00
alilas2
fce6e7aa9b Added panel which shows possible action button 2022-06-12 11:28:14 +02:00
kabix09
606793dde6 Merge branch 'tasks-panel-feature' 2022-06-11 23:40:43 +02:00
kabix09
bf6e28ee45 Add quests panel 2022-06-11 23:12:52 +02:00
alilas2
62c87d1cb6 Improved attacking system 2022-06-11 17:49:19 +02:00
kabix09
27dd46bf27 Fix player button - open inventory panel 2022-06-10 11:02:51 +02:00
alilas2
bc2f8ba3e1 Added very basic attacking system 2022-06-09 21:51:48 +02:00
alilas2
e063c84458 Added minor improvements to taking damage & dying functionalities 2022-06-06 16:21:26 +02:00
kabix09
b24cd8d3bc Merge branch 'inventory-feature' 2022-06-05 20:51:39 +02:00
kabix09
2fc771ad56 Add qeuipment Drag & Drop 2022-06-05 20:01:56 +02:00
kabix09
9fa400f9a7 Add inventory Drag & Drop
Simple code refaactor
2022-06-05 10:30:52 +02:00
alilas2
c65186b866 Added basic taking damage & dying system 2022-06-04 13:59:18 +02:00
alilas2
20d24c5973 Added slight changes to loading scene after saving game 2022-06-02 18:32:18 +02:00
alilas2
6d7760c120 Added save & load scene + save & load player position functionalities 2022-06-02 14:25:22 +02:00
alilas2
8c16a13561 Added all settings GUI onto playable maps 2022-06-02 10:46:31 +02:00
Jakub Sztuba
23e7a288c0 Added attacking move 2022-05-31 23:53:48 +02:00
kabix09
00d02ca2ac Add chest Drag & Drop 2022-05-29 21:56:08 +02:00
kabix09
1d436aa16f Add chest content panel 2022-05-29 12:33:43 +02:00
ee708b81a8 Added new enemy script 2022-05-26 13:30:59 +02:00
alilas2
bd7c9056c5 Added functional dialogue window 2022-05-25 17:11:49 +02:00
e1acfa3954 Merge branch 'melania-dev' 2022-05-20 22:22:24 +02:00
Jakub Sztuba
9312b926eb Merge branch 'jakszt-ui' 2022-05-20 13:42:15 +02:00
Jakub Sztuba
0459bdc24c Add basic settings menu and inventory ui 2022-05-20 13:38:43 +02:00
2595283143 Minor enemy scripts fixes 2022-05-18 21:56:39 +02:00
4ab6cc09c5 Added simple health module for enemies 2022-05-18 13:58:41 +02:00
kabix09
a725129e5c Merge branch 'jakfit-tutorialmap' 2022-05-15 21:42:14 +02:00
kabix09
fd0bbec1e9 Add changing scene to tutorial map after entering the cave 2022-05-15 21:39:34 +02:00
kabix09
875da212f5 Add picking items 2022-05-15 18:54:59 +02:00
alilas2
7acb9f323e Prepared sound menu 2022-05-12 20:15:49 +02:00
alilas2
8aa785abf9 Added New game & Quit game functions in main menu 2022-05-10 22:54:04 +02:00
fbb509c2ed Add static NPCs and moving monsters 2022-05-03 15:40:48 +02:00
Jakub Sztuba
dacc91dadb Merge branch 'jakszt' 2022-04-08 11:45:37 +02:00
Jakub Sztuba
9bde9f8ed4 Added animation for character 2022-04-07 23:46:09 +02:00
da32ccfa77 Added moving enemies
Added bats patrolling map and placed chests.
2022-04-07 19:22:29 +02:00
9b2ef41b89 Added map fragment
And camera movement
2022-03-24 22:50:10 +01:00
bb9d73fc76 Added basic model movement
Without animation
2022-03-24 18:37:17 +01:00