Merge remote-tracking branch 'origin/main' into main

Browse Source

...

This commit is contained in:

Joel Bernardes 2023-10-16 19:35:59 -04:00

parent d9915f01c9 36e11b4aae

commit 43c3257b27

337 changed files with 1007 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

Content/Blueprints/BP_Boat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/BP_Cruise_Ship.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/BP_Water_Plane.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Cruise_Ship.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/M_Cruise_Ship_Deck.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/M_Cruise_Ship_Outer.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Maps/AustinTestMap.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Materials/M_Cruise_Ship_Deck.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Materials/M_Cruise_Ship_Outer.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Materials/M_Scaled_Ocean.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Mesh/Cruise Ship.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Mesh/SM_Cruise_Ship.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Pillar_50x500.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/SM_AssetPlatform.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_400x200.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_400x300.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_500x500.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_Door_400x300.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_Door_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_Window_400x300.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Architecture/Wall_Window_400x400.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Collapse01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Collapse02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Collapse_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Explosion01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Explosion02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Explosion_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Fire01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Fire01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Fire_Sparks01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Light01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Light01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Light02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Light02_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Smoke01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Smoke01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Starter_Background_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Starter_Birds01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Starter_Music01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Starter_Music_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Starter_Wind05.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Starter_Wind06.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Steam01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Audio/Steam01_Cue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/FogBrightnessLUT.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/M_LightStage_Arrows.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Black.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_HDRI.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Master.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/SM_Arrows.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/Skybox.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Assets/SunlightColorLUT.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/BP_LightStudio.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Blueprint_Effect_Explosion.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Blueprint_Effect_Fire.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Blueprint_Effect_Smoke.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Blueprint_Effect_Sparks.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Blueprint_Effect_Steam.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Blueprints/Blueprint_WallSconce.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Maps/Advanced_Lighting.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Maps/Minimal_Default.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Maps/StarterMap.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_AssetPlatform.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Basic_Floor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Basic_Wall.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Brick_Clay_Beveled.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Brick_Clay_New.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Brick_Clay_Old.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Brick_Cut_Stone.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Brick_Hewn_Stone.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Ceramic_Tile_Checker.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_CobbleStone_Pebble.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_CobbleStone_Rough.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_CobbleStone_Smooth.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_ColorGrid_LowSpec.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Concrete_Grime.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Concrete_Panels.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Concrete_Poured.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Concrete_Tiles.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Glass.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Ground_Grass.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Ground_Gravel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Ground_Moss.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Metal_Brushed_Nickel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Metal_Chrome.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Metal_Copper.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Metal_Gold.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Metal_Rust.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Metal_Steel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Rock_Basalt.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Rock_Marble_Polished.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Rock_Sandstone.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Rock_Slate.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Tech_Checker_Dot.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

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