max89max d81680c68b Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom ...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2015-11-07 20:58:51 +01:00

..

Editor

PlayerControl

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

Scenes

PlayerControl

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

Script

PlayerControl

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

Scripts

Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom

2015-11-07 20:58:51 +01:00

Standard Assets

PlayerControl

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

Editor.meta

PlayerControl

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

Prefab.meta

PlayerControl

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

Scenes.meta

Add the scene folder

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

Script.meta

PlayerControl

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

Scripts.meta

Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom

2015-11-07 20:58:51 +01:00

Sound.meta

PlayerControl

2015-11-07 20:56:53 +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