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

566 Commits (feature/shaders_with_modulate)
 

Author SHA1 Message Date
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
jonathan 1f227f70a7 Added basic health bar
5 months ago
jonathan 9bf25640f6 Added basic action animation
5 months ago
jonathan 0e315396c9 Made fight fightable
5 months ago
jonathan f27dd199b8 Fight happening base setup
5 months ago
jonathan fd0e631b1f Bootstrap fight system
5 months ago
Katharina Ziolkowski 6ba26c360d 🚧 reworking Fieldservice
5 months ago
Katharina Ziolkowski 63fd81e54d 🔥 removed no longer needed scene call group
5 months ago
Katharina Ziolkowski b54f784d51 🎨 Replaced pickup animation group call with event
5 months ago
Katharina Ziolkowski 6194988bf0 🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event.
5 months ago
Katharina Ziolkowski 759933c1cd Merge pull request 'feature/detection_cross' (#21) from feature/detection_cross into develop
5 months ago
Katharina Ziolkowski af8807610d :bug increased interaction area size for fence gates
6 months ago
Katharina Ziolkowski 02b6584e44 🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
6 months ago
Katharina Ziolkowski e202534c6b 🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
6 months ago
Katharina Ziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
6 months ago
Katharina Ziolkowski 8b7afbcab6 Merge remote-tracking branch 'origin/feature/detection_cross' into feature/detection_cross
6 months ago
Jonathan afce4ad0b9 Merge pull request 'feature/events' (#19) from feature/events into develop
6 months ago
Katharina Ziolkowski 32ac007256 🎨 Exchanged Quest post it with ui sprite
6 months ago
Katharina Ziolkowski d45deeb7ed 🔧 adjusted seed pickup positions and indoor collider sizes
6 months ago
Katharina Ziolkowski 9e21b07271 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
6 months ago