antoine.mcnabb 62d518a8e1 Merge fix

2016-06-25 11:57:36 -04:00

..

images.png

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

images.png.meta

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

New Material 1.mat

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

New Material 1.mat.meta

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

New Material.mat

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

New Material.mat.meta

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

PlayerMovement.cs

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

PlayerMovement.cs.meta

Merge fix

2016-06-25 11:57:36 -04:00

PostEffectScript.cs

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

PostEffectScript.cs.meta

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

PostEffectShader.shader

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

PostEffectShader.shader.meta

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

sky-1141928_960_720.jpg

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

sky-1141928_960_720.jpg.meta

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

ViewControl.cs

View and movement merge + stay a while mechanic first pass

2016-06-25 11:52:35 -04:00

ViewControl.cs.meta

Merge fix

2016-06-25 11:57:36 -04:00