Merge branch 'dev' into ui-art-replacement
This commit is contained in:
commit
9845639e8c
BIN
Concept Art/Modular_test.fbx
(Stored with Git LFS)
Normal file
BIN
Concept Art/Modular_test.fbx
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Characters/Goat Enemy/Goat.fbx
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Characters/Goat Enemy/Goat.fbx
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Characters/Goat Enemy/GoatRefs.pur
Normal file
BIN
Content/Assets/Characters/Goat Enemy/GoatRefs.pur
Normal file
Binary file not shown.
BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_BaseColor.png
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_BaseColor.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_Normal.png
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_Normal.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Emissive.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Emissive.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Height.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Height.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Metallic.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Metallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Roughness.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Roughness.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
(Stored with Git LFS)
BIN
Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Environment/Test_imports/Modular_test.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Test_imports/Modular_test.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Test_imports/lambert1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Test_imports/lambert1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Plank_Long.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Plank_Long.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Plank_Short.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Plank_Short.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/lambert1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/lambert1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/lambert2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/lambert2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/tutorial_level_ceiling.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/tutorial_level_ceiling.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/tutorial_level_ceiling1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/tutorial_level_ceiling1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/tutorial_level_ceiling2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/tutorial_level_ceiling2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/tutorial_level_floor.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/tutorial_level_floor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/tutorial_level_floor1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/tutorial_level_floor1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Environment/Tutorial/tutorial_level_floor2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Environment/Tutorial/tutorial_level_floor2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Top_layer_level.umap
(Stored with Git LFS)
BIN
Content/Levels/Top_layer_level.umap
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/Tutorial.umap
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Tutorial.umap
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -5,3 +5,7 @@
|
|||||||
### Character Dialogue
|
### Character Dialogue
|
||||||
|
|
||||||
https://docs.google.com/spreadsheets/d/13iVCQuveBiaihpREnY145OZi5QT-1sseNoI0A5v8D1o/edit?usp=sharing
|
https://docs.google.com/spreadsheets/d/13iVCQuveBiaihpREnY145OZi5QT-1sseNoI0A5v8D1o/edit?usp=sharing
|
||||||
|
|
||||||
|
### Bestiary lore book
|
||||||
|
|
||||||
|
https://docs.google.com/document/d/1jvDYRwQlCNFKgY6uCOwbyIQsDW3oOkqERXwN_QHcjD8/edit?usp=sharing
|
||||||
|
Loading…
Reference in New Issue
Block a user