Compare commits

...

9 Commits
main ... Shiori

Author SHA1 Message Date
benroshio
701d9bcb05 Merge branch 'fmod-co' into Shiori 2025-04-12 13:52:49 -04:00
benroshio
e25825931c Sanin timing fix 2025-04-12 13:47:37 -04:00
benroshio
6d57eb432d Fmod bank refresh 2025-04-11 11:35:03 -04:00
benroshio
5987dbc276 Merge branch 'main' into Shiori 2025-04-07 23:04:35 -04:00
benroshio
28dcf82cca Auto stash before merge of "Shiori" and "main" 2025-04-07 23:04:18 -04:00
benroshio
08606779a8 Merge remote-tracking branch 'origin/main' 2025-04-07 20:18:46 -04:00
499fc3ae18 Footsteps - Grass - Boots 2025-04-04 18:35:16 -04:00
74e1948c35 Rock Teleport for Sanin 2025-04-04 18:28:24 -04:00
benroshio
5c975ddaa9 Arrow ult sound fix
added to bp_haesol
2025-03-26 23:23:02 -04:00
297 changed files with 3518 additions and 51 deletions

Binary file not shown.

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
</objects>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="Mixer" id="{69156779-4c9f-4c75-933c-0886f67a1e32}" />
</objects>

View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="Workspace" id="{7566e94e-8228-4fb9-ac5e-6a0103d5bf81}">
<relationship name="projectSettings">
<destination>{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}</destination>
</relationship>
<relationship name="changelist">
<destination>{c81ff576-a715-479d-877b-e0a0201464b5}</destination>
</relationship>
</object>
<object class="ProjectSettings" id="{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}">
<property name="openWindows">
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAA+sAAAGgAAAIeAAABG8AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+7IAAACU////0QAAA4IAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
</relationship>
</object>
<object class="WorkspaceChangelist" id="{c81ff576-a715-479d-877b-e0a0201464b5}" />
</objects>

View File

@ -13,7 +13,7 @@
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAA+sAAAGgAAAIeAAABG8AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAABZUAAAHkAAAJtAAABNIAAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAA+sAAAGgAAAIeAAABG8AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+7IAAACU////0QAAA4IAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

Some files were not shown because too many files have changed in this diff Show More