Labels Milestones

feature/build_0_7 #49

Open

kziolkowski wants to merge 32 commits from feature/build_0_7 into develop

pull from: feature/build_0_7

merge into: Jonathan:develop

Jonathan:develop

Jonathan:feature/spine2D_experimental

Jonathan:Nao's-Sounds

Jonathan:Enemy_selection_overlap

Jonathan:feature/farm_fight_loop

Jonathan:feature/bugfixes_polish_II

Jonathan:Vesna_resets_to_bed_after_dead

Jonathan:Vesna_Gesichtsausdrücke_einfügen_

Jonathan:bug/attack_dead_enemy

Jonathan:Kampf_Tooltip

Jonathan:randomise_fight_start

Jonathan:feature/bugfixes_And_Polish

Jonathan:minigame_hit_feedback

Jonathan:minigame_variation

Jonathan:fighting_minigame_fix_overlap_with_Vesna

Jonathan:remove_fightlog

Jonathan:feature/night_to_day

Jonathan:feature/farming_bugfixes_and_magic_word

Jonathan:feature/import_changes

Jonathan:feature/damage_feedback

Jonathan:bug/enemy_group

Jonathan:feature/integrate_new_fight

Jonathan:bug/scene_dependency

Jonathan:feature/dead_squash

Jonathan:bug/enemy_die

Jonathan:Anna

Jonathan:feature/fight_rework

Jonathan:feature/loading_screen

Jonathan:test/music_setup

Jonathan:test/quick_juice

Jonathan:feature/showcase_bugfixing_kathi_partII_quickfix

Jonathan:Animations

Jonathan:feature/implement_quests

Jonathan:feature/languagetool-addon

Jonathan:feature/fight_system

Jonathan:feature_sanel-dialogic

Jonathan:feature/quest_system

Jonathan:inventory

Jonathan:main

Jonathan:level_transition

Jonathan:hint_box

Jonathan:choise_detection

Jonathan:interactions

Jonathan:3d_character_controller

Jonathan:deadend_wwise

Conversation 0 Commits 32 Files Changed 64

kziolkowski commented 4 weeks ago

Owner

This PR contains PR 48 as well and can be used to close both.

Changes:

• some more fixes to the farming / savesystem issues: Made FieldActivator update correctly on second load, deactivated harvestable plant on spawn, made fields react to watering can state changes (filled / empty)
• some minor adjustments to colliders
• Added domovoi and cat placeholder dialogues
• Updated scene path references in fightworld
• Re-added disclaimer scene and credit scene into the flow
• Added background to fightworld
• fixed some layering issues in beetroot scene

This PR contains [PR 48](https://gitea.sneaky-elephants.com/Jonathan/Babushka/pulls/48) as well and can be used to close both. Changes: * some more fixes to the farming / savesystem issues: Made FieldActivator update correctly on second load, deactivated harvestable plant on spawn, made fields react to watering can state changes (filled / empty) * some minor adjustments to colliders * Added domovoi and cat placeholder dialogues * Updated scene path references in fightworld * Re-added disclaimer scene and credit scene into the flow * Added background to fightworld * fixed some layering issues in beetroot scene

kziolkowski added 32 commits 4 weeks ago

9499c27444 🚧 WIP: trying to rework the detection system (it fails)

a6260efc07 Merge branch 'develop' into feature/bugfixes_polish_II

b232cb31c3 🚧 interaction kinda sorta works now, still needs tweaking

7ffbb8e68d pulled ceiling lower in kitchen scene

9e0e87ef17 🚧 WIP detection works now

c509a52001 🚧 Basic interaction works now too

c55e527bf4 Merge branch 'develop' into feature/bugfixes_polish_II

ce113e16da 🐛 planting seeds works again

abed751d29 🚧 WIP trying to make fields have outlines again

a98c842ee0 🐛 Fixed field interaction bug

64c15c2e63 removed print statements

3f5cfed477 removed test scene

21cf2d1a6a ♻️ Renamed scenes

aac0992590 ♻️ scene name refactoring part two: fixing scene transition paths in scenes

feb591f56a ♻️ modified changed path in start scene

950731b225 🐛 Fixed ObjectNotDisposedException on Well in beetroot scene

30750d2e3c ♻️ removed planted state from Fieldstate because it didn't make any sense.

7f58aeae76 removed GD.Prints

13fcf059e9 Added trash object savestate

4f660c4af8 🐛 fixed rake still activating field outlines bug

c0111e4c17 🐛 fixed rake triggering field interaction + watering can interaction

f1a2e6166b 🐛 fixed field setup in beet scene

48660b167c Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7 ...

# Conflicts:
#	scenes/scene_farm_outside_2d.tscn

a401cbe5b9 🐛 fixed field activator self-deactivating on load bug

f862827d98 Removed Print statements

3bdc8cd03f Deactivated harvestable plant on spawn

f6e83e7fef Added event handlers in Fieldbehaviour to react to watering can state changes

f3080df4b7 moved fence door collision shape up to reduce unwanted triggering

11e24e249e Fixed Field outline not disappearing when switching tools

4f6c5ab9c1 fixed some layering issues in beetroot scene and added a mock convo with the domovoi

522fdfa365 Added fightworld background and cat dialogue

b0ee8c4c58 fixed path strings in scene transitions and added disclaimer and credits back into the flow

kziolkowski requested review from Jonathan 4 weeks ago

Jonathan approved these changes 4 hours ago

Jonathan left a comment

Owner

Is the file .Babushka_bg_01.png-autosave.kra supposed to be in the PR?

Otherwise, looks good

Is the file `.Babushka_bg_01.png-autosave.kra` supposed to be in the PR? Otherwise, looks good

Reviewers

Jonathan approved these changes 4 hours ago

This pull request can be merged automatically.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Jonathan

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Assignees

Assign users

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Jonathan/Babushka#49

Write Preview

Loading…

Cancel

Save

There is no content yet.