 kziolkowski
|
093546f3e4
|
Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
# Conflicts:
# scenes/Babushka_scene_farm_outside_2d.tscn
# scenes/Babushka_scene_indoor_vesnas_room.tscn
# scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
|
2025-11-18 15:24:45 +01:00 |
|
|
kziolkowski
|
6613e54658
|
✨ Implemented Loading function on fields and plants
|
2025-11-15 22:15:10 +01:00 |
|
|
kziolkowski
|
3fcb34c04d
|
🚧 saving of field parameters as json implemented
|
2025-11-12 18:46:30 +01:00 |
|
|
kziolkowski
|
5cc65bc3f4
|
🔧 filled up main outdoor scene with fields
|
2025-11-12 15:20:21 +01:00 |
|
|
kziolkowski
|
443741f5f1
|
🐛 added preset fields to main outdoor scene and made them farmable
|
2025-11-12 15:14:10 +01:00 |
|
|
kziolkowski
|
554a319428
|
🚧 farming rework part 2: you can now kinda "create" fields
|
2025-11-11 16:39:47 +01:00 |
|
|
kziolkowski
|
b00b466045
|
🚧 watering fields kinda works now
|
2025-11-11 15:51:15 +01:00 |
|
|
kziolkowski
|
d51cc461f7
|
🚧 made preplaced fields show plants
|
2025-11-11 14:27:56 +01:00 |
|
|
kziolkowski
|
55f0d2a77e
|
🚧 reworked farming system to work with indices instead of positions
|
2025-11-11 14:02:03 +01:00 |
|
 jonathan
|
1531ffbf8d
|
✨Sleeping in bed now loads the new fight world scene
|
2025-11-11 12:49:38 +01:00 |
|
|
kziolkowski
|
97dcadf07a
|
✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
|
2025-11-11 12:15:30 +01:00 |
|
|
jonathan
|
c814d7606d
|
🐛Fixed wrong dependency
|
2025-11-11 11:12:54 +01:00 |
|
|
kziolkowski
|
6a2355cf97
|
🐛 fixed never more than 10 fields bug
|
2025-11-07 18:18:05 +01:00 |
|
|
kziolkowski
|
f1b980cdb6
|
🐛 field creation at the same spot no longer possible, also watering works now.
|
2025-11-05 16:48:45 +01:00 |
|
|
kziolkowski
|
8b77ca9bc5
|
♻️ migrated the InteractionAreas currently used to the new format and removed the old code
|
2025-11-04 17:20:15 +01:00 |
|
|
jonathan
|
0de3bcae22
|
♻️Code cleanup
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
3326bde40c
|
🐛Exiting fight happening when one side wins
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
8bb1c22549
|
Added minigame to attack action
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
8624e2aea8
|
Added minigame
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
f4d8ed87e2
|
Added blob attack action
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
9bf25640f6
|
Added basic action animation
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
0e315396c9
|
Made fight fightable
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
f27dd199b8
|
Fight happening base setup
|
2025-11-04 05:27:34 +01:00 |
|
|
jonathan
|
fd0e631b1f
|
Bootstrap fight system
- Fight World data structure
- Generating basic fight world
- Opening correct fight room
- Block paths in fight rooms
- Transition between rooms
|
2025-11-04 05:25:22 +01:00 |
|
|
kziolkowski
|
af8807610d
|
:bug increased interaction area size for fence gates
|
2025-10-29 16:25:31 +01:00 |
|
|
kziolkowski
|
02b6584e44
|
🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
|
2025-10-29 16:03:36 +01:00 |
|
|
kziolkowski
|
e202534c6b
|
🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
|
2025-10-29 15:00:30 +01:00 |
|
|
kziolkowski
|
1f13f3ea51
|
Merge branch 'develop' into feature/detection_cross
# Conflicts:
# addons/dialogic/vesna_style.tres
# dialog/NPC_narrative.tres
# scenes/Babushka_scene_indoor_vesnas_room.tscn
|
2025-10-29 14:01:55 +01:00 |
|
|
kziolkowski
|
3fe79f2fd8
|
✨ Added VariableGetter functionality and some Variable setting components. Also added them to test scene.
|
2025-10-28 13:09:36 +01:00 |
|
|
kziolkowski
|
c96e6da78e
|
✨ Separated events from variables and adjusted test scene
|
2025-10-28 11:57:36 +01:00 |
|
|
kziolkowski
|
e1b1a2f447
|
🔧 adjusted seed pickup positions and indoor collider sizes
|
2025-10-24 15:57:14 +02:00 |
|
|
kziolkowski
|
2d4e853ec8
|
🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
|
2025-10-24 15:45:10 +02:00 |
|
|
kziolkowski
|
ffebe10593
|
💄 Added new fonts and increased textbox size. Also added border line.
|
2025-10-21 13:41:43 +02:00 |
|
|
kziolkowski
|
5bcbee8865
|
created test scene and removed event test elements from start scene
|
2025-10-21 12:38:15 +02:00 |
|
|
kziolkowski
|
a593be8273
|
📝 added documentation and improved event scope
|
2025-10-18 17:15:35 +02:00 |
|
|
kziolkowski
|
1e004b62b8
|
Implemented first version of EventResources
|
2025-10-13 09:57:49 +02:00 |
|
|
kziolkowski
|
5fc7b3d563
|
scene updates after undoing changes to interactionArea
|
2025-10-03 17:02:07 +02:00 |
|
|
kziolkowski
|
936983e14f
|
💄 updated dialogic style to make it clearer who is talking and have vesna always on the left side
|
2025-09-27 17:24:01 +02:00 |
|
|
kziolkowski
|
e73f13d7d4
|
🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
|
2025-09-27 16:54:17 +02:00 |
|
|
kziolkowski
|
0713e334b3
|
Fixed InventoryInstance behaviour
|
2025-09-26 00:31:11 +02:00 |
|
|
kziolkowski
|
c56f654751
|
Set up second garden with beetroot, built transition from yard and back
|
2025-09-17 17:58:28 +02:00 |
|
|
kziolkowski
|
1f88f9b4b5
|
Added beetroot as growable plant
|
2025-09-17 16:53:57 +02:00 |
|
|
kziolkowski
|
06fd80f762
|
grass layering fix
|
2025-09-17 15:10:29 +02:00 |
|
|
kziolkowski
|
2cb605261e
|
Fixed Tomato farming (again)
|
2025-09-17 15:07:17 +02:00 |
|
|
kziolkowski
|
d1a8ff0cbf
|
WIP reworking the item repository
|
2025-09-09 23:57:55 +02:00 |
|
|
kziolkowski
|
e44e06bace
|
Added Footsteps SFX
|
2025-08-27 17:12:12 +02:00 |
|
|
kziolkowski
|
871e1856f1
|
Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN)
|
2025-08-20 00:26:58 +02:00 |
|
|
kziolkowski
|
378bf45c49
|
Implemented PR feedback + made sure initial farming quests run smoothly
|
2025-08-19 23:02:14 +02:00 |
|
|
kziolkowski
|
f6e0c4e615
|
minor scene fixes
|
2025-08-18 00:10:20 +02:00 |
|
|
kziolkowski
|
6ae877f2ab
|
Implemented first version of an interactable area that reacts to inventory selection
|
2025-08-17 23:49:04 +02:00 |
|