From ecb4fe02b1e85e57863cd813ed0e1f0e333e6707 Mon Sep 17 00:00:00 2001 From: misabiko Date: Sun, 7 Jun 2020 17:10:19 -0400 Subject: [PATCH] Added basic 2d third person movement + Dummy HexTiled shader --- .idea/.idea.Bomberman/.idea/contentModel.xml | 2 + .idea/.idea.Bomberman/.idea/workspace.xml | 64 +- Assets/Materials/Red.mat | 90 ++ Assets/Materials/Red.mat.meta | 8 + Assets/Materials/TestHexFloor.mat | 29 + Assets/Materials/TestHexFloor.mat.meta | 8 + Assets/Materials/TestHexFloor.shadergraph | 182 ++++ .../Materials/TestHexFloor.shadergraph.meta | 10 + Assets/Scenes/MainScene Movement.unity | 908 ++++++++++++++++++ Assets/Scenes/MainScene Movement.unity.meta | 7 + Assets/ScriptableObjects.meta | 8 + Assets/ScriptableObjects/Player Data.asset | 16 + .../ScriptableObjects/Player Data.asset.meta | 8 + Assets/Scripts/PlayerData.cs | 8 + Assets/Scripts/PlayerData.cs.meta | 11 + Assets/Scripts/PlayerMovement.cs | 61 ++ Assets/Scripts/PlayerMovement.cs.meta | 11 + Assets/Settings/Bomberman.inputactions | 825 ++++++++++++++++ Assets/Settings/Bomberman.inputactions.meta | 14 + Assets/Shaders.meta | 8 + Assets/Shaders/Hex Lattice.ShaderSubGraph | 379 ++++++++ .../Shaders/Hex Lattice.ShaderSubGraph.meta | 10 + 22 files changed, 2665 insertions(+), 2 deletions(-) create mode 100644 Assets/Materials/Red.mat create mode 100644 Assets/Materials/Red.mat.meta create mode 100644 Assets/Materials/TestHexFloor.mat create mode 100644 Assets/Materials/TestHexFloor.mat.meta create mode 100644 Assets/Materials/TestHexFloor.shadergraph create mode 100644 Assets/Materials/TestHexFloor.shadergraph.meta create mode 100644 Assets/Scenes/MainScene Movement.unity create mode 100644 Assets/Scenes/MainScene Movement.unity.meta create mode 100644 Assets/ScriptableObjects.meta create mode 100644 Assets/ScriptableObjects/Player Data.asset create mode 100644 Assets/ScriptableObjects/Player Data.asset.meta create mode 100644 Assets/Scripts/PlayerData.cs create mode 100644 Assets/Scripts/PlayerData.cs.meta create mode 100644 Assets/Scripts/PlayerMovement.cs create mode 100644 Assets/Scripts/PlayerMovement.cs.meta create mode 100644 Assets/Settings/Bomberman.inputactions create mode 100644 Assets/Settings/Bomberman.inputactions.meta create mode 100644 Assets/Shaders.meta create mode 100644 Assets/Shaders/Hex Lattice.ShaderSubGraph create mode 100644 Assets/Shaders/Hex Lattice.ShaderSubGraph.meta diff --git a/.idea/.idea.Bomberman/.idea/contentModel.xml b/.idea/.idea.Bomberman/.idea/contentModel.xml index 619d652..121c858 100644 --- a/.idea/.idea.Bomberman/.idea/contentModel.xml +++ b/.idea/.idea.Bomberman/.idea/contentModel.xml @@ -19,6 +19,8 @@ + + diff --git a/.idea/.idea.Bomberman/.idea/workspace.xml b/.idea/.idea.Bomberman/.idea/workspace.xml index 49f6aa2..3e38d7d 100644 --- a/.idea/.idea.Bomberman/.idea/workspace.xml +++ b/.idea/.idea.Bomberman/.idea/workspace.xml @@ -1,15 +1,46 @@ + + + + + + + +