 saderako
|
5636c0da67
|
Add first two cat animations
Petting animation is still being worked on
|
2025-12-22 12:30:31 +01:00 |
|
 kziolkowski
|
4578a2cfda
|
Added Spine2D GDExtension bin to project
|
2025-12-22 10:48:58 +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 |
|
|
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 |
|
|
jlink
|
2ed9dbbc52
|
Vesna resets to bed after death
|
2025-12-16 15:34:52 +01:00 |
|
|
jonathan
|
6375383373
|
🐛Made attack selection only select alive enemies
|
2025-12-11 18:49:51 +01:00 |
|
|
Jonathan
|
b810ea1d9f
|
Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43) from Kampf_Tooltip into develop
Reviewed-on: #43
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-11 17:29:54 +01:00 |
|
|
kziolkowski
|
3d19509826
|
Merge pull request 'feature/art_update' (#40) from feature/art_update into develop
Reviewed-on: #40
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-10 16:23:41 +01:00 |
|
|
kziolkowski
|
113dd0820f
|
Merge branch 'develop' into feature/art_update
|
2025-12-10 16:23:04 +01:00 |
|
|
kziolkowski
|
7e148cd9fe
|
🐛 fixed Ysorting issues in fightworld
|
2025-12-10 16:21:48 +01:00 |
|
|
kziolkowski
|
59489e4a17
|
Made common room into hub area and ajdusted Yeli dialogue
|
2025-12-10 16:02:38 +01:00 |
|
|
jlink
|
fc00559483
|
Kampf Tooltip wird ausgeblendet
|
2025-12-10 15:53:55 +01:00 |
|
|
kziolkowski
|
982178d89a
|
🐛 fixed sunflower parallaxing to *perfection*
|
2025-12-10 15:34:45 +01:00 |
|
|
jlink
|
09f55d3aa7
|
BlobFighter TargetSelection ColliderShape2D Transform angepasst
|
2025-12-10 15:29:56 +01:00 |
|
|
kziolkowski
|
c89685c936
|
🐛 fixed colliders in kitchen
|
2025-12-10 15:15:01 +01:00 |
|
|
kziolkowski
|
79108fbe15
|
🐛 fixed parallax problems
|
2025-12-10 15:12:43 +01:00 |
|
|
Jonathan
|
0434667c22
|
Merge pull request 'feature/bugfixes_And_Polish' (#39) from feature/bugfixes_And_Polish into develop
Reviewed-on: #39
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-09 15:20:36 +01:00 |
|
|
jonathan
|
a736adaafb
|
Randomized who starts the fight
|
2025-12-09 15:07:50 +01:00 |
|
|
kziolkowski
|
bef54420e4
|
darkened fightworld room to make it look more like night
|
2025-12-07 10:54:54 +01:00 |
|
|
kziolkowski
|
9267278ce8
|
tried and failed at fixing all layering issues in beet scene
|
2025-12-07 10:43:41 +01:00 |
|
|
kziolkowski
|
9ba83dfddd
|
Made stove interactable
|
2025-12-07 10:26:20 +01:00 |
|
|
kziolkowski
|
7c5ba2d6bb
|
Added kitchen room
|
2025-12-07 10:22:02 +01:00 |
|
|
kziolkowski
|
0c5fc26d2f
|
🍱 changed forest background in first farming scene
|
2025-12-07 09:18:55 +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
|
2ec693eed2
|
Merge pull request 'Added visual feedback when hitting a region in the minigame' (#37) from minigame_hit_feedback into develop
Reviewed-on: #37
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-06 19:54:11 +01:00 |
|
|
kziolkowski
|
b7d1f9d8d5
|
Merge branch 'develop' into minigame_hit_feedback
|
2025-12-06 19:54:05 +01:00 |
|
|
kziolkowski
|
12bf632932
|
Merge pull request 'Added randomnes into attack minigame' (#36) from minigame_variation into develop
Reviewed-on: #36
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-06 19:53:49 +01:00 |
|
|
kziolkowski
|
0d985e5bf6
|
Merge branch 'develop' into minigame_variation
|
2025-12-06 19:53:44 +01:00 |
|
|
kziolkowski
|
e86b3e81dd
|
Merge pull request 'fighting minigame has no more Overlap with Vesna' (#38) from fighting_minigame_fix_overlap_with_Vesna into develop
Reviewed-on: #38
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-06 19:46:23 +01:00 |
|
|
jlink
|
14a73daa75
|
fighting minigame has no more Overlap with Vesna
|
2025-12-06 12:15:31 +01:00 |
|
|
kziolkowski
|
996470f5e6
|
🐛 fixed beets double spawning bug
|
2025-12-04 23:45:35 +01:00 |
|
|
kziolkowski
|
1dd4a694d0
|
Merge pull request 'feature/day_and_night' (#34) from feature/day_and_night into develop
Reviewed-on: #34
|
2025-12-04 22:34:17 +01:00 |
|
|
kziolkowski
|
9b8933e698
|
♻️ removed no longer used method
|
2025-12-04 22:33:45 +01:00 |
|
|
kziolkowski
|
9f4cda0e6d
|
♻️ Replaced _ready mit _entertree (while deferring)
|
2025-12-04 22:22:40 +01:00 |
|
|
kziolkowski
|
1c865730a3
|
🚚 renamed directory
|
2025-12-04 22:05:33 +01:00 |
|
|
jonathan
|
aa4f1c55b5
|
✨Added visual feedback when hitting a region in the minigame
|
2025-12-04 21:18:47 +01:00 |
|
|
jonathan
|
aad6c44567
|
Added randomnes into attack minigame
|
2025-12-04 18:00:20 +01:00 |
|