Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/PlayerBehavior.cs
This commit is contained in:
alsarazin 2015-11-09 17:12:51 -05:00
commit 95dbd14e66
14 changed files with 438 additions and 38 deletions

BIN
Assets/Graphics/Thumbs.db Normal file

Binary file not shown.

BIN
Assets/Graphics/enemy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

View File

@ -0,0 +1,320 @@
fileFormatVersion: 2
guid: d01a377b61762054b8f1c0e7fe5f88fd
timeCreated: 1447093807
licenseType: Free
TextureImporter:
fileIDToRecycleName:
21300000: enemy_0
21300002: enemy_1
21300004: enemy_2
21300006: enemy_3
21300008: enemy_4
21300010: enemy_5
21300012: enemy_6
21300014: enemy_7
21300016: enemy_8
21300018: enemy_9
21300020: enemy_10
21300022: enemy_11
21300024: enemy_12
21300026: enemy_13
21300028: enemy_14
21300030: enemy_15
21300032: enemy_16
21300034: enemy_17
21300036: enemy_18
21300038: enemy_19
21300040: enemy_20
21300042: enemy_21
21300044: enemy_22
21300046: enemy_23
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
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 2
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:
- name: enemy_0
rect:
serializedVersion: 2
x: 17
y: 84
width: 33
height: 72
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_1
rect:
serializedVersion: 2
x: 75
y: 83
width: 43
height: 73
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_2
rect:
serializedVersion: 2
x: 129
y: 83
width: 58
height: 71
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_3
rect:
serializedVersion: 2
x: 195
y: 83
width: 50
height: 69
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_4
rect:
serializedVersion: 2
x: 265
y: 84
width: 39
height: 70
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_5
rect:
serializedVersion: 2
x: 329
y: 84
width: 33
height: 70
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_6
rect:
serializedVersion: 2
x: 389
y: 83
width: 37
height: 73
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_7
rect:
serializedVersion: 2
x: 443
y: 83
width: 57
height: 71
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_8
rect:
serializedVersion: 2
x: 504
y: 83
width: 55
height: 69
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_9
rect:
serializedVersion: 2
x: 575
y: 84
width: 42
height: 69
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_10
rect:
serializedVersion: 2
x: 13
y: 9
width: 33
height: 71
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_11
rect:
serializedVersion: 2
x: 70
y: 9
width: 43
height: 72
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_12
rect:
serializedVersion: 2
x: 126
y: 8
width: 58
height: 71
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_13
rect:
serializedVersion: 2
x: 193
y: 9
width: 50
height: 68
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_14
rect:
serializedVersion: 2
x: 259
y: 9
width: 39
height: 71
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_15
rect:
serializedVersion: 2
x: 326
y: 9
width: 33
height: 71
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_16
rect:
serializedVersion: 2
x: 387
y: 8
width: 37
height: 72
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_17
rect:
serializedVersion: 2
x: 438
y: 8
width: 57
height: 72
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_18
rect:
serializedVersion: 2
x: 504
y: 9
width: 55
height: 68
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_19
rect:
serializedVersion: 2
x: 571
y: 9
width: 42
height: 69
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_20
rect:
serializedVersion: 2
x: 0
y: 1
width: 24
height: 5
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_21
rect:
serializedVersion: 2
x: 25
y: 1
width: 30
height: 5
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_22
rect:
serializedVersion: 2
x: 56
y: 1
width: 9
height: 5
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
- name: enemy_23
rect:
serializedVersion: 2
x: 67
y: 1
width: 8
height: 5
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,13 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 0}
m_IsPrefabParent: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 65c71f57a846ec04db773e9c26c6e2e9
timeCreated: 1447095815
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -284,6 +284,47 @@ Prefab:
GameObject: GameObject:
m_PrefabParentObject: {fileID: 101678, guid: b7819e17682d74b45a71d6831a413e0b, type: 2} m_PrefabParentObject: {fileID: 101678, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
m_PrefabInternal: {fileID: 1024525637} m_PrefabInternal: {fileID: 1024525637}
--- !u!1 &1302261674
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 1302261676}
- 114: {fileID: 1302261675}
m_Layer: 0
m_Name: FallCheck
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1302261675
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1302261674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1e6722564abf8f4a9aacf7b96cedb6f, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1189818989}
cam: {fileID: 1449410197}
--- !u!4 &1302261676
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1302261674}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
--- !u!1 &1449410197 --- !u!1 &1449410197
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -0,0 +1,15 @@
using UnityEngine;
using System.Collections;
public class EnemyBehavior : MonoBehaviour {
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
}

