Commit Graph

548 Commits (a401cbe5b907a0871035f603ea1490380a156be3)
 

Author SHA1 Message Date
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
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 3326bde40c 🐛Exiting fight happening when one side wins
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 8bb1c22549 Added minigame to attack action
2 months ago
jonathan 8624e2aea8 Added minigame
2 months ago
jonathan fef1bcc3b6 cap health at minimum 0
2 months ago
jonathan f4d8ed87e2 Added blob attack action
2 months ago
jonathan 1f227f70a7 Added basic health bar
2 months ago
jonathan 9bf25640f6 Added basic action animation
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 759933c1cd Merge pull request 'feature/detection_cross' (#21) from feature/detection_cross into develop
2 months ago
kziolkowski af8807610d :bug increased interaction area size for fence gates
2 months ago
kziolkowski 02b6584e44 🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
3 months ago
kziolkowski e202534c6b 🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
3 months ago
kziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
3 months ago
kziolkowski 8b7afbcab6 Merge remote-tracking branch 'origin/feature/detection_cross' into feature/detection_cross
3 months ago
Jonathan afce4ad0b9 Merge pull request 'feature/events' (#19) from feature/events into develop
3 months ago
kziolkowski 32ac007256 🎨 Exchanged Quest post it with ui sprite
3 months ago
kziolkowski d45deeb7ed 🔧 adjusted seed pickup positions and indoor collider sizes
3 months ago
kziolkowski 9e21b07271 🍱 Adjusted colliders in farm_outside scene and reactivated ground collider on Vesna
3 months ago
kziolkowski f94c2d0a50 📝🔥🔨
3 months ago
kziolkowski 84b8938d1f 🚧 WIP first setup completed (still buggy!)
3 months ago
kziolkowski 8d421b58ec Implemented dialogue box design as described in mockups
3 months ago
kziolkowski ebe99c5f22 💄 Added new fonts and increased textbox size. Also added border line.
3 months ago
kziolkowski b32b483d09 upgraded project to 4.5
3 months ago
kziolkowski c6e9bc9336 scene updates after undoing changes to interactionArea
3 months ago
kziolkowski 5b0fed7816 sound autoimports
3 months ago
Nao 3bdd5aa873 SFX for Wolf added + redone reverb of footsteps (but not sure it worked?! - possible new upload/replacement possible)
3 months ago
kziolkowski 3fe79f2fd8 Added VariableGetter functionality and some Variable setting components. Also added them to test scene.
3 months ago
kziolkowski 8c1157c26e 🔥 removed indexed RaiseEvent-Call from EventRaiser
3 months ago
kziolkowski c96e6da78e Separated events from variables and adjusted test scene
3 months ago
kziolkowski 0fc1760b70 Merge pull request 'feature/animations_update' (#17) from feature/animations_update into develop
3 months ago
kziolkowski 90b8dda16a Merge branch 'feature/dialogic_style_rework' into feature/detection_cross
3 months ago
kziolkowski ecff43d5c3 Merge branch 'develop' into feature/detection_cross
3 months ago
Jonathan 40b8c022fe Merge pull request 'feature/showcase_bugfixing_kathi_partII' (#16) from feature/showcase_bugfixing_kathi_partII into develop
3 months ago
kziolkowski e1b1a2f447 🔧 adjusted seed pickup positions and indoor collider sizes
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