Benjamin Comeau 7e35e5c6c0 Merge commit '8c800b6b4f7a67070054163054e1bc1f9ecf5bf8' into monsterAI ...

Conflicts:
	Assets/Scripts/FirstPersonController.cs.meta

2015-11-07 16:15:45 -05:00

..

BenScene.unity

add player to scene Ben

2015-11-07 15:39:42 -05:00

BenScene.unity.meta

Le monstre va suivre le player

2015-11-07 16:11:05 -05:00

FrancisScene.unity

firstTrap prefab

2015-11-07 16:03:11 -05:00

FrancisScene.unity.meta

firstTrap prefab

2015-11-07 16:03:11 -05:00

maxScene.unity

PlayerControl

2015-11-07 20:56:53 +01:00

maxScene.unity.meta

PlayerControl

2015-11-07 20:56:53 +01:00

PatScene.unity

Add the scene folder

2015-11-07 13:26:04 -05:00

PatScene.unity.meta

Add the scene folder

2015-11-07 13:26:04 -05:00