1
0
Commit Graph

83 Commits

Author SHA1 Message Date
MoMack20
a9184abb34 Spider Controller AGAIN!!!!!!!!!!! 2016-01-31 12:28:43 -05:00
60df0e3c4d level 4 worked on 2016-01-31 11:58:56 -05:00
169bfb9f4d made Prefabs 2016-01-31 11:50:12 -05:00
MoMack20
e7631b5ed5 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
#	Assets/Sprites/SpriteAnimations/SpiderController.controller
2016-01-31 11:47:26 -05:00
MoMack20
5b9c79186b Spider Controller 2016-01-31 11:43:38 -05:00
adbd9db9fa Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 11:35:37 -05:00
c9f1856063 Added more Killzones - Caleb 2016-01-31 11:35:17 -05:00
7d699aaf2c Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 11:13:09 -05:00
a87c9a5ad9 fixed tiny bug in hover 2016-01-31 11:13:02 -05:00
fafd5a7381 Re-Organized level Hierarchy 2016-01-31 04:48:18 -05:00
MoMack20
cf1f714343 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 04:32:52 -05:00
MoMack20
433bf7a7c3 Spider animation and fab 2016-01-31 04:32:44 -05:00
Valtorix5
30d96c554a Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 03:39:33 -05:00
Valtorix5
bba23c0d98 did most of the work for the dialog box's....still needs to be tweaked....fuuuuuuckkkkk 2016-01-31 03:39:17 -05:00
a40ade167d Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 03:22:00 -05:00
fefc995f3a Updated Level3 - Caleb Brown 2016-01-31 03:21:18 -05:00
JohnCodyWheeler
c1d0ac47fd final paperclip animation. 2016-01-31 03:06:11 -05:00
JohnCodyWheeler
c6996454fd Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 02:51:12 -05:00
JohnCodyWheeler
1fbb63f5c2 this is level2 and 4. 2016-01-31 02:51:06 -05:00
NordicNight
c404b007a3 Dank swank 2016-01-31 02:49:20 -05:00
JohnCodyWheeler
99ff28457d finished level2 again 2016-01-31 01:51:11 -05:00
JohnCodyWheeler
d654aca5d4 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 01:22:57 -05:00
JohnCodyWheeler
bc3d297155 made a different background1.png 2016-01-31 01:22:49 -05:00
Valtorix5
68d0ac9c37 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
#	Assets/Resources/Scenes/Level1.unity
2016-01-31 01:20:27 -05:00
Valtorix5
d4a3095783 added in the sprite sheets for the "main" character. needs work. 2016-01-31 01:17: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
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