Compare commits

...

13 Commits

Author SHA1 Message Date
Hozach (Audio)
9329fd919b Merge branch 'main' into Chaz 2025-05-11 13:22:34 -04:00
Hozach (Audio)
7c7ea8a57e Added Tweaked Rockfall SFX to FMOD only 2025-05-11 13:21:25 -04:00
7heIVIaze
02c6ea8454 temp push the current commit 2025-05-12 00:16:32 +09:00
7heIVIaze
97f819d001 Update HUD, Haesol's ult logic, and wrap all widgets scale box, size box 2025-05-11 22:35:47 +09:00
Ji Yoon Rhee
447cefeaa2 added VFX to haesol's ultimate AOE 2025-05-11 22:28:07 +09:00
Ji Yoon Rhee
063fa6146c dialogue localization and added bunny dialogue lines for early puzzle quit 2025-05-11 12:29:03 +09:00
Ji Yoon Rhee
491656378e edited some descriptions for items 2025-05-11 12:28:29 +09:00
Ji Yoon Rhee
57c3968d0f preliminary work for sfx integration for interactable bunny 2025-05-11 12:27:56 +09:00
Ji Yoon Rhee
ffcd1cac98 merge with chaz's branch 2025-05-11 12:26:02 +09:00
7heIVIaze
110d80a2d7 Update Skill Cooldown Timer for UI 2025-05-11 00:06:22 +09:00
7heIVIaze
a3eb9bf34d Try to fix Craft/Cook Widget and merge 2025-05-10 11:09:12 +09:00
7heIVIaze
6cc1f0f503 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2025-05-09 21:44:39 +09:00
7heIVIaze
5eeacc4eeb merge 2025-05-09 21:44:32 +09:00
81 changed files with 313 additions and 50 deletions

View File

