1
0
Commit Graph

6 Commits

Author SHA1 Message Date
dakota
d9b9f7208e state machine 2016-01-30 11:16:38 -05:00
dakota
ceff1eb851 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
#	Assets/Resources/Scripts.meta
2016-01-30 11:13:07 -05:00
dakota
e67007637e state is half done 2016-01-30 06:36:37 -05:00
17c4fdf5ef Early version of Platforms (x1, x2, x4) and sprite changes for all -Caleb
And Don added something to the GameManager.cs
2016-01-30 02:38:33 -05:00
thedonaldloughry
e16a46bd57 Attempting to commit framework code and character controller. Please work. - Don 2016-01-30 01:10:45 -05:00
thedonaldloughry
66b8c265a1 Trying a second commit. - Don 2016-01-29 21:44:30 -05:00