Conjure/EscapeTheRoom
6
0
Fork 0
mirror of https://github.com/ConjureETS/EscapeTheRoom.git synced 2026-03-24 01:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
EscapeTheRoom/Assets
History
Benjamin Comeau 7e35e5c6c0 Merge commit '8c800b6b4f7a67070054163054e1bc1f9ecf5bf8' into monsterAI 
Conflicts:
	Assets/Scripts/FirstPersonController.cs.meta
2015-11-07 16:15:45 -05:00
..
Editor
PlayerControl
2015-11-07 20:56:53 +01:00
Materials
firstTrap prefab
2015-11-07 16:03:11 -05:00
Prefabs
firstTrap prefab
2015-11-07 16:03:11 -05:00
Scenes
Merge commit '8c800b6b4f7a67070054163054e1bc1f9ecf5bf8' into monsterAI
2015-11-07 16:15:45 -05:00
Scripts
Merge commit '8c800b6b4f7a67070054163054e1bc1f9ecf5bf8' into monsterAI
2015-11-07 16:15:45 -05:00
Standard Assets
firstTrap prefab
2015-11-07 16:03:11 -05:00
Editor.meta
PlayerControl
2015-11-07 20:56:53 +01:00
Materials.meta
firstTrap prefab
2015-11-07 16:03:11 -05:00
Prefabs.meta
firstTrap prefab
2015-11-07 16:03:11 -05:00
Scenes.meta
Add the scene folder
2015-11-07 13:26:04 -05:00
Scripts.meta
Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom
2015-11-07 20:58:51 +01:00
Standard Assets.meta
PlayerControl
2015-11-07 20:56:53 +01:00
test.txt
Add Assets folder
2015-11-07 13:13:24 -05:00
test.txt.meta
Change the asset serialization mode from mixed to force text
2015-11-07 13:25:13 -05:00