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 |
|
kabix09
|
442a3617f1
|
Lumberjack - getting reward after quest
|
2023-01-05 17:04:33 +01:00 |
|
|
|
58b698c789
|
Merge branch 'master' into melania-dev
|
2023-01-05 16:54:10 +01:00 |
|
kabix09
|
1b36194f31
|
Lumberjack - getting reward after quest
|
2023-01-05 16:52:57 +01:00 |
|
|
|
7d1334a38c
|
River interaction
|
2023-01-05 16:52:03 +01:00 |
|
kabix09
|
ea2879c9ff
|
Language - use eng as default in panels
|
2023-01-05 16:06:21 +01:00 |
|
|
|
c55714c486
|
Merge branch 'melania-dev'
|
2023-01-05 15:50:53 +01:00 |
|
|
|
d2460212e4
|
Fix Enemy damage and Health
|
2023-01-05 15:50:18 +01:00 |
|
kabix09
|
da5c2cc996
|
Merge remote-tracking branch 'origin/master'
|
2023-01-05 15:49:15 +01:00 |
|
kabix09
|
13051eb240
|
Dialogues - fix dynamic language detection
|
2023-01-05 15:47:02 +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 |
|
Jakub Sztuba
|
a4d969e2be
|
Minor fix with controlls by Escape key
|
2023-01-05 14:25:32 +01:00 |
|
Jakub Sztuba
|
fb03feb29d
|
Merge remote-tracking branch 'origin/master'
|
2023-01-05 14:21:03 +01:00 |
|
Jakub Sztuba
|
d596deb373
|
Fixed bug with sound settings
|
2023-01-05 14:19:56 +01:00 |
|
|
|
76ae5271e6
|
Thug anim fix
|
2023-01-05 13:24:58 +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 |
|
Jakub Sztuba
|
68d6d3769a
|
Fixed Thugs animation logic
|
2023-01-05 01:30:01 +01:00 |
|
kabix09
|
35ed59b247
|
Thugs - behaviour fix
Use pathfinding algorithm
|
2023-01-04 21:23:02 +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 |
|
kabix09
|
7e8b5ca6e2
|
Exuippment - fix equip
|
2023-01-03 22:48:05 +01:00 |
|
kabix09
|
db8589c61a
|
Missions - saving
|
2023-01-03 22:44:24 +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 |
|
kabix09
|
82f3cf19fe
|
Merge branch 'master' into mission
|
2023-01-01 17:19:16 +01:00 |
|
kabix09
|
1c26fc648b
|
Dialogues - saving
|
2023-01-01 17:03:35 +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 |
|
kabix09
|
b85ae59b7f
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s452674/Scriptum
|
2022-12-29 17:02:24 +01:00 |
|
kabix09
|
83c6b32fe5
|
Merge hot fix
|
2022-12-29 17:01:58 +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 |
|
kabix09
|
d37e885669
|
Merge remote-tracking branch 'origin/master'
|
2022-12-29 16:39:46 +01:00 |
|
kabix09
|
84fe5a450f
|
Fix attack & defense & health calculation
|
2022-12-29 16:37:17 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
421cdc4ffc
|
Added chests
|
2022-12-12 22:18:16 +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 |
|
|
|
e88668415e
|
Bug fix
|
2022-11-30 15:09:55 +01:00 |
|
kabix09
|
d091556cd6
|
Merge branch 'saving-module'
|
2022-11-28 00:53:39 +01:00 |
|
kabix09
|
ea1a5790ef
|
BUILD - hot fix after merge
|
2022-11-28 00:52:47 +01:00 |
|
|
|
efe3142123
|
Added NPCs
|
2022-11-26 18:58:11 +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 |
|
|
|
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 |
|