View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 2995a96f18c88c3499b43774e78a5e9b
timeCreated: 1447095777
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,15 @@
using UnityEngine;
using System.Collections;
public class FallCheck : MonoBehaviour {
public GameObject player;
public GameObject cam;
// Update is called once per frame
void FixedUpdate () {
if (player.transform.position.y < cam.transform.position.y - cam.transform.localScale.y)
player.transform.position = new Vector3(0, 0, 0);
}
}

View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: c1e6722564abf8f4a9aacf7b96cedb6f
timeCreated: 1447087271
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -52,7 +52,6 @@ public class PlayerBehavior : MonoBehaviour {
return facingRight; return facingRight;
} }
// ----- Private function(s)
private void flip() private void flip()
{ {
facingRight = !facingRight; facingRight = !facingRight;

View File

@ -8,7 +8,6 @@ PlayerSettings:
defaultScreenOrientation: 4 defaultScreenOrientation: 4
targetDevice: 2 targetDevice: 2
targetResolution: 0 targetResolution: 0
useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: DefaultCompany companyName: DefaultCompany
productName: Laboratoire_2_Equipe_2 productName: Laboratoire_2_Equipe_2
@ -29,7 +28,6 @@ PlayerSettings:
androidShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1
iosAppInBackgroundBehavior: 0 iosAppInBackgroundBehavior: 0
displayResolutionDialog: 1 displayResolutionDialog: 1
iosAllowHTTPDownload: 1
allowedAutorotateToPortrait: 1 allowedAutorotateToPortrait: 1
allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToPortraitUpsideDown: 1
allowedAutorotateToLandscapeRight: 1 allowedAutorotateToLandscapeRight: 1
@ -137,15 +135,6 @@ PlayerSettings:
iOSLaunchScreenFillPct: 100 iOSLaunchScreenFillPct: 100
iOSLaunchScreenSize: 100 iOSLaunchScreenSize: 100
iOSLaunchScreenCustomXibPath: iOSLaunchScreenCustomXibPath:
iOSLaunchScreeniPadType: 0
iOSLaunchScreeniPadImage: {fileID: 0}
iOSLaunchScreeniPadBackgroundColor:
serializedVersion: 2
rgba: 0
iOSLaunchScreeniPadFillPct: 100
iOSLaunchScreeniPadSize: 100
iOSLaunchScreeniPadCustomXibPath:
iOSDeviceRequirements: []
AndroidTargetDevice: 0 AndroidTargetDevice: 0
AndroidSplashScreenScale: 0 AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0} androidSplashScreen: {fileID: 0}
@ -235,8 +224,6 @@ PlayerSettings:
ps4SdkOverride: ps4SdkOverride:
ps4BGMPath: ps4BGMPath:
ps4ShareFilePath: ps4ShareFilePath:
ps4ShareOverlayImagePath:
ps4PrivacyGuardImagePath:
ps4NPtitleDatPath: ps4NPtitleDatPath:
ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyAssignment: -1
ps4RemotePlayKeyMappingDir: ps4RemotePlayKeyMappingDir:
@ -254,13 +241,10 @@ PlayerSettings:
ps4pnGameCustomData: 1 ps4pnGameCustomData: 1
playerPrefsSupport: 0 playerPrefsSupport: 0
ps4ReprojectionSupport: 0 ps4ReprojectionSupport: 0
ps4UseAudio3dBackend: 0
ps4Audio3dVirtualSpeakerCount: 14
ps4attribUserManagement: 0 ps4attribUserManagement: 0
ps4attribMoveSupport: 0 ps4attribMoveSupport: 0
ps4attrib3DSupport: 0 ps4attrib3DSupport: 0
ps4attribShareSupport: 0 ps4attribShareSupport: 0
ps4IncludedModules: []
monoEnv: monoEnv:
psp2Splashimage: {fileID: 0} psp2Splashimage: {fileID: 0}
psp2NPTrophyPackPath: psp2NPTrophyPackPath:

View File

@ -1,2 +1,2 @@
m_EditorVersion: 5.2.2f1 m_EditorVersion: 5.2.0f3
m_StandardAssetsVersion: 0 m_StandardAssetsVersion: 0

View File

@ -150,23 +150,4 @@ QualitySettings:
maximumLODLevel: 0 maximumLODLevel: 0
particleRaycastBudget: 4096 particleRaycastBudget: 4096
excludedTargetPlatforms: [] excludedTargetPlatforms: []
m_PerPlatformDefaultQuality: m_PerPlatformDefaultQuality: {}
Android: 2
BlackBerry: 2
GLES Emulation: 5
Nintendo 3DS: 5
PS3: 5
PS4: 5
PSM: 5
PSP2: 2
Samsung TV: 2
Standalone: 5
Tizen: 2
WP8: 5
Web: 5
WebGL: 3
Wii U: 5
Windows Store Apps: 5
XBOX360: 5
XboxOne: 5
iPhone: 2