Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity
485 Commits
46 Branches
0 Tags
5.7 GiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'fighting_minigame_fix_overlap_with_Vesna'
${ noResults }
Commit Graph

485 Commits (fighting_minigame_fix_overlap_with_Vesna)
 

Author SHA1 Message Date
Katharina Ziolkowski c5f8b157ad 🐛 changed savegame location to user-space instead of project-space
5 months ago
Katharina Ziolkowski 093546f3e4 Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
5 months ago
Katharina Ziolkowski c9f97c2571 📝 added documentation comments
5 months ago
Katharina Ziolkowski 6613e54658 ✨ Implemented Loading function on fields and plants
5 months ago
Katharina Ziolkowski 3fcb34c04d 🚧 saving of field parameters as json implemented
5 months ago
Katharina Ziolkowski 5cc65bc3f4 🔧 filled up main outdoor scene with fields
5 months ago
Katharina Ziolkowski 443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable
5 months ago
Katharina Ziolkowski 554a319428 🚧 farming rework part 2: you can now kinda "create" fields
5 months ago
jonathan 3bb4fcd129 ✨Added damage fly number
5 months ago
Katharina Ziolkowski 4705d1ee2f 🐛 can no longer water fields when watering can is empty
5 months ago
Katharina Ziolkowski b00b466045 🚧 watering fields kinda works now
5 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
5 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
5 months ago
Katharina Ziolkowski d51cc461f7 🚧 made preplaced fields show plants
5 months ago
jonathan 54bfc3c021 🐛 Fixed enemy groups show in different spots and even when all enemies are dead
5 months ago
Katharina Ziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions
5 months ago
jonathan 1531ffbf8d ✨Sleeping in bed now loads the new fight world scene
5 months ago
jonathan 74096f2c71 🐛Fixed sprite outline fallback
5 months ago
Katharina Ziolkowski 97dcadf07a ✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
5 months ago
Jonathan 1c5d776a3a Merge pull request 'Fixed wrong dependency' (#26) from bug/scene_dependency into develop
5 months ago
jonathan c814d7606d 🐛Fixed wrong dependency
5 months ago
Jonathan e1a61fb1e2 Merge pull request 'made dead fighters shrink to telegraph to the player that they are dead' (#25) from feature/dead_squash into develop
5 months ago
jonathan edbd4a182b 🎨Removed comment
5 months ago
Jonathan a9446ec770 Merge pull request '🐛 Fixed fighters keep fighting at 0 hp' (#24) from bug/enemy_die into develop
5 months ago
Katharina Ziolkowski fe1dd2bcc1 ✨ Added inventorylistener for watering can
5 months ago
Katharina Ziolkowski 6e833a0735 ✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory
5 months ago
Katharina Ziolkowski c52bfc8017 🐛 fixed field outline
5 months ago
Katharina Ziolkowski 58c2be1db8 ✨ plants no longer grow when just interacting with them
5 months ago
Katharina Ziolkowski c7c6e184d6 🐛 adjusted field positions
5 months ago
Katharina Ziolkowski 6a2355cf97 🐛 fixed never more than 10 fields bug
5 months ago
Katharina Ziolkowski 1d7f656ec4 🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why.
5 months ago
Katharina Ziolkowski 1c5b585b3d 🔥 removed print statements used for debugging
5 months ago
Katharina Ziolkowski f1b980cdb6 🐛 field creation at the same spot no longer possible, also watering works now.
5 months ago
Katharina Ziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code
5 months ago
jonathan f51275ccc0 ✨ made dead fighters shrink to telegraph to the player that they are dead
5 months ago
Katharina Ziolkowski 8d616735f4 🚚 moved Animationfix script
5 months ago
jonathan 50b2c04cb4 🐛 Fixed fighters keep fighting at 0 hp
5 months ago
Katharina Ziolkowski 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
5 months ago
Jonathan e864c62a3a Merge pull request 'Fight rework premature merge' (#22) from feature/fight_rework into develop
5 months ago
jonathan f27f69c15f 🐛 Rebase fixing
5 months ago
jonathan 21b361f9d7 🎨 Live review changes
5 months ago
jonathan 83dc6bfd56 ♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters
5 months ago
jonathan 0de3bcae22 ♻️Code cleanup
5 months ago
jonathan 3326bde40c 🐛Exiting fight happening when one side wins
5 months ago
jonathan 83c9dfc945 ✨Added theme-based region colors
5 months ago
jonathan cd235248c6 ✨Added minigame label for each region
5 months ago
jonathan 8bb1c22549 Added minigame to attack action
5 months ago
jonathan 8624e2aea8 Added minigame
5 months ago
jonathan fef1bcc3b6 cap health at minimum 0
5 months ago
jonathan f4d8ed87e2 Added blob attack action
5 months ago