 jonathan
|
7841252809
|
Make Vesna entity save current position
|
2026-02-04 20:40:50 +01:00 |
|
|
jonathan
|
1b77718b9b
|
Added basic vesna entity
|
2026-02-04 20:25:54 +01:00 |
|
|
jonathan
|
0bf3cc19c7
|
Changed naming stile for constants to CAPSLOCK
|
2026-02-04 19:57:46 +01:00 |
|
|
jonathan
|
89321e917a
|
Removed all outside connection to and from the Vesna prefabs
|
2026-02-04 19:43:49 +01:00 |
|
|
jonathan
|
2cbf7e15a4
|
Changed camera no not need a direct reference to vesna
|
2026-02-04 19:40:10 +01:00 |
|
 Jonathan
|
628da80ed3
|
Merge pull request 'feature/entity_rework' (#52) from feature/entity_rework into develop
Reviewed-on: #52
Reviewed-by: Jonathan <cblech@ymail.com>
|
2026-02-03 18:44:13 +01:00 |
|
 Katharina Ziolkowski
|
0dfbd73978
|
Reverted ItemOnGround to make everything compile again
|
2026-02-03 17:59:38 +01:00 |
|
|
Katharina Ziolkowski
|
8a93b00e72
|
Merge branch 'develop' into feature/entity_rework
# Conflicts:
# scenes/scene_credits.tscn
# scenes/scene_farm_outside_2d.tscn
# scenes/scene_fight_world_room.tscn
# scenes/scene_indoor_vesnas_room.tscn
# scenes/scene_outside_beets.tscn
# scripts/CSharp/Common/Farming/PlantBehaviour2D.cs
|
2026-02-03 17:53:28 +01:00 |
|
|
Katharina Ziolkowski
|
ba7d550c3f
|
Implemented Save and Load functionality
|
2026-02-03 17:30:35 +01:00 |
|
|
Katharina Ziolkowski
|
b65a3bbd6d
|
Managed the freeing of entityplacers. Also cleaned up EntityManager
|
2026-02-03 15:36:59 +01:00 |
|
|
Katharina Ziolkowski
|
bcbc074c86
|
First adjustments to the Entity System to make it work with different types
|
2026-02-03 13:55:13 +01:00 |
|
|
jonathan
|
745f54b375
|
WIP
|
2026-01-29 17:42:32 +01:00 |
|
 kziolkowski
|
2c8a024528
|
Merge pull request 'feature/build_0_7' (#49) from feature/build_0_7 into develop
Reviewed-on: #49
Reviewed-by: Jonathan <cblech@ymail.com>
|
2026-01-27 13:04:21 +01:00 |
|
|
kziolkowski
|
76eb408a40
|
Merge branch 'develop' into feature/build_0_7
|
2026-01-27 13:01:34 +01:00 |
|
|
Katharina Ziolkowski
|
ff143f07e7
|
deleted unused autosave file
|
2026-01-27 13:00:38 +01:00 |
|
|
Jonathan
|
b50ca5b919
|
Merge pull request 'einfügen von Gesichtsausdrücken für Vesna' (#46) from Vesna_Gesichtsausdrücke_einfügen_ into develop
Reviewed-on: #46
Reviewed-by: Jonathan <cblech@ymail.com>
|
2026-01-13 23:43:46 +01:00 |
|
|
jonathan
|
59d313d97d
|
Added basic entity scripts
|
2025-12-18 14:27:27 +01:00 |
|
|
Jonathan
|
9032272599
|
Merge pull request 'BlobFighter TargetSelection ColliderShape2D Transform angepasst' (#42) from Enemy_selection_overlap into develop
Reviewed-on: #42
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-18 13:06:03 +01:00 |
|
 jlink
|
a2ef3bfaf0
|
Window angepasst
|
2025-12-18 13:02:32 +01:00 |
|
|
jlink
|
1ab1071246
|
HoverIndicator off
|
2025-12-17 15:29:58 +01:00 |
|
|
kziolkowski
|
b0ee8c4c58
|
fixed path strings in scene transitions and added disclaimer and credits back into the flow
|
2025-12-17 01:07:39 +01:00 |
|
|
kziolkowski
|
522fdfa365
|
Added fightworld background and cat dialogue
|
2025-12-17 00:40:43 +01:00 |
|
|
kziolkowski
|
4f6c5ab9c1
|
fixed some layering issues in beetroot scene and added a mock convo with the domovoi
|
2025-12-17 00:15:42 +01:00 |
|
|
kziolkowski
|
11e24e249e
|
Fixed Field outline not disappearing when switching tools
|
2025-12-16 23:29:48 +01:00 |
|
|
kziolkowski
|
f3080df4b7
|
moved fence door collision shape up to reduce unwanted triggering
|
2025-12-16 23:13:38 +01:00 |
|
|
kziolkowski
|
f6e83e7fef
|
Added event handlers in Fieldbehaviour to react to watering can state changes
|
2025-12-16 23:13:09 +01:00 |
|
|
kziolkowski
|
3bdc8cd03f
|
Deactivated harvestable plant on spawn
|
2025-12-16 23:06:58 +01:00 |
|
|
kziolkowski
|
f862827d98
|
Removed Print statements
|
2025-12-16 23:06:41 +01:00 |
|
|
kziolkowski
|
a401cbe5b9
|
🐛 fixed field activator self-deactivating on load bug
|
2025-12-16 22:53:22 +01:00 |
|
|
kziolkowski
|
48660b167c
|
Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7
# Conflicts:
# scenes/scene_farm_outside_2d.tscn
|
2025-12-16 21:59:04 +01:00 |
|
|
Jonathan
|
e5b2b8b8ab
|
Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop
Reviewed-on: #44
|
2025-12-16 20:44:26 +01:00 |
|
|
Jonathan
|
2fa8aa9fbc
|
Merge pull request 'Vesna resets to bed after death' (#47) from Vesna_resets_to_bed_after_dead into develop
Reviewed-on: #47
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-16 19:37:29 +01:00 |
|
|
Jonathan
|
6deb6e29fd
|
Merge pull request 'Made attack selection only select alive enemies' (#45) from bug/attack_dead_enemy into develop
Reviewed-on: #45
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-16 19:30:33 +01:00 |
|
|
Jonathan
|
edc133749f
|
Merge pull request 'Randomized who starts the fight' (#41) from randomise_fight_start into develop
Reviewed-on: #41
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-16 19:28:37 +01:00 |
|
|
jonathan
|
5f75bde317
|
💄 Made heal button show how many beats are left
|
2025-12-16 19:24:20 +01:00 |
|
|
jonathan
|
7310bfbf6e
|
✨Added flying beet to the ui when used
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
fef8380a57
|
✨When beetroot is in inventory the player can heal
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
f42c2c86b1
|
✨ Defeated enemygroups now drop a beet_seed
|
2025-12-16 19:09:03 +01:00 |
|
|
kziolkowski
|
f1a2e6166b
|
🐛 fixed field setup in beet scene
|
2025-12-16 18:09:51 +01:00 |
|
|
kziolkowski
|
c0111e4c17
|
🐛 fixed rake triggering field interaction + watering can interaction
|
2025-12-16 16:43:46 +01:00 |
|
|
jlink
|
2ed9dbbc52
|
Vesna resets to bed after death
|
2025-12-16 15:34:52 +01:00 |
|
|
kziolkowski
|
4f660c4af8
|
🐛 fixed rake still activating field outlines bug
|
2025-12-16 15:11:32 +01:00 |
|
|
kziolkowski
|
13fcf059e9
|
Added trash object savestate
|
2025-12-16 15:03:27 +01:00 |
|
|
kziolkowski
|
7f58aeae76
|
removed GD.Prints
|
2025-12-16 14:33:54 +01:00 |
|
|
jlink
|
3456340bb7
|
einfügen von Gesichtsausdrücken für Vesna
|
2025-12-16 14:30:23 +01:00 |
|
|
kziolkowski
|
30750d2e3c
|
♻️ removed planted state from Fieldstate because it didn't make any sense.
|
2025-12-16 14:27:12 +01:00 |
|
|
kziolkowski
|
950731b225
|
🐛 Fixed ObjectNotDisposedException on Well in beetroot scene
|
2025-12-16 13:46:28 +01:00 |
|
|
kziolkowski
|
feb591f56a
|
♻️ modified changed path in start scene
|
2025-12-16 13:46:07 +01:00 |
|
|
kziolkowski
|
aac0992590
|
♻️ scene name refactoring part two: fixing scene transition paths in scenes
|
2025-12-16 13:34:32 +01:00 |
|
|
kziolkowski
|
21cf2d1a6a
|
♻️ Renamed scenes
|
2025-12-16 13:17:39 +01:00 |
|