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

189 Commits (fda2b95b38bee77293f150963c368db87c3684df)

Author SHA1 Message Date
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 3fcb34c04d 🚧 saving of field parameters as json implemented
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 b00b466045 🚧 watering fields kinda works now
2 months ago
kziolkowski d51cc461f7 🚧 made preplaced fields show plants
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 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code
2 months ago
kziolkowski 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
2 months ago
jonathan f27f69c15f 🐛 Rebase fixing
2 months ago
jonathan 83dc6bfd56 ♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters
2 months ago
jonathan 0de3bcae22 ♻️Code cleanup
2 months ago
jonathan 83c9dfc945 ✨Added theme-based region colors
2 months ago
jonathan cd235248c6 ✨Added minigame label for each region
2 months ago
jonathan 8624e2aea8 Added minigame
2 months ago
jonathan 1f227f70a7 Added basic health bar
2 months ago
jonathan 0e315396c9 Made fight fightable
2 months ago
jonathan f27dd199b8 Fight happening base setup
2 months ago
jonathan fd0e631b1f Bootstrap fight system
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
kziolkowski 90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross
3 months ago
kziolkowski 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
3 months ago
kziolkowski 8f097de476 📝🔥🔨
3 months ago
kziolkowski 109573fb1b 🎨 Exchanged Quest post it with ui sprite
3 months ago
kziolkowski 0e55394699 🚧 WIP first setup completed (still buggy!)
3 months ago
kziolkowski e73f13d7d4 🎨 💄 Created art template for farm plants and reworked existing plant prefabs and inventory resources
4 months ago
kziolkowski c56f654751 Set up second garden with beetroot, built transition from yard and back
4 months ago
kziolkowski 1f88f9b4b5 Added beetroot as growable plant
4 months ago
kziolkowski 2cb605261e Fixed Tomato farming (again)
4 months ago
kziolkowski d1a8ff0cbf WIP reworking the item repository
4 months ago
kziolkowski 9f50e1d293 WIP trying to implement pickup sounds
5 months ago
kziolkowski 652cac4232 Added typing sounds to dialogic characters
5 months ago
kziolkowski e44e06bace Added Footsteps SFX
5 months ago
kziolkowski eeb56fd7ad Added possibility to deactivate an interactionarea if there is no more timelines to play
5 months ago
kziolkowski 871e1856f1 Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN)
5 months ago
kziolkowski 378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly
5 months ago
kziolkowski f6e0c4e615 minor scene fixes
5 months ago
kziolkowski 6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection
5 months ago
kziolkowski 3913143892 Added Hotkey-Info to inventory prefab
5 months ago