Commit Graph

406 Commits (feature/import_changes)
 

Author SHA1 Message Date
kziolkowski c02a2d1383 Import changes lol
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
jonathan 54bfc3c021 🐛 Fixed enemy groups show in different spots and even when all enemies are dead
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
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
jonathan f51275ccc0 made dead fighters shrink to telegraph to the player that they are dead
2 months ago
jonathan 50b2c04cb4 🐛 Fixed fighters keep fighting at 0 hp
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 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.
2 months ago
kziolkowski e202534c6b 🐛 Vesnas Namensschild sieht nicht richtig aus FIXED
2 months ago
kziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
2 months ago
kziolkowski 8b7afbcab6 Merge remote-tracking branch 'origin/feature/detection_cross' into feature/detection_cross
2 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