Browse Source

Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown

Conflicts:
	playable/Assets/Scenes/Level1.unity
master
Joshua Reason 9 years ago
parent
commit
c8c85dd883
34 changed files with 556 additions and 24 deletions
  1. BIN
      playable/Assets/Materials/Alpaca.mat
  2. +4
    -0
      playable/Assets/Materials/Alpaca.mat.meta
  3. BIN
      playable/Assets/Materials/Title background nopin.mat
  4. +4
    -0
      playable/Assets/Materials/Title background nopin.mat.meta
  5. BIN
      playable/Assets/Materials/Title background pixel.mat
  6. +4
    -0
      playable/Assets/Materials/Title background pixel.mat.meta
  7. BIN
      playable/Assets/Materials/Title background.mat
  8. +4
    -0
      playable/Assets/Materials/Title background.mat.meta
  9. BIN
      playable/Assets/Scenes/Level2.unity
  10. BIN
      playable/Assets/Scenes/Menu_Scene.unity
  11. +14
    -3
      playable/Assets/Scripts/menuContrller.cs
  12. +9
    -21
      playable/Assets/Scripts/playerId.cs
  13. BIN
      playable/Assets/Textures/Alpaca.PNG
  14. +47
    -0
      playable/Assets/Textures/Alpaca.PNG.meta
  15. BIN
      playable/Assets/Textures/Coliseum 1.png
  16. +47
    -0
      playable/Assets/Textures/Coliseum 1.png.meta
  17. BIN
      playable/Assets/Textures/Coliseum.png
  18. +47
    -0
      playable/Assets/Textures/Coliseum.png.meta
  19. BIN
      playable/Assets/Textures/Goat.PNG
  20. +47
    -0
      playable/Assets/Textures/Goat.PNG.meta
  21. BIN
      playable/Assets/Textures/Kangaroo.PNG
  22. +47
    -0
      playable/Assets/Textures/Kangaroo.PNG.meta
  23. BIN
      playable/Assets/Textures/PlatformMayhem 1.PNG
  24. +47
    -0
      playable/Assets/Textures/PlatformMayhem 1.PNG.meta
  25. BIN
      playable/Assets/Textures/PlatformMayhem.PNG
  26. +47
    -0
      playable/Assets/Textures/PlatformMayhem.PNG.meta
  27. BIN
      playable/Assets/Textures/Platypuss.PNG
  28. +47
    -0
      playable/Assets/Textures/Platypuss.PNG.meta
  29. BIN
      playable/Assets/Textures/Space.png
  30. +47
    -0
      playable/Assets/Textures/Space.png.meta
  31. BIN
      playable/Assets/Textures/Title background nopin.JPG
  32. +47
    -0
      playable/Assets/Textures/Title background nopin.JPG.meta
  33. BIN
      playable/Assets/Textures/Title background pixel.JPG
  34. +47
    -0
      playable/Assets/Textures/Title background pixel.JPG.meta

BIN
playable/Assets/Materials/Alpaca.mat View File


+ 4
- 0
playable/Assets/Materials/Alpaca.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 861555f01673d1943aecb2310dee354b
NativeFormatImporter:
userData:

BIN
playable/Assets/Materials/Title background nopin.mat View File


+ 4
- 0
playable/Assets/Materials/Title background nopin.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: cd8cf300c1e29244da9216c17c3eb0c9
NativeFormatImporter:
userData:

BIN
playable/Assets/Materials/Title background pixel.mat View File


+ 4
- 0
playable/Assets/Materials/Title background pixel.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 1d4e69b412825cb4eaa98a60222390f5
NativeFormatImporter:
userData:

BIN
playable/Assets/Materials/Title background.mat View File


+ 4
- 0
playable/Assets/Materials/Title background.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 1c31f02ed47bd8d4784302c0652ae953
NativeFormatImporter:
userData:

BIN
playable/Assets/Scenes/Level2.unity View File


BIN
playable/Assets/Scenes/Menu_Scene.unity View File


+ 14
- 3
playable/Assets/Scripts/menuContrller.cs View File

