Auto stash before merge of "main" and "origin/main"
This commit is contained in:
parent
670df2f1c3
commit
8fa0c08c0f
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
|
||||||
|
hwanyoung2/Content/Illusions/.cache/\{d547300b-f688-4816-b2a8-0edd5f5e77a1\}.pdc
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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>
|
@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<objects serializationModel="Studio.02.02.00">
|
<objects serializationModel="Studio.02.02.00">
|
||||||
<object class="ObsoleteObject" id="{4ff730ba-f1d1-4efd-9dfe-1811ce2538c2}" />
|
<object class="Mixer" id="{69156779-4c9f-4c75-933c-0886f67a1e32}" />
|
||||||
</objects>
|
</objects>
|
@ -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/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+dcAAAGU///+1AAABusAAAABAgAAAAeA///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>
|
@ -1,23 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<objects serializationModel="Studio.02.02.00">
|
|
||||||
<object class="AudioFile" id="{d547300b-f688-4816-b2a8-0edd5f5e77a1}">
|
|
||||||
<property name="assetPath">
|
|
||||||
<value>dragon ult uncut.ogg</value>
|
|
||||||
</property>
|
|
||||||
<property name="isStreaming">
|
|
||||||
<value>true</value>
|
|
||||||
</property>
|
|
||||||
<property name="frequencyInKHz">
|
|
||||||
<value>44.0999985</value>
|
|
||||||
</property>
|
|
||||||
<property name="channelCount">
|
|
||||||
<value>2</value>
|
|
||||||
</property>
|
|
||||||
<property name="length">
|
|
||||||
<value>17.316916099773241</value>
|
|
||||||
</property>
|
|
||||||
<relationship name="masterAssetFolder">
|
|
||||||
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
|
|
||||||
</relationship>
|
|
||||||
</object>
|
|
||||||
</objects>
|
|
Binary file not shown.
Binary file not shown.
@ -13,7 +13,7 @@
|
|||||||
<value>Event Editor 1</value>
|
<value>Event Editor 1</value>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowLayout">
|
<property name="windowLayout">
|
||||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAAAAAAAAAAT/AAAFdwAAAAEAAAAfAAAE/gAABXYAAAAAAAAAAAoAAAAAAQAAAB8AAAT+AAAFdgAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+dcAAAGU///+1AAABusAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||||
</property>
|
</property>
|
||||||
<relationship name="activePlatform">
|
<relationship name="activePlatform">
|
||||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user