1
0
Commit Graph

52 Commits

Author SHA1 Message Date
b5f5b57ba0 New Level2.unity + Level3.unity + Level4.unity 2016-01-31 14:23:12 -05:00
79c246a8a8 Again updated Level2.unity - Caleb 2016-01-31 12:51:03 -05:00
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
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
1fbb63f5c2 this is level2 and 4. 2016-01-31 02:51:06 -05:00
JohnCodyWheeler
99ff28457d finished level2 again 2016-01-31 01:51:11 -05:00
thedonaldloughry
573a7650fa Fixed characters in levels. - Don 2016-01-31 01:13:05 -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
8adb845f00 Merge branch 'master' of https://github.com/new-00-0ne/System-Purge 2016-01-31 00:16:59 -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
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
2b40247452 Updated the script and the Platforms with new Sprites 2016-01-30 20:25:08 -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
d40bd2a8cf Prototype of Level2 plus the player now translates with the moving Platforms - Caleb 2016-01-30 17:12:09 -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
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
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
e16a46bd57 Attempting to commit framework code and character controller. Please work. - Don 2016-01-30 01:10:45 -05:00