Conjure/VZ
6
0
Fork 0
mirror of https://github.com/ConjureETS/VZ.git synced 2026-03-24 02:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/conjureets/vz

Browse Source
This commit is contained in:
jparent 2015-08-12 16:12:59 -04:00
commit ef8a60eadd
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/CharacterMovement.cs
View File

@ -6,9 +6,9 @@ public class CharacterMovement : MonoBehaviour {
public int player; public int player;
public MovementManager mm; public MovementManager mm;
// code mis en commentaire par sam, raison : cannot convert from string to int (on ne pouvait pas compiler les scnènes dans unity sans mettre cette ligne en commentaire.)
enum direction { up = "Up",down = "Down", left = "Left", right = "Right", stop = "Stop" }; //enum direction { up = "Up",down = "Down", left = "Left", right = "Right", stop = "Stop" };
enum direction { up, down, left, right, stop};
// Use this for initialization // Use this for initialization

4
Assets/Scripts/MovementManager.cs
View File

@ -74,8 +74,10 @@ public class MovementManager : MonoBehaviour
{ {
return p2MovBuffer.Dequeue(); return p2MovBuffer.Dequeue();
} }
}catch(Invalide e) }catch(InvalidOperationException exception)
{ {
Debug.LogError("Reached the end of the queue we stop by default!: " + exception);
return "Stop"; return "Stop";
} }
return null; return null;

2
ProjectSettings/ProjectSettings.asset
View File

@ -77,7 +77,6 @@ PlayerSettings:
metroEnableIndependentInputSource: 0 metroEnableIndependentInputSource: 0
metroEnableLowLatencyPresentationAPI: 0 metroEnableLowLatencyPresentationAPI: 0
xboxOneDisableKinectGpuReservation: 0 xboxOneDisableKinectGpuReservation: 0
virtualRealitySupported: 0
productGUID: 54ead80470c104b4682c53a4f7f867b5 productGUID: 54ead80470c104b4682c53a4f7f867b5
AndroidBundleVersionCode: 1 AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 9 AndroidMinSdkVersion: 9
@ -255,6 +254,7 @@ PlayerSettings:
psp2InfoBarOnStartup: 0 psp2InfoBarOnStartup: 0
psp2InfoBarColor: 0 psp2InfoBarColor: 0
psmSplashimage: {fileID: 0} psmSplashimage: {fileID: 0}
virtualRealitySupported: 0
spritePackerPolicy: spritePackerPolicy:
scriptingDefineSymbols: {} scriptingDefineSymbols: {}
metroPackageName: VZ metroPackageName: VZ