|
|
2ceb666d20
|
Committing all - Caleb
|
2016-01-31 18:03:23 -05:00 |
|
thedonaldloughry
|
8d2c8debaa
|
Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
# Assets/Resources/Scenes/Level1.unity
|
2016-01-31 16:30:16 -05:00 |
|
thedonaldloughry
|
4cc830b6c0
|
Trying to commit basic character animations. - Don
|
2016-01-31 16:28:44 -05:00 |
|
JohnCodyWheeler
|
b479fee5c1
|
Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
|
2016-01-31 16:22:52 -05:00 |
|
JohnCodyWheeler
|
f28584e95e
|
new Background2.png
|
2016-01-31 16:22:48 -05:00 |
|
Valtorix5
|
eb53e8442a
|
Updated the scripts and the character Movement
|
2016-01-31 16:07:17 -05:00 |
|
Valtorix5
|
a9b06b8e7e
|
made it to where the NPC is in the level and has dialog box.
|
2016-01-31 16:03:02 -05:00 |
|
|
|
9ddff14982
|
Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
|
2016-01-31 15:28:40 -05:00 |
|
|
|
3829b2dbb6
|
Levels updated with healt bar
|
2016-01-31 15:28:31 -05:00 |
|
MoMack20
|
609665c9f3
|
Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
|
2016-01-31 15:10:53 -05:00 |
|
MoMack20
|
0fae17aec0
|
moer ai stoof
|
2016-01-31 15:10:47 -05:00 |
|
MoMack20
|
0988fb0c8c
|
Ai stoof
|
2016-01-31 15:10:18 -05:00 |
|
|
|
4fbed299e2
|
Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
|
2016-01-31 14:56:27 -05:00 |
|
|
|
caa23f9f87
|
fixed up the gui stoof
|
2016-01-31 14:53:10 -05:00 |
|
Valtorix5
|
f2dbc7b2ea
|
Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
|
2016-01-31 14:47:27 -05:00 |
|
Valtorix5
|
839b4e3217
|
worked on the dialog shit...for the third time.
|
2016-01-31 14:45:21 -05:00 |
|
|
|
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 |
|
|
|
611836d541
|
Merge branch 'master' of https://github.com/new-00-0ne/System-Purge
# Conflicts:
# Assets/Resources/Scenes/Level1.unity
|
2016-01-31 04:49:40 -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 |
|
