Merge branch 'release/RELEASE3'

EnginyeriaSofwareUB · Dec 22, 2017 · 326154f · 326154f
2 parents 21fa97f + 594c46f
commit 326154f
Show file tree

Hide file tree

Showing 98 changed files with 1,081,118 additions and 159,266 deletions.
diff --git a/Unity/Assets/2D_Destruction/Scripts/Explodable.cs b/Unity/Assets/2D_Destruction/Scripts/Explodable.cs
@@ -1,7 +1,9 @@
 using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
+#if UNITY_EDITOR
 using UnityEditor;
+#endif
 
 [RequireComponent(typeof(Rigidbody2D))]
 public class Explodable : MonoBehaviour

diff --git a/Unity/Assets/Graphics/Background/Background0.png b/Unity/Assets/Graphics/Background/Background0.png
diff --git a/...Assets/Graphics/Lobby/teamVSteam.png.meta → .../Graphics/Background/Background0.png.meta b/...Assets/Graphics/Lobby/teamVSteam.png.meta → .../Graphics/Background/Background0.png.meta
diff --git a/Unity/Assets/Graphics/Chickens/Bullet_9mm.png b/Unity/Assets/Graphics/Chickens/Bullet_9mm.png
diff --git a/Unity/Assets/Graphics/Chickens/Bullet_9mm.png.meta b/Unity/Assets/Graphics/Chickens/Bullet_9mm.png.meta
diff --git a/Unity/Assets/Graphics/Chickens/Movements/explosionGrenade 2.png b/Unity/Assets/Graphics/Chickens/Movements/explosionGrenade 2.png
diff --git a/Unity/Assets/Graphics/Chickens/Movements/explosionGrenade 2.png.meta b/Unity/Assets/Graphics/Chickens/Movements/explosionGrenade 2.png.meta
diff --git a/Unity/Assets/Graphics/Chickens/grenadeM.png b/Unity/Assets/Graphics/Chickens/grenadeM.png
diff --git a/Unity/Assets/Graphics/Chickens/grenadeM.png.meta b/Unity/Assets/Graphics/Chickens/grenadeM.png.meta
diff --git a/Unity/Assets/Graphics/HUD/changeBlue.png b/Unity/Assets/Graphics/HUD/changeBlue.png
diff --git a/Unity/Assets/Graphics/HUD/changeBlue.png.meta b/Unity/Assets/Graphics/HUD/changeBlue.png.meta
diff --git a/Unity/Assets/Graphics/HUD/changeRed.png b/Unity/Assets/Graphics/HUD/changeRed.png
diff --git a/Unity/Assets/Graphics/HUD/changeRed.png.meta b/Unity/Assets/Graphics/HUD/changeRed.png.meta
diff --git a/Unity/Assets/Graphics/HUD/keyboard.png b/Unity/Assets/Graphics/HUD/keyboard.png