Merge branch 'feature/bugfixes_polish_II' into feature/build_0_7

Browse Source

# Conflicts:
#	scenes/scene_farm_outside_2d.tscn

...

This commit is contained in:

Katharina Ziolkowski

2025-12-16 21:59:04 +01:00

parent e5b2b8b8ab f1a2e6166b

commit 48660b167c

43 changed files with 935 additions and 650 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

scenes/scene_fight_world_room.tscn

+2182

File diff suppressed because it is too large Load Diff