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

265 Commits (bug/attack_dead_enemy)

Author SHA1 Message Date
Katharina Ziolkowski c9f97c2571 📝 added documentation comments
5 months ago
Katharina Ziolkowski 6613e54658 ✨ Implemented Loading function on fields and plants
5 months ago
Katharina Ziolkowski 3fcb34c04d 🚧 saving of field parameters as json implemented
5 months ago
Katharina Ziolkowski 443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable
5 months ago
Katharina Ziolkowski 554a319428 🚧 farming rework part 2: you can now kinda "create" fields
5 months ago
jonathan 3bb4fcd129 ✨Added damage fly number
5 months ago
Katharina Ziolkowski 4705d1ee2f 🐛 can no longer water fields when watering can is empty
5 months ago
Katharina Ziolkowski b00b466045 🚧 watering fields kinda works now
5 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
5 months ago
Katharina Ziolkowski d51cc461f7 🚧 made preplaced fields show plants
5 months ago
jonathan 54bfc3c021 🐛 Fixed enemy groups show in different spots and even when all enemies are dead
5 months ago
Katharina Ziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions
5 months ago
jonathan 74096f2c71 🐛Fixed sprite outline fallback
5 months ago
Katharina Ziolkowski 97dcadf07a ✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.
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
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 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 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 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 02b6584e44 🐛 fixed ObjectDisposedException from the Inventory when switching scenes.
6 months ago
Katharina Ziolkowski 1f13f3ea51 Merge branch 'develop' into feature/detection_cross
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 8f097de476 📝🔥🔨
6 months ago
Katharina Ziolkowski 0e55394699 🚧 WIP first setup completed (still buggy!)
6 months ago
Katharina Ziolkowski 080ebaae47 removed redundant import statement
6 months ago
Katharina Ziolkowski 5cf250b295 ✨ Added randomizer class for certain types of EventResources
6 months ago
Katharina Ziolkowski ef56f79d5c ✨ Added event payload and Valuechange-handling
6 months ago
Katharina Ziolkowski a593be8273 📝 added documentation and improved event scope
6 months ago
Katharina Ziolkowski 1e004b62b8 Implemented first version of EventResources
6 months ago
Katharina Ziolkowski d6a2b586e4 🐛 fixed ducks counting bug
7 months ago
Katharina Ziolkowski 0713e334b3 Fixed InventoryInstance behaviour
7 months ago
Katharina Ziolkowski c56f654751 Set up second garden with beetroot, built transition from yard and back
7 months ago
Katharina Ziolkowski 2cb605261e Fixed Tomato farming (again)
7 months ago
Katharina Ziolkowski 975dd45c94 fixed item repository bug
7 months ago
Katharina Ziolkowski d1a8ff0cbf WIP reworking the item repository
7 months ago
Katharina Ziolkowski 652cac4232 Added typing sounds to dialogic characters
8 months ago
Katharina Ziolkowski e44e06bace Added Footsteps SFX
8 months ago
Katharina Ziolkowski eeb56fd7ad Added possibility to deactivate an interactionarea if there is no more timelines to play
8 months ago
Katharina Ziolkowski 871e1856f1 Tools get deactivated from animation when switching to an empty slot in the inventory. Also fixed layering (AGAIN)
8 months ago
Katharina Ziolkowski 378bf45c49 Implemented PR feedback + made sure initial farming quests run smoothly
8 months ago
Katharina Ziolkowski 6ae877f2ab Implemented first version of an interactable area that reacts to inventory selection
8 months ago
Katharina Ziolkowski 4734ae953c Added option to play pickup animation for non-inventory items
8 months ago
Katharina Ziolkowski 5992c390ee Reinstated plantgrowing animation
8 months ago
Katharina Ziolkowski 283caf282b Added interaction on mouse click
8 months ago
Katharina Ziolkowski 7c03964d33 changed watering can display to slider
8 months ago
Katharina Ziolkowski d0ba4076b3 planting, growing and watering a little less dependent than before
8 months ago
Katharina Ziolkowski 7fd26ffed3 Fixed tomato farming again
8 months ago
Katharina Ziolkowski ce2d7eb773 WIP moving seed to plant matching into separate system, making fields independent of specific plants.
8 months ago
Katharina Ziolkowski c2f5359d0c changes after develop merge
8 months ago
jonathan 06a270e916 Renamed function to not sound like a unity signal
8 months ago
jonathan b621df5435 removed invisible character
8 months ago
jonathan 03dbc08293 quest status name refactoring
8 months ago
jonathan 6e998810b6 Completed first demo quest line
8 months ago
jonathan c96be7467e Added Quest field
8 months ago
Jonathan 6aa7530502 Added speed hack for vesna
8 months ago
Jonathan 0170a53b5a Added more quest stuff including dialogic quest condition
8 months ago
cblech abc33fd06c Added first quests
8 months ago
Katharina Ziolkowski 0008b16d48 Adjusted moving values and animations to make vesna not slide any more
8 months ago
Katharina Ziolkowski 8e0dced918 Vesna can walk diagonally now
8 months ago
Katharina Ziolkowski 18711776bb Fixed output error ERROR: Script class can only be set together with base class name
9 months ago
Katharina Ziolkowski 0f246825fc Added Wellbehaviour and fixed door interaction to offer outlines
9 months ago
Katharina Ziolkowski 730c4999d7 Extracted FightAttack Enum in the hopes of fixing errors
9 months ago
Katharina Ziolkowski ad16b86171 wip exchanging interaction label with outline
9 months ago
Katharina Ziolkowski 486cfb5546 WIP trying to fix the last plant stage bug on repeated farming rounds
9 months ago
Katharina Ziolkowski b92eb909ad Removed no longer needed print statements
9 months ago
Katharina Ziolkowski d2c7302ab2 Fixed farming (the way it was before)
9 months ago
Katharina Ziolkowski a4f9511892 WIP fixing farming mechanic again
9 months ago
Katharina Ziolkowski 7a3e96d679 Merge remote-tracking branch 'origin/feature/fight_system' into feature/showcase_kathi
9 months ago
cblech c0e002f783 made you win waiting time shorter
9 months ago
cblech e8850ca7c5 Added chuga dialog to fight scene
9 months ago