Jonathan Williams
645ae4cad8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-09 17:10:43 -07:00
Jonathan Williams
b90a6617f5
Fixed shops not opening and only showing 1 full green server.
2013-09-09 17:10:24 -07:00
Jonathan Williams
77a6c4c658
Fix for confirmation page NPE
2013-09-09 17:07:45 -07:00
Chiss
c46a550282
restructured games in arcade
2013-09-10 07:56:55 +10:00
Jonathan Williams
ecaca5d6fd
just a little cleanup.
2013-09-09 02:07:20 -07:00
Jonathan Williams
6b7b6c9fdf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-09-09 01:30:28 -07:00
Jonathan Williams
d4b3c5d461
Fixed memory leaks.
...
Added in party joining for servers in Hub
Modified server status's in server UI.
2013-09-09 01:28:35 -07:00
Chiss
9fe33bab84
Added UHC
...
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
2013-09-09 18:06:44 +10:00
Chiss
8b2cc7993f
Added UHC
...
Disabled Join Maps
2013-09-08 19:31:58 +10:00
Chiss
64f4302008
More hub fix
2013-09-08 12:09:50 +10:00
Chiss
e93a8c5a23
Map fix
2013-09-08 11:39:01 +10:00
Chiss
4419fe54c6
Hub Map update
2013-09-08 11:34:00 +10:00
Chiss
8dec407f16
SSM: wither image dies when you die
...
Turf Forts: you retain infil slow if you go onto enemy spawn
Hub Maps
2013-09-08 10:16:39 +10:00
Chiss
f612826787
SSM: dont give passive item descs in game.
2013-09-07 19:30:06 +10:00
Chiss
ff0e39067a
Added Mount Manager
2013-09-07 16:01:10 +10:00
Chiss
a24a80e5a5
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-09-07 14:13:08 +10:00
Chiss
7ab04be00c
Added Hub Parties
...
Re-did Hub Tutorials
Added Party Tutorial
2013-09-07 14:09:12 +10:00
Jonathan Williams
7a9a3fea4f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-06 17:43:59 -07:00
Jonathan Williams
2266cc4556
Added stop override and player redirect to Hub
...
Added prevention of items going into inventory for ServerNpcPage
Fixed issue with ClientClass and Competitive ULTRA
Fixed issue with CustomBuildPage and Competitive ULTRA
Added ULTRA joining full servers for Arcade.
Added ULTRA packs displaying in Arcade chat/tab.
Removed IChat from TeamGameEngine and Dominate.
2013-09-06 17:43:45 -07:00
Chiss
213b1efb0c
Added Dragon Escape
...
fixed kit availability for runner
SSM: wither skel projectile continues after releasing block
SSM: nerfed blizzard
SSM: reduced gem price of a few kits
2013-09-06 15:58:58 +10:00
Jonathan Williams
9fcda443e1
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-05 02:12:24 -07:00
Jonathan Williams
4b1d6756e2
Added missing PlayerCount project.
2013-09-05 02:12:12 -07:00
Jonathan Williams
22ee1522c1
Added DynamicServer for bungee.
...
Added reload commands for balancer, dynamicserver, playercount.
Added depends for lboby on dynamic server.
2013-09-05 02:11:47 -07:00
Chiss
768f57ae5e
SSM: Added Wither Skeleton and Creeper kits
...
Compass: no longer teleports if not holding compass (on click)
SSM: various balance changes.
2013-09-05 13:55:42 +10:00
Jonathan Williams
9121d429c2
Added armor show/hide for insentient disguises.
2013-09-04 19:56:43 -07:00
Jonathan Williams
97405f6cfa
Fixed NPE in SkillPage
...
Added some timing debug text // for now
Changed utiltext setting method.
2013-09-04 18:52:08 -07:00
Chiss
f29b844798
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
resolved
2013-09-05 07:50:13 +10:00
Chiss
87fa103711
WHITE SPACE CHANGES!
2013-09-05 07:44:53 +10:00
Jonathan Williams
34dd5a1af3
Added broadcast command.
...
Added Chat to hub.
Disabled /me
Fixed Pets not returning when pushed off into the void.
Prevented eggs from spawning in hub.
2013-09-04 11:35:59 -07:00
Jonathan Williams
55b6bd6e95
Fixed memory leaks in SSM kits.
2013-09-04 10:46:33 -07:00
Jonathan Williams
552675b1bf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-04 10:36:13 -07:00
Chiss
010336983a
SSM: fixed fissure not working
...
Hub: fixed invisibility for tutorial players (others could still see them and throw em)
2013-09-04 18:03:01 +10:00
Jonathan Williams
2a2c48087f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 23:31:44 -07:00
Jonathan Williams
d5ef0208a1
Added lag meter to hub and arcade.
2013-09-03 23:31:29 -07:00
Chiss
93e59c1c43
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-04 16:13:12 +10:00
Chiss
ca6131d1d5
SSM Minor patches
2013-09-04 16:11:50 +10:00
Chiss
48c4ca0e24
SSM minor changes
2013-09-04 15:40:02 +10:00
Jonathan Williams
37897037a3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 20:46:48 -07:00
Jonathan Williams
63b4776893
Garrrr, fixed craftbukkit building.
2013-09-03 20:43:32 -07:00
Chiss
f07c23b99b
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-04 11:57:36 +10:00
Chiss
e3eae200ae
arcade: fixed kit material NPE
...
SSM: added knight
SSM: added placeholder for wither skel
2013-09-04 11:55:19 +10:00
Jonathan Williams
e63b4b8d66
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 17:30:25 -07:00
Jonathan Williams
5a30173aba
Updated craftbukkit.
2013-09-03 17:29:50 -07:00
Chiss
23ac045a41
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-04 08:14:20 +10:00
Chiss
6b57a87285
SSM Kit Item Lore
2013-09-04 08:13:59 +10:00
Jonathan Williams
346bdb030e
Cleaned warning.
...
Fixed punish command on web side.
2013-09-03 14:10:14 -07:00
Jonathan Williams
c2ec238af5
Fixed kit purchase in SuperSmashMobs
2013-09-03 12:13:15 -07:00
Jonathan Williams
b894aea72a
Fixed login speeds.
...
Implemented Tasks for Tutorial
Removed compiled files for website.
2013-09-03 11:34:28 -07:00
Jonathan Williams
cec476c72d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 08:52:20 -07:00
Jonathan Williams
d16b674f46
Memory cleanup (Recharge, ClassCombatShop)
...
Implemented Tasks.
2013-09-03 08:51:44 -07:00
