Merge branch 'volumetrics' into main

Browse Source

...

This commit is contained in:

Madhav Kapa 2023-09-22 22:30:14 -04:00

parent b292643d99 e9fb0083b9

commit c2b301e5fe

102 changed files with 261 additions and 54 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/3DModels/Material.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/StationModel/Material.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/StationModel/Material_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/StationModel/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/StationModel/Station_Exterior_Draft1_Cube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/StationModel/Station_Exterior_Draft1_Plane.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Station_Exterior_Draft1_Cube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/3DModels/Station_Exterior_Draft1_Plane.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/Animations/Running.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/AstronautModel.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/AstronautModel_Skeleton.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/Materials/Orange.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/Materials/PowerLight.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/AstronautShoes.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Boots/AstronautShoes.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Boots/Leather.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Boots/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Boots/Material_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Boots/Material_010.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Boots/Metal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Degradable_Metal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Fluffy_White_Towel.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Helmet/Degradable_Metal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Helmet/Fluffy_White_Towel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Helmet/Helmet_Solo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Helmet/helmet_glass.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Helmet_Solo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Leather.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Material_002.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Material_003.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Material_010.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Metal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Air.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_004.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_005.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_006.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cube_007.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Cylinder.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_FinalBaseMesh.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_FrontHolder.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_FrontHolder_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/AstronautPack_Pack.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Jute_Matting.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Leather.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Leather_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Leather_Strips_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Leather_procedural.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_004.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_005.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_006.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_007.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_008.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/Pack/Material_009.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/AstronautPack_Joined.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Leather_Strips_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Leather_procedural.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_004.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_005.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_006.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_007.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_008.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/PackSingle/Material_009.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/AstronautMixamo/SubModels/helmet_glass.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/CameraActor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/CameraPawn.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/MainMenu.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/MenuGamemode.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/Widgets/Button_Widget.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/Widgets/CreditsWidget.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/Widgets/MainMenu.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/Widgets/MainMenuWidget.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/Widgets/OptionsMenuWidget.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Levels/MainMenu/Widgets/TItleWidget.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Textures/effects/ShotMuzzle.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Textures/effects/ShotMuzzle_BG.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Textures/effects/Smoke.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Textures/effects/Smoke2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Textures/effects/glitchy.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/0J/AUF8XUE8Z3NPAHCXHCU4BK.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/4K/MTLDX5FV01CDUF7XTSIX5Q.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/EJ/PGUWWHRTS59S34GKBX0OUI.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/HF/YFYBQ72OYLHJQS0TSSXGBV.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/QS/VHQF8JWOATZI5V3ZVY5YTM.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/OG/KDQDMXAXZXD8VLDDU4K3JL.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/P3/O43ETCZTFMLWWH1CJ941H2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/NC/UUYHDUFQAXTRRN4RVOPIUF.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/NP/Z9EK2TXQ1TFO26WFZHWZII.uasset (Stored with Git LFS)

View File

Binary file not shown.

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