Commit Graph

294 Commits

Author SHA1 Message Date
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
8d3a10a7f0 Added Inn map 2022-11-23 12:24:55 +01:00
07f79d74da Added dummy enemies 2022-11-21 19:17:33 +01:00
b051b05040 Merge branch 'master' into melania-dev 2022-11-20 22:04:58 +01:00
a9289725b8 Added FirstVillage map 2022-11-20 22:03:13 +01:00
kabix09
7f4aec84b3 Panel refactoring - chest & make chast dynamics 2022-11-19 17:02:31 +01:00
c82083d51d Added a new scene before starting a new game 2022-11-17 14:28:25 +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
3bb135c3fe Collision improvements outisde of wizard's house 2022-11-14 17:50:49 +01:00
722fa3100c Merge branch 'master' into collision 2022-11-13 13:48:26 +01:00
ede4da5aca Added collision to some elements outside of the wizard's house 2022-11-13 13:31:51 +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
3e918e140b Merge branch 'melania-dev' 2022-11-03 19:14:26 +01:00
1e8cdf3c11 Added map OutsideWizardsHouse 2022-11-03 19:11:27 +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
c6e3a4c83e Merge branch 'melania-dev' 2022-10-22 13:17:26 +02:00
feea644292 Changes in graphics 2022-10-22 13:09:34 +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
30f2b7e020 Merge branch 'new-changes' 2022-10-10 22:26:29 +02:00
e71b7074fb Added collision in the wizard's house 2022-10-10 22:25:07 +02:00
Jakub Sztuba
e7f905adcc Merge branch 'jakubsz' 2022-10-11 01:48:01 +07:00
Jakub Sztuba
5d89daef4a Walking speed correction and sword/pickaxe attack handling 2022-10-11 01:44:52 +07:00
510ca13a91 Added new map with working gateway 2022-10-09 12:04:31 +02: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
968e16fc9f Merge branch 'melania-dev' 2022-10-01 18:08:38 +02:00
2e648df55e Fixed player position
Added automatic player appearance, fixed teleports
2022-10-01 15:39:24 +02:00
1084c861f8 Merge remote-tracking branch 'origin/master' 2022-09-27 00:03:29 +02:00
a9bd9d46f0 Merge remote-tracking branch 'origin/master' 2022-09-26 23:56:37 +02:00
7795122087 Translated Main Menu & Settings Menus 2022-09-26 23:54:34 +02:00
9b6964256e Further main menu font fix 2022-09-26 23:42:37 +02:00
954f2273d8 Fixed saving status of NPCs at the end of CaveEntrance map 2022-09-26 23:09:07 +02:00
b1d366ec7b Added a script that opens & closes settings panels on ESC press 2022-09-26 22:44:56 +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
4ae1a5838d Added Polish version of the letter at the start of CaveEntrance map 2022-07-22 14:24:20 -05:00
8bb7111610 Fixed bat movement & disabled walking while using a pickaxe 2022-07-22 13:40:41 -05:00
alilas2
eaf5b09de3 Added a script that starts the game & saves player name on Enter press 2022-07-04 20:52:22 +02:00
alilas2
7b3ba79f4a Fixed displaying name on CaveEntrance map & Added pickaxe hitboxes 2022-07-03 22:15:56 +02:00
Jakub Sztuba
f687fbc6f0 Merge remote-tracking branch 'origin/master' 2022-06-21 03:59:03 +02:00
Jakub Sztuba
5b23681f05 Added pickaxe animation 2022-06-21 03:57:04 +02:00
4a46131e12 Cave Boss fix 2022-06-21 01:44:25 +02:00
cf6207185e Added Items 2022-06-21 01:29:37 +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
8f199ae953 Small map fixes 2022-06-14 17:35:29 +02:00
7f160474d2 Map fix 2022-06-14 16:48:01 +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
Jakub Sztuba
f1adc298bb Cave map interaction fixes 2022-06-13 17:11:55 +02:00
f3ec422712 Small changes 2022-06-13 16:31:18 +02:00
5859d7f9c5 Added health bar to second map
Also added new NPC with dialogue
2022-06-12 22:24:28 +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
f51b53df4e Added particle effects after hitting big trees on CaveEntrance map 2022-06-11 20:15:56 +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
c976919977 Minor fixes
Character sprite fix, enemies fix, graphics fix
2022-06-07 21:45:44 +02:00
Jakub Sztuba
6bcc54309c Fix attack animation 2022-06-07 12:19:40 +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
bcfe2bf2e6 Added slight changes to loading in the game 2022-06-03 10:34:31 +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
alilas2
8d469bf9bc Added particles that show while breaking a rock 2022-06-02 09:49:51 +02:00
Jakub Sztuba
271f1de9af Added attacking move 2022-06-01 12:53:18 +02:00
Jakub Sztuba
23e7a288c0 Added attacking move 2022-05-31 23:53:48 +02:00
alilas2
4fd0eb8c0e Added player name selection menu & Added a letter at the start of first map 2022-05-31 16:13:48 +02:00
6a19196869 Minor sprite fix
Added new scene
2022-05-31 13:42:27 +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
kabix09
97a4595a20 Fix cave background on first map 2022-05-27 19:33:10 +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
alilas2
40b94dee92 Collision adjustments 2022-05-24 20:06:52 +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
alilas2
031650d1de Added collision in CaveEntrance scene 2022-05-16 23:47:54 +02:00
alilas2
de58064db5 Minor sorting layer changes within menus 2022-05-16 11:27:38 +02:00
alilas2
a7c33f502d Fixed collision and sorting order for the tutorial map 2022-05-16 11:17:21 +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
kabix09
d4fcd571a7 Add forest before tutorial map 2022-05-15 16:08:00 +02:00
alilas2
7acb9f323e Prepared sound menu 2022-05-12 20:15:49 +02:00
alilas2
7660500f8e Added settings menu 2022-05-11 02:18:48 +02:00
alilas2
8aa785abf9 Added New game & Quit game functions in main menu 2022-05-10 22:54:04 +02:00
alilas2
0aeb256831 Added main menu template 2022-05-10 12:57:39 +02:00
fbb509c2ed Add static NPCs and moving monsters 2022-05-03 15:40:48 +02:00
alilas2
0fdbf17098 Added basic breakable object 2022-04-25 21:41:47 +02:00
alilas2
c9e82d739b Added basic item pickup functionality 2022-04-19 16:18:30 +02:00
kabix09
35cef9da09 Merge commit 'Player animations' into jakfit-fix-bug 2022-04-08 23:16:11 +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
alilas2
d777df8b22 Minor asset fixes 2022-03-29 16:24:08 +02:00
alilas2
5a79d8d969 Collision 2022-03-28 17:33:06 +02:00
3704449eef Added Tutorial Map 2022-03-26 22:45:59 +01: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