Merge pull request #217 from food-please/main

Transition cleanly to and from combat instances

Author: NathanLovato

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## v0.3.0 Combat Demo ⚔️
+
+### New
+
+The demo scene has been reworked to include combat.
+
+The demo introduces:
+- A Main scene separated into two main gameplay objects, the Field and Combat.
+- 1 additional template Cutscene:
+	- Combat Trigger, that runs when colliding with the player. This is designed to be used with roaming encounters that may pounce on the player in the field. Winning removes the encounter from the Field, whereas losing will lead to a game-over.
+- An example combat that is run from a conversation. Winning or losing leads to different dialogue options.
+- Combat-related music.
+- Smooth transitions to and from combat.
+
+### Changes
+- Added a handful of combat events that allow objects to hook into changes in a given combat.
+- Refactored ScreenTransition into an autoload, since only one should ever be active at a given moment anyways.
+- Updated Dialogic 2 to the most recent build. ***Note that input has been modified to respond to the input events being released, rather than pressed.***
+- Miscellaneous fixes to the demo.
+
 ## v0.2.0 Cutscene Demo 💬
 
 ### New

CREDITS.md

@@ -10,6 +10,11 @@ Author: Kenney
 URL: https://kenney.nl/assets/emotes-pack (accessed 2023-06-02)
 License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
 
+Fun Run, The
+Author: Zane Little Music
+URL: https://opengameart.org/content/the-fun-run-day-3 (accessed 2024-04-30)
+License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/) 
+
 Impact Sounds
 Author: Kenney
 URL: https://kenney.nl/assets/impact-sounds (accessed 2023-12-20)
@@ -30,6 +35,11 @@ Author: Kenney
 URL: https://kenney.nl/assets/rpg-audio (accessed 2023-12-20)
 License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
 
+Squashin' Bugs
+Author: Zane Little Music
+URL: https://opengameart.org/content/squashin-bugs-day-15 (accessed 2023-06-06)
+License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
+
 Tiny Series (Tiny Town & Tiny Dungeon)  
 Author: Kenney  
 URL: https://kenney.nl/assets/tiny-town & https://kenney.nl/assets/tiny-dungeon (accessed 2023-02-22)