Compare commits

...

12 Commits

Author SHA1 Message Date
Hozach (Audio)
3dda723d5c Merge branch 'main' into Chaz 2025-05-10 13:21:44 -04:00
Ji Yoon Rhee
70a785d170 extra adjustments on the item slot text font 2025-05-10 22:14:16 +09:00
Ji Yoon Rhee
6cf96ee241 i think i have my stuff back now 2025-05-10 22:11:36 +09:00
Ji Yoon Rhee
e11d9f416b cooking cauldron + cooking HUD + player HUD skill icon update 2025-05-10 22:00:08 +09:00
Ji Yoon Rhee
89edac3770 what even is this 2025-05-10 21:14:19 +09:00
Ji Yoon Rhee
a62a9af2ff DOT tick sfx? 2025-05-10 21:10:19 +09:00
Ji Yoon Rhee
53546f7059 merge chaz's new files? 2025-05-10 21:06:08 +09:00
benroshio
253ba3ab7e bow fixes and music mixing 2025-05-10 00:56:28 -04:00
benroshio
bed2744ac4 Auto stash before merge of "main" and "origin/main" 2025-05-10 00:26:19 -04:00
benroshio
2d0a179637 Merge remote-tracking branch 'origin/main' 2025-05-10 00:25:55 -04:00
Ji Yoon Rhee
5bcec36ae2 temp push for reaven 2025-05-10 11:06:18 +09:00
benroshio
6ad71ab3dc Auto stash before merge of "main" and "origin/main" 2025-05-09 21:42:31 -04:00
136 changed files with 823 additions and 181 deletions

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/DOT_tick.uasset (Stored with Git LFS) Normal file

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.

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>{c4679206-f633-40ee-b9c6-4a93d89e762e}</destination>
</relationship>
<relationship name="changelist">
<destination>{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}</destination>
</relationship>
</object>
<object class="ProjectSettings" id="{c4679206-f633-40ee-b9c6-4a93d89e762e}">
<property name="openWindows">
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACCwAAABMAAAaYAAAD0gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD///h/AAAAAgAAAAAAAAQa///5kwAAARv///2yAAAECQAAAAECAAAAB4D///iAAAAAIf////8AAAQZ</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
</relationship>
</object>
<object class="WorkspaceChangelist" id="{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}" />
</objects>

View File

@ -2,22 +2,22 @@
<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>
<destination>{c4679206-f633-40ee-b9c6-4a93d89e762e}</destination>
</relationship>
<relationship name="changelist">
<destination>{c81ff576-a715-479d-877b-e0a0201464b5}</destination>
<destination>{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}</destination>
</relationship>
</object>
<object class="ProjectSettings" id="{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}">
<object class="ProjectSettings" id="{c4679206-f633-40ee-b9c6-4a93d89e762e}">
<property name="openWindows">
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaMAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+wEAAAEi////IAAAAsUAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////oAAAoAAAAFeQAAA8AAAAHMAAAH3AAAA28AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFeAAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACCwAAABMAAAaYAAAD0gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD///h/AAAAAgAAAAAAAAQa///5kwAAARv///2yAAAECQAAAAECAAAAB4D///iAAAAAIf////8AAAQZ</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
</relationship>
</object>
<object class="WorkspaceChangelist" id="{c81ff576-a715-479d-877b-e0a0201464b5}" />
<object class="WorkspaceChangelist" id="{4d90a0d8-353e-4f61-a252-3d1d3c6f357c}" />
</objects>

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.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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