@ -238,6 +238,7 @@ ManualIPAddress=
+Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.")
+Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ")
+Profiles=(Name="WaterBodyCollision",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="",CustomResponses=((Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="Default Water Collision Profile (Created by Water Plugin)")
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="GroundOnly")
-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")

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

@ -13,7 +13,7 @@
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAO/AAABEgAACcYAAAVAAAADwAAAAS8AAAnFAAAFPwAAAAAAAAAACgAAAAPAAAABLwAACcUAAAU/</value>
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAPeAAAA0AAACeUAAAT+AAAD3wAAAO0AAAnkAAAE/QAAAAAAAAAACgAAAAPfAAAA7QAACeQAAAT9</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

View File

@ -13,7 +13,7 @@
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAO/AAABEgAACcYAAAVAAAADwAAAAS8AAAnFAAAFPwAAAAAAAAAACgAAAAPAAAABLwAACcUAAAU/</value>
<value>AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAPeAAAA0AAACeUAAAT+AAAD3wAAAO0AAAnkAAAE/QAAAAAAAAAACgAAAAPfAAAA7QAACeQAAAT9</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="AudioFile" id="{5b819579-862b-4c43-b94f-cd508ca6dac2}">
<property name="assetPath">
<value>Combat/sfx_combat_rockfall.ogg</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>1.9093197278911564</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

View File

@ -92,6 +92,9 @@
<property name="length">
<value>0.99451247165532874</value>
</property>
<relationship name="fadeOutCurve">
<destination>{d403b625-aeae-4182-a8eb-c48a12bd5b1b}</destination>
</relationship>
<relationship name="audioFile">
<destination>{0699e8a1-abef-4972-ab61-9364bab2308e}</destination>
</relationship>
@ -118,6 +121,14 @@
</object>
<object class="MixerBusPanner" id="{847c2e03-567b-43ca-9809-d1f28fe807af}" />
<object class="MixerBusFader" id="{81b233e9-8136-466c-9f46-181aa032e728}" />
<object class="FadeCurve" id="{d403b625-aeae-4182-a8eb-c48a12bd5b1b}">
<relationship name="startPoint">
<destination>{bbd58e19-e8f6-48c7-b951-7d6ad76ec6e3}</destination>
</relationship>
<relationship name="endPoint">
<destination>{d077e780-834b-4714-87de-5da415614f61}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{2adfdcf6-4962-40bc-b2e0-d46fc0af536e}">
<relationship name="effects">
<destination>{aea0a5b4-a3df-4ebd-995d-a89dadb2f933}</destination>
@ -126,5 +137,24 @@
<object class="MixerBusPanner" id="{3e56c2a5-406e-4fe0-afb4-7a7311d1f51c}" />
<object class="MixerBusFader" id="{c650c7fd-2c06-4a07-8ecc-bc6dc00bd6f5}" />
<object class="SpatialiserEffect" id="{b2010b51-8a6b-42a0-a96b-33e818644f27}" />
<object class="AutomationPoint" id="{bbd58e19-e8f6-48c7-b951-7d6ad76ec6e3}">
<property name="position">
<value>0.20000000000000001</value>
</property>
<property name="value">
<value>1</value>
</property>
<property name="curveShape">
<value>0.25471893</value>
</property>
</object>
<object class="AutomationPoint" id="{d077e780-834b-4714-87de-5da415614f61}">
<property name="position">
<value>0.99451247165532874</value>
</property>
<property name="value">
<value>0</value>
</property>
</object>
<object class="MixerBusFader" id="{aea0a5b4-a3df-4ebd-995d-a89dadb2f933}" />
</objects>

View File

@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="Event" id="{4423ea21-e180-4c9d-a429-ce66ff44430e}">
<property name="name">
<value>sfx_combat_rockfall</value>
</property>
<property name="outputFormat">
<value>2</value>
</property>
<relationship name="folder">
<destination>{58f76323-7476-4fc2-9d75-933801901ec4}</destination>
</relationship>
<relationship name="mixer">
<destination>{87e9511b-a906-4818-9fa2-03ff0a8ffa31}</destination>
</relationship>
<relationship name="masterTrack">
<destination>{dbe8b006-1d6b-4f8e-9382-ef018e10f33a}</destination>
</relationship>
<relationship name="mixerInput">
<destination>{7bab40e2-437c-4f97-ac08-e1328593959e}</destination>
</relationship>
<relationship name="automatableProperties">
<destination>{6016af8e-621a-445a-ad8e-fbfa1ae5061f}</destination>
</relationship>
<relationship name="markerTracks">
<destination>{ee5da0eb-1936-45e2-8eb3-9dd7066eb81c}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{8f5c9965-6fef-4d76-97e3-584ef0d03a07}</destination>
</relationship>
<relationship name="timeline">
<destination>{b039b557-bf89-47fa-9177-e5015ba53f38}</destination>
</relationship>
<relationship name="banks">
<destination>{9c5265c8-c3c8-41f5-9212-f803a3d9a96e}</destination>
</relationship>
</object>
<object class="EventMixer" id="{87e9511b-a906-4818-9fa2-03ff0a8ffa31}">
<relationship name="masterBus">
<destination>{7b15ffdc-07c9-4b41-a994-9ceecadfc0c7}</destination>
</relationship>
</object>
<object class="MasterTrack" id="{dbe8b006-1d6b-4f8e-9382-ef018e10f33a}">
<relationship name="mixerGroup">
<destination>{7b15ffdc-07c9-4b41-a994-9ceecadfc0c7}</destination>
</relationship>
</object>
<object class="MixerInput" id="{7bab40e2-437c-4f97-ac08-e1328593959e}">
<relationship name="effectChain">
<destination>{62aa9dfa-991c-4126-8475-20194a66207b}</destination>
</relationship>
<relationship name="panner">
<destination>{50717840-2cc9-491c-b413-7340ad5b3f18}</destination>
</relationship>
<relationship name="output">
<destination>{b652127b-31f3-4ae6-b245-1a19a8f778fb}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{6016af8e-621a-445a-ad8e-fbfa1ae5061f}" />
<object class="MarkerTrack" id="{ee5da0eb-1936-45e2-8eb3-9dd7066eb81c}" />
<object class="GroupTrack" id="{8f5c9965-6fef-4d76-97e3-584ef0d03a07}">
<relationship name="modules">
<destination>{cc5a9467-e8ad-4b9e-bd13-4e2c984b5220}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{ee3696e9-f679-4872-8f97-38107bfca7bc}</destination>
</relationship>
</object>
<object class="Timeline" id="{b039b557-bf89-47fa-9177-e5015ba53f38}">
<relationship name="modules">
<destination>{cc5a9467-e8ad-4b9e-bd13-4e2c984b5220}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{7b15ffdc-07c9-4b41-a994-9ceecadfc0c7}">
<relationship name="effectChain">
<destination>{f27edbe9-486a-470a-af7c-a3b07d4f4150}</destination>
</relationship>
<relationship name="panner">
<destination>{52bc35d6-26e7-4c00-9129-17aafe45e092}</destination>
</relationship>
<relationship name="mixer">
<destination>{87e9511b-a906-4818-9fa2-03ff0a8ffa31}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{62aa9dfa-991c-4126-8475-20194a66207b}">
<relationship name="effects">
<destination>{60c01ea8-d825-411d-95a4-70033773c2cb}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{50717840-2cc9-491c-b413-7340ad5b3f18}" />
<object class="SingleSound" id="{cc5a9467-e8ad-4b9e-bd13-4e2c984b5220}">
<property name="length">
<value>1.9093197278911564</value>
</property>
<relationship name="audioFile">
<destination>{5b819579-862b-4c43-b94f-cd508ca6dac2}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{ee3696e9-f679-4872-8f97-38107bfca7bc}">
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{fbee173f-3caf-41b9-9cf6-e82a94891f83}</destination>
</relationship>
<relationship name="panner">
<destination>{66be466a-e427-4f02-9fc1-6de297b77028}</destination>
</relationship>
<relationship name="output">
<destination>{7b15ffdc-07c9-4b41-a994-9ceecadfc0c7}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{f27edbe9-486a-470a-af7c-a3b07d4f4150}">
<relationship name="effects">
<destination>{d8e169f5-f38c-45e3-9d6f-3a4a1917282a}</destination>
<destination>{4e3fc033-d377-4845-8e28-b8401c5b8cff}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{52bc35d6-26e7-4c00-9129-17aafe45e092}" />
<object class="MixerBusFader" id="{60c01ea8-d825-411d-95a4-70033773c2cb}" />
<object class="MixerBusEffectChain" id="{fbee173f-3caf-41b9-9cf6-e82a94891f83}">
<relationship name="effects">
<destination>{1a2e3810-28e4-4994-a16b-eacf84680d71}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{66be466a-e427-4f02-9fc1-6de297b77028}" />
<object class="MixerBusFader" id="{d8e169f5-f38c-45e3-9d6f-3a4a1917282a}" />
<object class="SpatialiserEffect" id="{4e3fc033-d377-4845-8e28-b8401c5b8cff}" />
<object class="MixerBusFader" id="{1a2e3810-28e4-4994-a16b-eacf84680d71}" />
</objects>

View File

@ -92,6 +92,9 @@
<property name="length">
<value>1.6081859410430839</value>
</property>
<relationship name="fadeOutCurve">
<destination>{f88a8106-0bcd-4543-b110-9906f66d7ab7}</destination>
</relationship>
<relationship name="audioFile">
<destination>{648b6f80-5b53-444b-b49e-8aa458ad4bec}</destination>
</relationship>
@ -118,6 +121,14 @@
</object>
<object class="MixerBusPanner" id="{08354442-4b6b-4a95-92e5-f6c5fe033401}" />
<object class="MixerBusFader" id="{71e4d769-bf28-4106-9e87-ecb198c567b5}" />
<object class="FadeCurve" id="{f88a8106-0bcd-4543-b110-9906f66d7ab7}">
<relationship name="startPoint">
<destination>{85ec304d-fc0c-457d-b5cf-5134579cdb8a}</destination>
</relationship>
<relationship name="endPoint">
<destination>{fd300c04-9466-4e02-a11c-8deb3489ae75}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{0ff17091-d28c-43a5-857d-9c370babd617}">
<relationship name="effects">
<destination>{35e9573f-6759-4967-adca-a4e9c8d1ed15}</destination>
@ -126,5 +137,24 @@
<object class="MixerBusPanner" id="{9b4145de-5f1d-41ee-a456-b6bee1d40b63}" />
<object class="MixerBusFader" id="{ef308327-45c4-457a-8047-070250f0a42b}" />
<object class="SpatialiserEffect" id="{605c8593-60ed-4466-83d8-803ca3e44e94}" />
<object class="AutomationPoint" id="{85ec304d-fc0c-457d-b5cf-5134579cdb8a}">
<property name="position">
<value>1.1500000000000001</value>
</property>
<property name="value">
<value>1</value>
</property>
<property name="curveShape">
<value>0.25471893</value>
</property>
</object>
<object class="AutomationPoint" id="{fd300c04-9466-4e02-a11c-8deb3489ae75}">
<property name="position">
<value>1.6081859410430839</value>
</property>
<property name="value">
<value>0</value>
</property>
</object>
<object class="MixerBusFader" id="{35e9573f-6759-4967-adca-a4e9c8d1ed15}" />
</objects>

Binary file not shown.

View File

@ -5,3 +5,4 @@ Date/Time,Word Count,en,ko-KR
2025.04.30-23.53.17,600,600,0
2025.04.30-23.59.29,600,592,0
2025.05.01-18.43.00,632,632,0
2025.05.11-12.05.59,1260,1260,0

1 Date/Time Word Count en ko-KR
5 2025.04.30-23.53.17 600 600 0
6 2025.04.30-23.59.29 600 592 0
7 2025.05.01-18.43.00 632 632 0
8 2025.05.11-12.05.59 1260 1260 0