Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 3 Releases Activity
444 Commits
46 Branches
0 Tags
4.3 GiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'feature/night_to_day'
${ noResults }
Commit Graph

444 Commits (feature/night_to_day)
 

Author SHA1 Message Date
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
Jonathan b205e45096 Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop
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
2 months ago
Jonathan 4bd433b1b0 Merge pull request 'Import changes lol' (#31) from feature/import_changes into develop
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
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
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
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
jonathan 1531ffbf8d ✨Sleeping in bed now loads the new fight world scene
2 months ago
jonathan 74096f2c71 🐛Fixed sprite outline fallback
2 months ago
kziolkowski 97dcadf07a ✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
2 months ago
Jonathan 1c5d776a3a Merge pull request 'Fixed wrong dependency' (#26) from bug/scene_dependency into develop
2 months ago
jonathan c814d7606d 🐛Fixed wrong dependency
2 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
2 months ago
jonathan edbd4a182b 🎨Removed comment
2 months ago
Jonathan a9446ec770 Merge pull request '🐛 Fixed fighters keep fighting at 0 hp' (#24) from bug/enemy_die into develop
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
jonathan f51275ccc0 ✨ made dead fighters shrink to telegraph to the player that they are dead
2 months ago
kziolkowski 8d616735f4 🚚 moved Animationfix script
2 months ago
jonathan 50b2c04cb4 🐛 Fixed fighters keep fighting at 0 hp
2 months ago
kziolkowski 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
2 months ago
Jonathan e864c62a3a Merge pull request 'Fight rework premature merge' (#22) from feature/fight_rework into develop
2 months ago
jonathan f27f69c15f 🐛 Rebase fixing
2 months ago
jonathan 21b361f9d7 🎨 Live review changes
2 months ago