Merge remote-tracking branch 'refs/remotes/ceNobiteElf/master'

thefoofighter · Jan 22, 2017 · 11e7439 · 11e7439
2 parents 274335a + a15680e
commit 11e7439
Show file tree

Hide file tree

Showing 42 changed files with 539 additions and 7 deletions.
diff --git a/Assets/_PROJECT/Art/Boat/Ferry.prefab b/Assets/_PROJECT/Art/Boat/Ferry.prefab
diff --git a/Assets/_PROJECT/Art/Environment/Materials/Tiles.mat b/Assets/_PROJECT/Art/Environment/Materials/Tiles.mat
diff --git a/Assets/_PROJECT/Art/Environment/Monolith/Materials/Checkered.mat b/Assets/_PROJECT/Art/Environment/Monolith/Materials/Checkered.mat
diff --git a/Assets/_PROJECT/Art/Environment/Rocks/Materials/Material.001.mat b/Assets/_PROJECT/Art/Environment/Rocks/Materials/Material.001.mat
diff --git a/Assets/_PROJECT/Art/Environment/Rocks/Materials/Material.mat b/Assets/_PROJECT/Art/Environment/Rocks/Materials/Material.mat
diff --git a/Assets/_PROJECT/Art/Environment/Rocks/Rock1.prefab b/Assets/_PROJECT/Art/Environment/Rocks/Rock1.prefab
diff --git a/Assets/_PROJECT/Art/Environment/Rocks/Rock2.prefab b/Assets/_PROJECT/Art/Environment/Rocks/Rock2.prefab
diff --git a/Assets/_PROJECT/Art/Environment/Rocks/Rock3.prefab b/Assets/_PROJECT/Art/Environment/Rocks/Rock3.prefab
diff --git a/...JECT/Art/Environment/Rocks/Rock3 1.prefab → ...OJECT/Art/Environment/Rocks/Rock3B.prefab b/...JECT/Art/Environment/Rocks/Rock3 1.prefab → ...OJECT/Art/Environment/Rocks/Rock3B.prefab
diff --git a/...Art/Environment/Rocks/Rock3 1.prefab.meta → .../Art/Environment/Rocks/Rock3B.prefab.meta b/...Art/Environment/Rocks/Rock3 1.prefab.meta → .../Art/Environment/Rocks/Rock3B.prefab.meta
diff --git a/Assets/_PROJECT/Art/Environment/Torch/Materials/Scene_Material.mat b/Assets/_PROJECT/Art/Environment/Torch/Materials/Scene_Material.mat
diff --git a/Assets/_PROJECT/Art/Grim/Model/Materials/_Grim02___Default.mat b/Assets/_PROJECT/Art/Grim/Model/Materials/_Grim02___Default.mat
diff --git a/Assets/_PROJECT/Art/MainMenu/UiButton Animations.controller b/Assets/_PROJECT/Art/MainMenu/UiButton Animations.controller
diff --git a/Assets/_PROJECT/Art/MainMenu/pythia.ttf b/Assets/_PROJECT/Art/MainMenu/pythia.ttf
diff --git a/Assets/_PROJECT/Art/MainMenu/pythia.ttf.meta b/Assets/_PROJECT/Art/MainMenu/pythia.ttf.meta
diff --git a/Assets/_PROJECT/Art/MainMenu/ui_deathscreen.png b/Assets/_PROJECT/Art/MainMenu/ui_deathscreen.png
diff --git a/Assets/_PROJECT/Art/MainMenu/ui_deathscreen.png.meta b/Assets/_PROJECT/Art/MainMenu/ui_deathscreen.png.meta
diff --git a/Assets/_PROJECT/Art/MainMenu/ui_ingame.png b/Assets/_PROJECT/Art/MainMenu/ui_ingame.png
diff --git a/Assets/_PROJECT/Art/MainMenu/ui_ingame.png.meta b/Assets/_PROJECT/Art/MainMenu/ui_ingame.png.meta
diff --git a/Assets/_PROJECT/Art/MainMenu/ui_titlepage.png b/Assets/_PROJECT/Art/MainMenu/ui_titlepage.png