Assets/Scripts/PlayerControl.cs · ca2eb01f25073945edf5df3d7e3900e19cf2d583 · gamejam-gpn15 / dyingIsMainstream · GitLab

Blame History Permalink

Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · ca2eb01f
Alisa Jung authored Jun 04, 2015
```
Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Trap.prefab
	Assets/Scripts/PlayerControl.cs
```
ca2eb01f

PlayerControl.cs 6.1 KB