|
|
104b638ee6
|
Merge branch 'master' into melania-dev
|
2023-01-10 21:45:22 +01:00 |
|
kabix09
|
5f4715845b
|
Merge remote-tracking branch 'origin/master'
|
2023-01-10 21:21:31 +01:00 |
|
kabix09
|
fdd1a9b2ce
|
Final battle - battle in dungeons caves
|
2023-01-10 21:20:48 +01:00 |
|
Jakub Sztuba
|
76ea31ad06
|
Player fist speedboost disconnection
|
2023-01-10 04:23:56 +01:00 |
|
Jakub Sztuba
|
0a26e22b6b
|
Final controls keybinding for first two maps
|
2023-01-10 04:21:36 +01:00 |
|
|
|
3d309a02b6
|
Merge branch 'master' into melania-dev
|
2023-01-09 21:45:42 +01:00 |
|
|
|
3fcc2112cf
|
Archibald quest tryfix
|
2023-01-09 21:41:53 +01:00 |
|
kabix09
|
1734e15690
|
Dungeon - missing tiledata
|
2023-01-09 00:50:12 +01:00 |
|
kabix09
|
d8a2a7f9bc
|
Merge remote-tracking branch 'origin/master'
|
2023-01-09 00:44:22 +01:00 |
|
kabix09
|
fb55c363fa
|
Dungeon - missing teleport
|
2023-01-09 00:43:56 +01:00 |
|
|
|
b0ef696fac
|
Kill quest prepared
|
2023-01-08 21:20:24 +01:00 |
|
Jakub Sztuba
|
16bb98b37e
|
Added enemies to Pathway
|
2023-01-08 19:23:34 +01:00 |
|
Jakub Sztuba
|
ec13948a4c
|
Added prepared TheCave map
|
2023-01-08 18:50:10 +01:00 |
|
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 |
|
Jakub Sztuba
|
556c396959
|
Add more levels
|
2023-01-07 21:02:30 +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 |
|
kabix09
|
90c426bff3
|
Merge remote-tracking branch 'origin/master'
|
2023-01-07 17:51:56 +01:00 |
|
kabix09
|
ecaddbd69a
|
Added First Wizard Quest - part II
|
2023-01-07 17:50:25 +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
|
a6c2841226
|
Keybinding saving improvement
|
2023-01-07 12:02:47 +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
|
cc6146631b
|
Fix for starting new game window on first run
|
2023-01-06 21:52:59 +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
|
10c03b5183
|
Items - fix pickable ability
|
2023-01-06 13:32:35 +01:00 |
|
kabix09
|
f7e99ede60
|
Items - restore Dropping & Saving module
|
2023-01-06 03:44:07 +01:00 |
|
kabix09
|
2d088ba775
|
Merge remote-tracking branch 'origin/master'
|
2023-01-05 21:24:18 +01:00 |
|
kabix09
|
3e861d2ac3
|
Respown & Save fix
|
2023-01-05 21:23:01 +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 |
|
|
|
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 |
|