@ -13,6 +13,10 @@ public class menuContrller : MonoBehaviour {
public GameObject txt_score;
public GameObject txt_confetti;
public levelController control;
public GameObject alpaca;
public GameObject platypuss;
public GameObject goat;
public GameObject kangaroo;
// Use this for initialization
void Start () {
@ -27,16 +31,23 @@ public class menuContrller : MonoBehaviour {
menu.SetActive (false);
options.SetActive (false);
levelSelect.SetActive (false);
alpaca.SetActive (true);
goat.SetActive (true);
platypuss.SetActive (true);
kangaroo.SetActive (true);
if (panel == "menu")
menu.SetActive (true);
if (panel =="options")
options.SetActive (true);
if (panel == "levelSelect")
if (panel == "levelSelect") {
levelSelect.SetActive (true);
alpaca.SetActive (false);
goat.SetActive (false);
platypuss.SetActive (false);
kangaroo.SetActive (false);
}
}
public void playerSelect (int players){

+ 9
- 21
playable/Assets/Scripts/playerId.cs View File

@ -2,15 +2,12 @@
using System.Collections;
public class playerId : MonoBehaviour {
public bool idVanish = false;
public GameObject p1;
public GameObject p2;
public GameObject p3;
public GameObject p4;
public bool idVanish = true;
public GameObject idTag;
// Use this for initialization
void Start () {
}
// Update is called once per frame
@ -20,23 +17,14 @@ public class playerId : MonoBehaviour {
if (Input.GetKeyDown (KeyCode.Backspace)) {
idVanish = true;
if (idVanish) {
p1.gameObject.SetActive (false);
p2.gameObject.SetActive (false);
p3.SetActive (false);
p4.SetActive (false);
idVanish = !idVanish;
idTag.gameObject.SetActive (idVanish);
Debug.Log ("player ID false");
}
}
if (Input.GetKeyDown (KeyCode.Backspace) && idVanish == true) {
p1.SetActive (true);
p2.SetActive (true);
p3.SetActive (true);
p4.SetActive (true);
idVanish = false;
}
}

BIN
playable/Assets/Textures/Alpaca.PNG View File

Before After
Width: 321  |  Height: 605  |  Size: 117 KiB

+ 47
- 0
playable/Assets/Textures/Alpaca.PNG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: 1761c065eb2968b4aa568b1bcdbbf97e
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Coliseum 1.png View File

Before After
Width: 1616  |  Height: 910  |  Size: 3.0 MiB

+ 47
- 0
playable/Assets/Textures/Coliseum 1.png.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: 3888a182bd784e94ab0e3500a83c13ce
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Coliseum.png View File

Before After
Width: 1616  |  Height: 910  |  Size: 3.0 MiB

+ 47
- 0
playable/Assets/Textures/Coliseum.png.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: c0b1480e9874f9c488a121a8d234ae9d
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Goat.PNG View File

Before After
Width: 339  |  Height: 309  |  Size: 82 KiB

+ 47
- 0
playable/Assets/Textures/Goat.PNG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: ddf51d0b44662b046bdec9d74ac1ff30
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Kangaroo.PNG View File

Before After
Width: 353  |  Height: 395  |  Size: 92 KiB

+ 47
- 0
playable/Assets/Textures/Kangaroo.PNG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: c21a842feb726ca43b8ec4dbb936d523
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/PlatformMayhem 1.PNG View File

Before After
Width: 1620  |  Height: 909  |  Size: 479 KiB

+ 47
- 0
playable/Assets/Textures/PlatformMayhem 1.PNG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: 60071c6c7b44c8b44971beb252f58db2
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/PlatformMayhem.PNG View File

Before After
Width: 1620  |  Height: 909  |  Size: 479 KiB

+ 47
- 0
playable/Assets/Textures/PlatformMayhem.PNG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: 1c71f2387f290b146b6a026d1459ec02
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Platypuss.PNG View File

Before After
Width: 240  |  Height: 229  |  Size: 67 KiB

+ 47
- 0
playable/Assets/Textures/Platypuss.PNG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: 5f19c6c41b93cdd4e8f39a5e6079d0df
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Space.png View File

Before After
Width: 1920  |  Height: 1080  |  Size: 1.8 MiB

+ 47
- 0
playable/Assets/Textures/Space.png.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: 5142c2292ab96524eae8ba3ae55aa0c8
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Title background nopin.JPG View File

Before After
Width: 1920  |  Height: 1080  |  Size: 898 KiB

+ 47
- 0
playable/Assets/Textures/Title background nopin.JPG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: f14db97a66fd1794fbf32ce35b747a75
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
playable/Assets/Textures/Title background pixel.JPG View File

Before After
Width: 1920  |  Height: 1080  |  Size: 1.2 MiB

+ 47
- 0
playable/Assets/Textures/Title background pixel.JPG.meta View File

@ -0,0 +1,47 @@
fileFormatVersion: 2
guid: 7b37758d49bbde04786b5e0d688bae2e
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

Loading…
Cancel
Save