1
0
Commit Graph

21 Commits

Author SHA1 Message Date
JohnCodyWheeler
99ff28457d finished level2 again 2016-01-31 01:51:11 -05:00
JohnCodyWheeler
bc3d297155 made a different background1.png 2016-01-31 01:22:49 -05:00
thedonaldloughry
d41f170590 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
#	Assets/Resources/Scenes/Level2.unity
#	Assets/Sprites/PaperClip/PapeStationary.png.meta
2016-01-31 01:14:34 -05:00
thedonaldloughry
573a7650fa Fixed characters in levels. - Don 2016-01-31 01:13:05 -05:00
JohnCodyWheeler
bba0ce441f finished level2 2016-01-31 01:02:25 -05:00
thedonaldloughry
e79e8de926 NOW YOU HAVE LEVEL LOADING BUT YOU NEED TO BUILD FIRST FUCK IT - DOOOOOOOOOOOOOOOOOOOOON 2016-01-31 00:42:51 -05:00
Valtorix5
e264e14cbb made the main character "better" by implementing the code that i've worked on. 2016-01-30 19:24:40 -05:00
thedonaldloughry
0b9a54c664 I am committing that GUI no longer exists. Also, let me know if Assets/Cloud [moving].meta or Assets/Resources/Scripts/AIScripts.meta gives you problems. - Don 2016-01-30 14:31:52 -05:00
b6010f60fa Deleted Dustin's second project - Caleb 2016-01-30 14:25:56 -05:00
dakota
3d5d94f897 finish the state machine for idle and wander 2016-01-30 13:36:45 -05:00
165b5bb788 More platform prefabs (now x1, x2, x4, x8, x16) 2016-01-30 04:54:18 -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
ca5dc03c4f Committing the scene_object tag. - Don 2016-01-30 01:34:15 -05:00
thedonaldloughry
ee8a4335de Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
#	ProjectSettings/TagManager.asset
2016-01-30 01:17:51 -05:00
thedonaldloughry
e16a46bd57 Attempting to commit framework code and character controller. Please work. - Don 2016-01-30 01:10:45 -05:00
a96bffe72a finished basic wander with the cube. may need to edit once we have actual sprites.. 2016-01-29 23:36:26 -05:00
thedonaldloughry
66b8c265a1 Trying a second commit. - Don 2016-01-29 21:44:30 -05:00
303640821e Reorganized Dustin's Test Character 2016-01-29 21:36:05 -05:00
Valtorix5
b19765765e did simple character movement and raycasting 2016-01-29 21:24:05 -05:00
thedonaldloughry
578eadd3ee Committing project structure - Don 2016-01-29 21:10:37 -05:00
11e62c3bbe First commit 2016-01-29 19:17:12 -05:00