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>
|
4 weeks ago |
JoansLink00
|
a2ef3bfaf0
|
Window angepasst
|
4 weeks ago |
JoansLink00
|
1ab1071246
|
HoverIndicator off
|
4 weeks ago |
Jonathan
|
e5b2b8b8ab
|
Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop
Reviewed-on: #44
|
4 weeks ago |
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>
|
4 weeks ago |
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>
|
4 weeks ago |
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>
|
4 weeks ago |
jonathan
|
5f75bde317
|
💄 Made heal button show how many beats are left
|
4 weeks ago |
jonathan
|
7310bfbf6e
|
✨Added flying beet to the ui when used
|
4 weeks ago |
jonathan
|
fef8380a57
|
✨When beetroot is in inventory the player can heal
|
4 weeks ago |
jonathan
|
f42c2c86b1
|
✨ Defeated enemygroups now drop a beet_seed
|
4 weeks ago |
JoansLink00
|
2ed9dbbc52
|
Vesna resets to bed after death
|
4 weeks ago |
jonathan
|
6375383373
|
🐛Made attack selection only select alive enemies
|
1 month ago |
Jonathan
|
b810ea1d9f
|
Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43) from Kampf_Tooltip into develop
Reviewed-on: #43
Reviewed-by: Jonathan <cblech@ymail.com>
|
1 month ago |
kziolkowski
|
3d19509826
|
Merge pull request 'feature/art_update' (#40) from feature/art_update into develop
Reviewed-on: #40
Reviewed-by: Jonathan <cblech@ymail.com>
|
1 month ago |
kziolkowski
|
113dd0820f
|
Merge branch 'develop' into feature/art_update
|
1 month ago |
kziolkowski
|
7e148cd9fe
|
🐛 fixed Ysorting issues in fightworld
|
1 month ago |
kziolkowski
|
59489e4a17
|
Made common room into hub area and ajdusted Yeli dialogue
|
1 month ago |
JoansLink00
|
fc00559483
|
Kampf Tooltip wird ausgeblendet
|
1 month ago |
kziolkowski
|
982178d89a
|
🐛 fixed sunflower parallaxing to *perfection*
|
1 month ago |
JoansLink00
|
09f55d3aa7
|
BlobFighter TargetSelection ColliderShape2D Transform angepasst
|
1 month ago |
kziolkowski
|
c89685c936
|
🐛 fixed colliders in kitchen
|
1 month ago |
kziolkowski
|
79108fbe15
|
🐛 fixed parallax problems
|
1 month ago |
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>
|
1 month ago |
jonathan
|
a736adaafb
|
Randomized who starts the fight
|
1 month ago |
kziolkowski
|
bef54420e4
|
darkened fightworld room to make it look more like night
|
1 month ago |
kziolkowski
|
9267278ce8
|
tried and failed at fixing all layering issues in beet scene
|
1 month ago |
kziolkowski
|
9ba83dfddd
|
Made stove interactable
|
1 month ago |
kziolkowski
|
7c5ba2d6bb
|
Added kitchen room
|
1 month ago |
kziolkowski
|
0c5fc26d2f
|
🍱 changed forest background in first farming scene
|
1 month ago |
kziolkowski
|
e51e0a24d2
|
🐛 fixed dialogic bugs and moved trash items out of the way
|
1 month ago |
kziolkowski
|
7bb523f9e7
|
🐛 harvested plants don't come back on scene reload
|
1 month ago |
kziolkowski
|
a3651d6268
|
deleted unused code
|
1 month ago |
kziolkowski
|
0892a13e66
|
🐛 fixed beet harvesting
|
1 month ago |
kziolkowski
|
61caa6eea6
|
Merge branch 'refs/heads/develop' into feature/bugfixes_And_Polish
|
1 month ago |
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>
|
1 month ago |
kziolkowski
|
b7d1f9d8d5
|
Merge branch 'develop' into minigame_hit_feedback
|
1 month ago |
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>
|
1 month ago |
kziolkowski
|
0d985e5bf6
|
Merge branch 'develop' into minigame_variation
|
1 month ago |
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>
|
1 month ago |
JoansLink00
|
14a73daa75
|
fighting minigame has no more Overlap with Vesna
|
1 month ago |
kziolkowski
|
996470f5e6
|
🐛 fixed beets double spawning bug
|
1 month ago |
kziolkowski
|
1dd4a694d0
|
Merge pull request 'feature/day_and_night' (#34) from feature/day_and_night into develop
Reviewed-on: #34
|
1 month ago |
kziolkowski
|
9b8933e698
|
♻️ removed no longer used method
|
1 month ago |
kziolkowski
|
9f4cda0e6d
|
♻️ Replaced _ready mit _entertree (while deferring)
|
1 month ago |
kziolkowski
|
1c865730a3
|
🚚 renamed directory
|
1 month ago |
jonathan
|
aa4f1c55b5
|
✨Added visual feedback when hitting a region in the minigame
|
1 month ago |
jonathan
|
aad6c44567
|
Added randomnes into attack minigame
|
1 month ago |
jlink
|
8e9359d6f8
|
Merge pull request 'fight log no longer visible and door interactable' (#35) from remove_fightlog into develop
Reviewed-on: #35
|
1 month ago |
JoansLink00
|
7696271727
|
fight log no longer visible and door interactable
|
1 month ago |
kziolkowski
|
229dd04bc1
|
✨ Made bed interaction count up the days and verified that you can now play a full loop
|
1 month ago |
kziolkowski
|
8407ce4c1f
|
✨ Added Tab button mapping to inventory and fixed label descriptor
|
1 month ago |
kziolkowski
|
b9a52dadcc
|
✨ fields can now seperate "today" from any other day
|
1 month ago |
kziolkowski
|
0ecae5a4d9
|
✨ watering can fillstate is saving and loading
|
1 month ago |
kziolkowski
|
c288af296c
|
✨ made plants only grow when watered
|
1 month ago |
kziolkowski
|
e65330786e
|
🐛 fixed dayplanted confusion on plants
|
1 month ago |
kziolkowski
|
c7a4aea70b
|
✨ Starting a new game resets the inventory now
|
1 month ago |
kziolkowski
|
b6caf4dbed
|
🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot
|
1 month ago |
kziolkowski
|
51a145a994
|
🚚 renamed player prefab to Vesna
|
1 month ago |
kziolkowski
|
41b30a4274
|
🚧 days are counted, plants know which day it is, but harvestables are still broken
|
1 month ago |
kziolkowski
|
a1fb71119f
|
🚧 WIP binding the plant growth to the day count in the savefile
|
2 months ago |
kziolkowski
|
67d5b67c21
|
💄 Added new game button that resets the savegame (also did some layouting)
|
2 months ago |
kziolkowski
|
684131f495
|
✨ Make SaveableVariableNodes and a simple cheat to count up days
|
2 months ago |
kziolkowski
|
f32033cb5f
|
Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
Reviewed-on: #33
|
2 months ago |
kziolkowski
|
1ad463ccb0
|
🔥 removed unused code
|
2 months ago |
kziolkowski
|
451ea82706
|
Merge pull request 'feature/save_and_loaaaaaad' (#32) from feature/save_and_loaaaaaad into develop
Reviewed-on: #32
|
2 months ago |
jonathan
|
3f4dfccbc6
|
🐛Make the FightWorld reset when sleeping in the bed
|
2 months ago |
jonathan
|
3c370e30a0
|
✨Added end of night scene
|
2 months ago |
jonathan
|
073a74bb22
|
🚸Rebalanded fight to make it more likely to win
|
2 months ago |
kziolkowski
|
75e4bdd7fd
|
♻️ removed Print statements
|
2 months ago |
kziolkowski
|
f37f7c7ceb
|
✨ added saving and loading support to collectable inventory items
|
2 months ago |
kziolkowski
|
70383fc16e
|
✨ Implemented load check for unique inventory items
|
2 months ago |
kziolkowski
|
88f3c90eec
|
♻️ inventory works
|
2 months ago |
kziolkowski
|
9d818e5079
|
♻️ refactored field code to work with the new id system
|
2 months ago |
kziolkowski
|
e9cd4ce276
|
♻️ reworked and debugged the SaveSystem. Removed unnecessary scene reference.
|
2 months ago |
kziolkowski
|
638ebaff46
|
📝 Added documentation
|
2 months ago |
kziolkowski
|
b4013b1ff2
|
:feature: made GetComponent nullable in NodeExtension
|
2 months ago |
kziolkowski
|
c695115a4a
|
:feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea
|
2 months ago |
kziolkowski
|
c68727aebe
|
🚧 intermediate state with homework
|
2 months ago |
kziolkowski
|
bee6249c6f
|
🚧 implemented interaction area loading
|
2 months ago |
kziolkowski
|
fda2b95b38
|
Savesystem rework
|
2 months ago |
kziolkowski
|
4bbaab1a2a
|
Created ISaveable interface and made existing saveable classes inherit from it.
|
2 months ago |
kziolkowski
|
4ed6f4e7d9
|
Reworked existing save system for user data: Made path steam-compatible, added Versioning and try/catch to save
|
2 months ago |
kziolkowski
|
ce29711614
|
❇️ Added Settings classes to save and load local configurations
|
2 months ago |
kziolkowski
|
2947011a1a
|
working intermediate state of the save system
|
2 months ago |
kziolkowski
|
2a4425b9db
|
✨ Added Save and load support to the inventory
|
2 months ago |
kziolkowski
|
72079044bd
|
🚧 WIP implementing save and load for the inventory
|
2 months ago |
Jonathan
|
b205e45096
|
Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop
Reviewed-on: #30
|
2 months ago |
kziolkowski
|
d17e58bcd3
|
🐛 removed stub code and unused signal from FarmingControls2D
|
2 months ago |
kziolkowski
|
02cbc761bc
|
reverted changed start scene in project godot
|
2 months ago |
Jonathan
|
fb6a42a874
|
Merge pull request 'Added damage fly number' (#29) from feature/damage_feedback into develop
Reviewed-on: #29
|
2 months ago |
Jonathan
|
4bd433b1b0
|
Merge pull request 'Import changes lol' (#31) from feature/import_changes into develop
Reviewed-on: #31
|
2 months ago |
kziolkowski
|
c02a2d1383
|
Import changes lol
|
2 months ago |
kziolkowski
|
c5f8b157ad
|
🐛 changed savegame location to user-space instead of project-space
|
2 months ago |
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
|
2 months ago |
kziolkowski
|
c9f97c2571
|
📝 added documentation comments
|
2 months ago |
kziolkowski
|
6613e54658
|
✨ Implemented Loading function on fields and plants
|
2 months ago |
kziolkowski
|
3fcb34c04d
|
🚧 saving of field parameters as json implemented
|
2 months ago |
kziolkowski
|
5cc65bc3f4
|
🔧 filled up main outdoor scene with fields
|
2 months ago |
kziolkowski
|
443741f5f1
|
🐛 added preset fields to main outdoor scene and made them farmable
|
2 months ago |
kziolkowski
|
554a319428
|
🚧 farming rework part 2: you can now kinda "create" fields
|
2 months ago |
jonathan
|
3bb4fcd129
|
✨Added damage fly number
|
2 months ago |
kziolkowski
|
4705d1ee2f
|
🐛 can no longer water fields when watering can is empty
|
2 months ago |
kziolkowski
|
b00b466045
|
🚧 watering fields kinda works now
|
2 months ago |
Jonathan
|
0507f1ee3d
|
Merge pull request 'Sleeping in bed now loads the new fight world scene' (#27) from feature/integrate_new_fight into develop
Reviewed-on: #27
|
2 months ago |
Jonathan
|
651ec2cc68
|
Merge pull request 'Fixed enemy groups show in different spots and even when all enemies are dead' (#28) from bug/enemy_group into develop
Reviewed-on: #28
|
2 months ago |
kziolkowski
|
d51cc461f7
|
🚧 made preplaced fields show plants
|
2 months ago |
jonathan
|
54bfc3c021
|
🐛 Fixed enemy groups show in different spots and even when all enemies are dead
|
2 months ago |
kziolkowski
|
55f0d2a77e
|
🚧 reworked farming system to work with indices instead of positions
|
2 months ago |
kziolkowski
|
97dcadf07a
|
✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
|
2 months ago |
kziolkowski
|
fe1dd2bcc1
|
✨ Added inventorylistener for watering can
|
2 months ago |
kziolkowski
|
6e833a0735
|
✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory
|
2 months ago |
kziolkowski
|
c52bfc8017
|
🐛 fixed field outline
|
2 months ago |
kziolkowski
|
58c2be1db8
|
✨ plants no longer grow when just interacting with them
|
2 months ago |
kziolkowski
|
c7c6e184d6
|
🐛 adjusted field positions
|
2 months ago |
kziolkowski
|
6a2355cf97
|
🐛 fixed never more than 10 fields bug
|
2 months ago |
kziolkowski
|
1d7f656ec4
|
🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why.
|
2 months ago |
kziolkowski
|
1c5b585b3d
|
🔥 removed print statements used for debugging
|
2 months ago |
kziolkowski
|
f1b980cdb6
|
🐛 field creation at the same spot no longer possible, also watering works now.
|
2 months ago |
kziolkowski
|
8b77ca9bc5
|
♻️ migrated the InteractionAreas currently used to the new format and removed the old code
|
2 months ago |
kziolkowski
|
8d616735f4
|
🚚 moved Animationfix script
|
2 months ago |
kziolkowski
|
66848af8bf
|
Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
|
2 months ago |
kziolkowski
|
6ba26c360d
|
🚧 reworking Fieldservice
|
2 months ago |
kziolkowski
|
63fd81e54d
|
🔥 removed no longer needed scene call group
|
2 months ago |
kziolkowski
|
b54f784d51
|
🎨 Replaced pickup animation group call with event
|
2 months ago |
kziolkowski
|
6194988bf0
|
🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event.
|
2 months ago |