1
0
Commit Graph

59 Commits

Author SHA1 Message Date
JohnCodyWheeler
55d4a0ab13 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 00:46:13 -05:00
JohnCodyWheeler
8eb88adddb animated paperclip and placed in level2 2016-01-31 00:46:08 -05:00
thedonaldloughry
a3cdbfad11 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 00:43:21 -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
JohnCodyWheeler
e0b8aa449e Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 00:41:32 -05:00
JohnCodyWheeler
eebd6ae51d fixed a level and reworking animation. 2016-01-31 00:41:26 -05:00
e60bb80dc4 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 00:17:34 -05:00
8adb845f00 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 00:16:59 -05:00
e82cc74090 commitment the battery health gui thing for Noland. also fixed kill boxes so that they can be given a name. 2016-01-31 00:16:58 -05:00
2ae09d18eb Level3.unity added and old Level3 renamed to Level4 - Caleb 2016-01-31 00:16:42 -05:00
JohnCodyWheeler
bf68838c8b Fleshed out level 1. 2016-01-30 23:42:48 -05:00
dakota
a39d745194 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-30 23:13:17 -05:00
dakota
b765ec3671 working on the flight ai 2016-01-30 23:12:26 -05:00
MoMack20
663319d38b Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-30 22:46:08 -05:00
MoMack20
2db1e474ec Sound stuffs bitches 2016-01-30 22:45:03 -05:00
JohnCodyWheeler
772f047e0e there is a new test-map and working on level1 2016-01-30 22:41:39 -05:00
2988856d38 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
#	Assets/Resources/Scenes/Level1.unity
2016-01-30 22:13:20 -05:00
bce257e56a Added Level3.unity and Background to Level1.unity 2016-01-30 22:07:42 -05:00
Valtorix5
db7b9def30 Fixed the dialogue, still need a bit more "testing" 2016-01-30 21:49:16 -05:00
JohnCodyWheeler
005b59a0c9 paperclip moving animation. 2016-01-30 21:42:39 -05:00
2b40247452 Updated the script and the Platforms with new Sprites 2016-01-30 20:25:08 -05:00
67b18de11b worked on GUI. Simple health bar is temp. 2016-01-30 20:17:49 -05:00
JohnCodyWheeler
66a44d1cc4 made some circuit blocks. 2016-01-30 20:10:55 -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
dakota
d599262b83 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-30 18:43:21 -05:00
dakota
2aca91c62b state machine 2016-01-30 18:40:34 -05:00
dakota
2e16acb527 finish state machine 2016-01-30 18:01:40 -05:00
JohnCodyWheeler
23721fcf76 These blocks are more foundation blocks, with two different color types and two versions of wire color types to switch between. 2016-01-30 17:16:02 -05:00
d40bd2a8cf Prototype of Level2 plus the player now translates with the moving Platforms - Caleb 2016-01-30 17:12:09 -05:00
JohnCodyWheeler
a1f46a1c20 mid Blocks 2016-01-30 16:45:50 -05:00
JohnCodyWheeler
b9129ea883 made some blocks cornerblocks. 2016-01-30 16:34:06 -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
Valtorix5
ffe7055f3f Workable character script that should enable the three abilities. 95% correct.
-Dustin
2016-01-30 14:22:32 -05:00
740be99d5a New Platforms (Glitching and Moving in all sizes) plus the first Level is prototyped out - Caleb 2016-01-30 14:16:48 -05:00
d44538d879 Worked on flying ai stuff 2016-01-30 14:05:46 -05:00
dakota
3d5d94f897 finish the state machine for idle and wander 2016-01-30 13:36:45 -05:00
dakota
9956b9286d add state machine
Signed-off-by: dakota <gamer55001@hotmail.com>
2016-01-30 11:29:21 -05:00
dakota
a4f00ff58e change 2016-01-30 11:24:52 -05:00
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
165b5bb788 More platform prefabs (now x1, x2, x4, x8, x16) 2016-01-30 04:54:18 -05:00
JohnCodyWheeler
9ca6d32884 floating AI 2016-01-30 04:28:27 -05:00
6df1338b46 made flying Ai things. HUZZAH 2016-01-30 04:04:54 -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