Merge branch 'dev' into ui-art-replacement

This commit is contained in:
Philip W 2023-02-28 15:26:27 +00:00
commit 9845639e8c
46 changed files with 134 additions and 4 deletions

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

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

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.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

View File

@ -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