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

548 Commits (a401cbe5b907a0871035f603ea1490380a156be3)
 

Author SHA1 Message Date
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
Katharina Ziolkowski f94c2d0a50 📝🔥🔨
6 months ago
Katharina Ziolkowski 84b8938d1f 🚧 WIP first setup completed (still buggy!)
6 months ago
Katharina Ziolkowski 8d421b58ec Implemented dialogue box design as described in mockups
6 months ago
Katharina Ziolkowski ebe99c5f22 💄 Added new fonts and increased textbox size. Also added border line.
6 months ago
Katharina Ziolkowski b32b483d09 upgraded project to 4.5
6 months ago
Katharina Ziolkowski c6e9bc9336 scene updates after undoing changes to interactionArea
6 months ago
Katharina Ziolkowski 5b0fed7816 sound autoimports
6 months ago
Nao 3bdd5aa873 SFX for Wolf added + redone reverb of footsteps (but not sure it worked?! - possible new upload/replacement possible)
6 months ago
Katharina Ziolkowski 3fe79f2fd8 ✨ Added VariableGetter functionality and some Variable setting components. Also added them to test scene.
6 months ago
Katharina Ziolkowski 8c1157c26e 🔥 removed indexed RaiseEvent-Call from EventRaiser
6 months ago
Katharina Ziolkowski c96e6da78e ✨ Separated events from variables and adjusted test scene
6 months ago
Katharina Ziolkowski 0fc1760b70 Merge pull request 'feature/animations_update' (#17) from feature/animations_update into develop
6 months ago
Katharina Ziolkowski 90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross
6 months ago
Katharina Ziolkowski ecff43d5c3 Merge branch 'develop' into feature/detection_cross
6 months ago
Jonathan 40b8c022fe Merge pull request 'feature/showcase_bugfixing_kathi_partII' (#16) from feature/showcase_bugfixing_kathi_partII into develop
6 months ago
Katharina Ziolkowski e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes
6 months ago
Katharina Ziolkowski 2d4e853ec8 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
6 months ago
Katharina Ziolkowski 8f097de476 📝🔥🔨
6 months ago