Chiss
|
d41338b76a
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
|
2013-10-31 17:38:44 +11:00 |
|
Chiss
|
ae4bf75485
|
Champs update
|
2013-10-31 17:36:41 +11:00 |
|
Jonathan Williams
|
7b8608de95
|
Rah Rah, Custom Class Combat in Arcade!
|
2013-10-30 23:35:24 -07:00 |
|
Jonathan Williams
|
bac425235d
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-10-30 20:26:08 -07:00 |
|
Chiss
|
52ac670f3f
|
More dom changes
|
2013-10-31 12:43:54 +11:00 |
|
Chiss
|
386e2e3067
|
Added Champs
MAC update
|
2013-10-31 09:45:11 +11:00 |
|
Jonathan Williams
|
a307a4854f
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-10-28 18:45:19 -05:00 |
|
Chiss
|
33c7d594a0
|
robin hood regen nerf
|
2013-10-29 10:43:04 +11:00 |
|
Chiss
|
ad487e48bd
|
THIS IS HALLOWEEN THIS IS HALLOWEEN
|
2013-10-29 10:41:53 +11:00 |
|
Jonathan Williams
|
7279f58b92
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-10-28 08:53:36 -05:00 |
|
Jonathan Williams
|
c70b5c712b
|
Fixed crash items in Server Game Menu for Hub
|
2013-10-28 08:52:32 -05:00 |
|
Chiss
|
ab9cce3910
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-10-28 22:31:03 +11:00 |
|
Chiss
|
91ec162c88
|
slightly easier
|
2013-10-28 22:30:51 +11:00 |
|
Chiss
|
3142bd517d
|
Fixed regen aura... wasnt working at all
|
2013-10-28 21:35:16 +11:00 |
|
Jonathan Williams
|
9d47864503
|
Fixed player count in bungee plugin
|
2013-10-28 03:24:18 -05:00 |
|
Jonathan Williams
|
afee32257d
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-10-28 02:22:30 -05:00 |
|
Chiss
|
f0f7a4156f
|
saving heads to file
|
2013-10-28 17:53:25 +11:00 |
|
Jonathan Williams
|
4306d2444f
|
Updated bungee library
Fixed server ping Event.java
Removed crash item in hub.
|
2013-10-28 01:37:23 -05:00 |
|
Chiss
|
980b6420fe
|
fixed stacker item for 1.7
|
2013-10-28 15:48:06 +11:00 |
|
Chiss
|
09a8cbe558
|
re-enabled waves
|
2013-10-28 14:08:55 +11:00 |
|
Chiss
|
1d4f902298
|
HH CPU fixes
|
2013-10-28 13:54:10 +11:00 |
|
Chiss
|
505dd57715
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-10-27 15:25:12 +11:00 |
|
Chiss
|
4974fc17aa
|
Halloween balance (slightly easier)
Giant hitbox improved
|
2013-10-27 15:24:28 +11:00 |
|
Jonathan Williams
|
845535991d
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-10-26 16:37:07 -05:00 |
|
Jonathan Williams
|
0aee445e00
|
Added timeout check for status retrieval
|
2013-10-26 16:36:48 -05:00 |
|
Chiss
|
7948fa6f71
|
cpu fix ;o
|
2013-10-27 06:21:43 +11:00 |
|
Chiss
|
3892cd13f7
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-10-27 05:32:34 +11:00 |
|
Chiss
|
c9a295d56e
|
Halloween event changes final
|
2013-10-27 05:32:21 +11:00 |
|
Jonathan Williams
|
1781ed15c4
|
Fixed some drop item stuff.
|
2013-10-26 12:02:18 -05:00 |
|
Jonathan Williams
|
95449fec26
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-10-26 11:06:19 -05:00 |
|
Chiss
|
64e98c4a30
|
text now has glowstone behind it (for darkness)
|
2013-10-27 03:05:19 +11:00 |
|
Jonathan Williams
|
7d8e79a234
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-10-26 11:01:22 -05:00 |
|
Jonathan Williams
|
88eab4b1a3
|
Fixed gadget item slot.
Fixed some desc on mounts
|
2013-10-26 11:01:01 -05:00 |
|
Chiss
|
d4affc8bb6
|
paintballs wont change near portals.
|
2013-10-27 02:53:38 +11:00 |
|
Jonathan Williams
|
df36145800
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Mule.java
|
2013-10-26 10:47:14 -05:00 |
|
Jonathan Williams
|
0b0fa383f6
|
Finished up Gadget shop.
|
2013-10-26 10:45:41 -05:00 |
|
Chiss
|
935599030b
|
moved witch (so its not default kit)
|
2013-10-27 02:44:14 +11:00 |
|
Chiss
|
9a025eb540
|
Potion rename
|
2013-10-27 02:37:11 +11:00 |
|
Chiss
|
55de25fded
|
removed testing toggle for mount
changed item gadget slot from 2 to 3
|
2013-10-27 02:22:38 +11:00 |
|
Chiss
|
f838452b5c
|
uncommented waves
|
2013-10-27 01:46:46 +11:00 |
|
Chiss
|
19e2946ce4
|
mule rename
|
2013-10-27 01:44:18 +11:00 |
|
Chiss
|
b4e2145ad7
|
giant speed decrease
ghast teleports back if it flies too far away.
|
2013-10-27 01:43:41 +11:00 |
|
Chiss
|
cd2c9dcdda
|
more tips
|
2013-10-27 01:20:10 +11:00 |
|
Jonathan Williams
|
9bc9cc2bb8
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
|
2013-10-26 08:53:38 -05:00 |
|
Jonathan Williams
|
39cf5c3ed1
|
Tweaking on ghast.
Added gadget costs
Working on Gadget shop.
|
2013-10-26 08:50:12 -05:00 |
|
Chiss
|
c672e68713
|
some help during boss fight.
|
2013-10-27 00:14:38 +11:00 |
|
Chiss
|
7eb1cc6519
|
Halloween game additions
|
2013-10-27 00:06:44 +11:00 |
|
Chiss
|
01cb69d28b
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-10-26 19:01:41 +11:00 |
|
Chiss
|
723b57cd46
|
Added paintball gun Gadget
Added bat blaster Gadget
Halloween Game near-completed
Added SSM Witch
|
2013-10-26 19:01:26 +11:00 |
|
Jonathan Williams
|
ca3979f4fa
|
Added witch disguise hurt sound
|
2013-10-25 20:12:01 -05:00 |
|