 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
|
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 |
|
 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 |
|
|
jonathan
|
59d313d97d
|
Added basic entity scripts
|
2025-12-18 14:27:27 +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
|
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
|
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 |
|
|
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
|
64c15c2e63
|
removed print statements
|
2025-12-16 13:14:25 +01:00 |
|
|
kziolkowski
|
a98c842ee0
|
🐛 Fixed field interaction bug
|
2025-12-16 13:04:40 +01:00 |
|
|
kziolkowski
|
abed751d29
|
🚧 WIP trying to make fields have outlines again
|
2025-12-15 22:45:02 +01:00 |
|
|
kziolkowski
|
ce113e16da
|
🐛 planting seeds works again
|
2025-12-15 21:33:04 +01:00 |
|
|
kziolkowski
|
c509a52001
|
🚧 Basic interaction works now too
|
2025-12-12 13:49:16 +01:00 |
|
|
kziolkowski
|
9e0e87ef17
|
🚧 WIP detection works now
|
2025-12-12 13:46:32 +01:00 |
|
|
jonathan
|
6375383373
|
🐛Made attack selection only select alive enemies
|
2025-12-11 18:49:51 +01:00 |
|
|
kziolkowski
|
b232cb31c3
|
🚧 interaction kinda sorta works now, still needs tweaking
|
2025-12-10 16:57:39 +01:00 |
|
|
kziolkowski
|
9499c27444
|
🚧 WIP: trying to rework the detection system (it fails)
|
2025-12-09 17:51:00 +01:00 |
|
|
jonathan
|
a736adaafb
|
Randomized who starts the fight
|
2025-12-09 15:07:50 +01:00 |
|
|
kziolkowski
|
e51e0a24d2
|
🐛 fixed dialogic bugs and moved trash items out of the way
|
2025-12-06 21:46:54 +01:00 |
|
|
kziolkowski
|
7bb523f9e7
|
🐛 harvested plants don't come back on scene reload
|
2025-12-06 20:47:56 +01:00 |
|
|
kziolkowski
|
a3651d6268
|
deleted unused code
|
2025-12-06 20:40:47 +01:00 |
|
|
kziolkowski
|
0892a13e66
|
🐛 fixed beet harvesting
|
2025-12-06 20:36:22 +01:00 |
|
|
kziolkowski
|
61caa6eea6
|
Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish
|
2025-12-06 19:59:31 +01:00 |
|
|
kziolkowski
|
b7d1f9d8d5
|
Merge branch 'develop' into minigame_hit_feedback
|
2025-12-06 19:54:05 +01:00 |
|
|
kziolkowski
|
0d985e5bf6
|
Merge branch 'develop' into minigame_variation
|
2025-12-06 19:53:44 +01:00 |
|