Merge pull request #4 from brihernandez/develop

Develop
brihernandez · Nov 4, 2017 · d17b868 · d17b868
2 parents 6393548 + 6fb8a2a
commit d17b868
Show file tree

Hide file tree

Showing 99 changed files with 1,525 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,3 @@ sysinfo.txt
 
 # Builds
 *.apk
-*.unitypackage
diff --git a/Assets/SimpleWings.meta b/Assets/SimpleWings.meta
diff --git a/Assets/SimpleWings/Demo.meta b/Assets/SimpleWings/Demo.meta
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs.meta b/Assets/SimpleWings/Demo/ExamplePrefabs.meta
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/Bomb.prefab b/Assets/SimpleWings/Demo/ExamplePrefabs/Bomb.prefab
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/Bomb.prefab.meta b/Assets/SimpleWings/Demo/ExamplePrefabs/Bomb.prefab.meta
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/FighterJet.prefab b/Assets/SimpleWings/Demo/ExamplePrefabs/FighterJet.prefab
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/FighterJet.prefab.meta b/Assets/SimpleWings/Demo/ExamplePrefabs/FighterJet.prefab.meta
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/LightPlane.prefab b/Assets/SimpleWings/Demo/ExamplePrefabs/LightPlane.prefab
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/LightPlane.prefab.meta b/Assets/SimpleWings/Demo/ExamplePrefabs/LightPlane.prefab.meta
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/Missile.prefab b/Assets/SimpleWings/Demo/ExamplePrefabs/Missile.prefab
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/Missile.prefab.meta b/Assets/SimpleWings/Demo/ExamplePrefabs/Missile.prefab.meta
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/WheelVisual.prefab b/Assets/SimpleWings/Demo/ExamplePrefabs/WheelVisual.prefab
diff --git a/Assets/SimpleWings/Demo/ExamplePrefabs/WheelVisual.prefab.meta b/Assets/SimpleWings/Demo/ExamplePrefabs/WheelVisual.prefab.meta
diff --git a/Assets/SimpleWings/Demo/Materials.meta b/Assets/SimpleWings/Demo/Materials.meta
diff --git a/Assets/SimpleWings/Demo/Materials/GridX10.mat b/Assets/SimpleWings/Demo/Materials/GridX10.mat
diff --git a/Assets/SimpleWings/Demo/Materials/GridX10.mat.meta b/Assets/SimpleWings/Demo/Materials/GridX10.mat.meta
diff --git a/Assets/SimpleWings/Demo/Materials/GridX50.mat b/Assets/SimpleWings/Demo/Materials/GridX50.mat
diff --git a/Assets/SimpleWings/Demo/Materials/GridX50.mat.meta b/Assets/SimpleWings/Demo/Materials/GridX50.mat.meta
diff --git a/Assets/SimpleWings/Demo/Materials/Textures.meta b/Assets/SimpleWings/Demo/Materials/Textures.meta
diff --git a/Assets/SimpleWings/Demo/Materials/Textures/grid.png b/Assets/SimpleWings/Demo/Materials/Textures/grid.png
diff --git a/Assets/SimpleWings/Demo/Materials/Textures/grid.png.meta b/Assets/SimpleWings/Demo/Materials/Textures/grid.png.meta
diff --git a/Assets/SimpleWings/Demo/Scenes.meta b/Assets/SimpleWings/Demo/Scenes.meta
diff --git a/Assets/SimpleWings/Demo/Scenes/Plane.meta b/Assets/SimpleWings/Demo/Scenes/Plane.meta
diff --git a/Assets/SimpleWings/Demo/Scenes/Plane.unity b/Assets/SimpleWings/Demo/Scenes/Plane.unity
diff --git a/Assets/SimpleWings/Demo/Scenes/Plane.unity.meta b/Assets/SimpleWings/Demo/Scenes/Plane.unity.meta
diff --git a/Assets/SimpleWings/Demo/Scenes/Plane/LightingData.asset b/Assets/SimpleWings/Demo/Scenes/Plane/LightingData.asset
diff --git a/Assets/SimpleWings/Demo/Scenes/Plane/LightingData.asset.meta b/Assets/SimpleWings/Demo/Scenes/Plane/LightingData.asset.meta
diff --git a/Assets/SimpleWings/Demo/Scenes/Plane/ReflectionProbe-0.exr b/Assets/SimpleWings/Demo/Scenes/Plane/ReflectionProbe-0.exr
diff --git a/Assets/SimpleWings/Demo/Scenes/Plane/ReflectionProbe-0.exr.meta b/Assets/SimpleWings/Demo/Scenes/Plane/ReflectionProbe-0.exr.meta
diff --git a/Assets/SimpleWings/Demo/Scripts.meta b/Assets/SimpleWings/Demo/Scripts.meta
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@ sysinfo.txt

		# Builds
		*.apk
		*.unitypackage