1781ed15c4
Fixed some drop item stuff.
2013-10-26 12:02:18 -05:00
95449fec26
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:06:19 -05:00
64e98c4a30
text now has glowstone behind it (for darkness)
2013-10-27 03:05:19 +11:00
7d8e79a234
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:01:22 -05:00
88eab4b1a3
Fixed gadget item slot.
...
Fixed some desc on mounts
2013-10-26 11:01:01 -05:00
d4affc8bb6
paintballs wont change near portals.
2013-10-27 02:53:38 +11:00
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
0b0fa383f6
Finished up Gadget shop.
2013-10-26 10:45:41 -05:00
935599030b
moved witch (so its not default kit)
2013-10-27 02:44:14 +11:00
9a025eb540
Potion rename
2013-10-27 02:37:11 +11:00
55de25fded
removed testing toggle for mount
...
changed item gadget slot from 2 to 3
2013-10-27 02:22:38 +11:00
f838452b5c
uncommented waves
2013-10-27 01:46:46 +11:00
19e2946ce4
mule rename
2013-10-27 01:44:18 +11:00
b4e2145ad7
giant speed decrease
...
ghast teleports back if it flies too far away.
2013-10-27 01:43:41 +11:00
cd2c9dcdda
more tips
2013-10-27 01:20:10 +11:00
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
39cf5c3ed1
Tweaking on ghast.
...
Added gadget costs
Working on Gadget shop.
2013-10-26 08:50:12 -05:00
c672e68713
some help during boss fight.
2013-10-27 00:14:38 +11:00
7eb1cc6519
Halloween game additions
2013-10-27 00:06:44 +11:00
01cb69d28b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 19:01:41 +11:00
723b57cd46
Added paintball gun Gadget
...
Added bat blaster Gadget
Halloween Game near-completed
Added SSM Witch
2013-10-26 19:01:26 +11:00
ca3979f4fa
Added witch disguise hurt sound
2013-10-25 20:12:01 -05:00
8958b8998f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 11:35:02 +11:00
a52bd69558
Witch SSM
2013-10-26 11:34:05 +11:00
5470f847a9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 19:06:43 -05:00
8883855297
Added witch disguise
...
Added missing files.
2013-10-25 19:05:26 -05:00
49e8c15f44
important update
2013-10-25 22:56:28 +11:00
e8ddfc266e
fsd6gty72 tjn6g wgh
2013-10-25 22:20:46 +11:00
61b7a86b67
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-25 21:25:36 +11:00
b74b8e3915
Halloween event changes
2013-10-25 21:25:23 +11:00
e5f99331dd
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 05:16:15 -05:00
c3754d766b
Added in vegetate check for EntityGhast.
2013-10-25 05:15:17 -05:00
5563d94111
Halloween event update
...
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
21128eb153
Prepping filterChat and CoreClientManager for mysql
...
Removed get all clients at server start.
2013-10-23 16:36:13 -05:00
1977572ced
Added Halloween Minigame
...
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
7cec55713c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-19 16:52:27 +11:00
1944c0003c
Hub gadgets
2013-10-19 16:52:15 +11:00
985ce795d2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-18 00:50:49 -07:00
90fbc397ff
Converted gem rewards to boolean return from website.
...
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
02258b9fd3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-18 09:12:19 +11:00
882ede9a21
tp ah exception
2013-10-18 09:09:29 +11:00
7e77f78d2f
Removed all client list pull.
2013-10-17 00:54:14 -07:00
43b42f771a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2013-10-17 00:40:06 -07:00
f88c202e07
Added AntiHack to Arcade/Hub
...
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
2013-10-17 00:37:57 -07:00
410e08b06a
Clearer MAC reporting to staff
2013-10-17 09:05:03 +11:00
4d6a0e2133
Ah no kick
2013-10-17 09:02:52 +11:00
d9ecbf4037
AH Update
2013-10-17 09:01:36 +11:00
d23f72567a
fixed bug.
2013-10-16 17:22:28 +11:00
9cdcbed086
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-16 12:24:02 +11:00
2a836f3464
Added anti-hack
2013-10-16 12:23:23 +11:00
483f8ffde3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-15 14:20:45 -07:00
9569c3906e
Starting work on dynamic server.
2013-10-15 14:19:14 -07:00
1a5f6a9b74
Coreclient fix.
2013-10-15 14:18:13 -07:00
40e49dd3d4
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-16 08:11:04 +11:00
ec80d8a568
added AntiHack
...
added dragonrider coolness
2013-10-16 08:10:45 +11:00
c68bfce21a
Fix for null pointer in core client cleanup
2013-10-14 12:20:49 -07:00
922d269a52
Added core client cleanup in case of weird glitch from bungee
2013-10-13 22:40:06 -07:00
1cdb89f4bf
Derp, missing arcade.
2013-10-13 21:51:38 -07:00
6c568cb7a9
Added MemoryFix to Arcade
...
Added Dipose override and task cancellation to Confirmationpage
Cleaned up unused code in Updater
2013-10-13 21:51:25 -07:00
230ad4aa7b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-14 10:29:48 +11:00
9ffc793f61
added Dragon Rider
...
anti-stack changes (dont anti-stack mined blocks)
2013-10-14 10:29:20 +11:00
6dee9c983f
Increased interval between sending restart commands from server monitor.
2013-10-13 02:25:17 -07:00
1c1fb056a6
Memory leak fix for explosion blocks.
2013-10-13 01:27:41 -07:00
25dec6fb46
Fixed player arm animation bug.
...
Added EnderDragon AI control and vegetation
2013-10-12 20:31:43 -07:00
36b825d36d
Snake update (woo)
2013-10-13 10:33:16 +11:00
d784a0b017
snake speed ramp up decrease
2013-10-13 09:38:03 +11:00
a34b6da238
even less blocks
2013-10-13 09:20:00 +11:00
bb39f18573
Explosion creates less blocks.
2013-10-13 09:18:49 +11:00
e12477c4b6
snake max speed decrease
2013-10-13 08:46:02 +11:00
1fd894934a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-13 08:43:06 +11:00
377f4b0680
Gem fix, now correctly displays scaled gems.
...
UHC public changes
Snake fixes.
2013-10-13 08:42:49 +11:00
c5385ee7dc
Fixed ultra join in arcade manager.
2013-10-12 02:53:22 -07:00
e723075298
Increased lobby menu size.
...
Fixed memory leak in Explosion
2013-10-12 02:52:35 -07:00
03c74aa419
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-12 01:55:52 -07:00
42b932e612
Added inventory move prevention for all inventories
...
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
2013-10-12 01:55:32 -07:00
c8386bbc40
blue kit for snake
2013-10-12 18:22:20 +11:00
a315064a3f
snake fix
...
parkour radius increase
2013-10-12 18:21:19 +11:00
0564bd740a
SSM wolf balance
2013-10-12 17:17:24 +11:00
4eecca3063
Wolf fixes
2013-10-12 17:13:28 +11:00
8766767d96
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 16:59:38 +11:00
27fb3b4262
Snake changes
...
SSM Wolf fixes
2013-10-12 16:59:23 +11:00
f2c295c391
Fixed global ultra joining full games.
2013-10-11 22:03:17 -07:00
0b2dcc2617
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 09:34:59 +11:00
8376316994
Added Paintball
...
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
923a066013
Added ServerMonitor
2013-10-10 09:02:21 -07:00
fc18d0fbb1
Added null check logging to arcade custom kit name.
...
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
2013-10-10 09:01:48 -07:00
ed804e3336
Dragon escape update
2013-10-09 21:50:39 +11:00
ca4760a7d6
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-08 02:22:29 -07:00
3999f80a79
Fixed Lobby balancer issue and null bungee connect.
...
Optimized lobby balancing based on connects per second.
Added Pet deactivation.
Possibly fixed asynchronous pet spawning as well.
TODO : Realized we are doing a lot of async stuff....stupid jon jon.
2013-10-08 02:22:04 -07:00
1fc446ae13
Lobby text now displays map
2013-10-08 17:56:57 +11:00
b64803e499
Smash Wolf
2013-10-08 17:44:04 +11:00
e7de90c267
Bridge changes to allow for 12 team map
...
Bridge timer fix
Smash wolf remove
World parser allows more than 4 teams.
2013-10-05 22:14:57 +10:00
c9af91fcd6
Tweak on lobby to show number instead of player count in item.
2013-10-05 01:49:55 -07:00
1431961b39
Fixed issues with Pet menu.
...
Fixed typo in Welcome Tutorial
2013-10-05 00:59:45 -07:00
f389378bd2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-04 23:57:58 -07:00
4ed1d97a33
Added missing pet buttons.
2013-10-04 23:56:16 -07:00
59d7a78086
Revamped pet purchase and added pet menu to player hotbar.
...
Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.
2013-10-04 23:55:05 -07:00
ab45c717dd
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-10-05 07:49:21 +10:00
3ba848567c
paintball added
...
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
57b0d06786
Added DisguiseWolf
...
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
44da981cf4
Fixed dominate bug again.
...
Fixed quick game menu bug.
2013-09-27 23:06:53 -07:00
86199d2795
Fix for dominate.
2013-09-27 20:05:30 -07:00
f9400a0eb4
Fixed multiple finishes for parkours
2013-09-27 12:45:24 -07:00
b6d33010ca
- Lava parkour fire ticks are no more
...
- Lava gem rewards on npcs reflect actual value (1000 and 4000)
- Can't carry people into parkour areas now
Removed unused code with Portal
Added portal functionality for server quick join
Disabled SG text
Updated quick game menu text.
2013-09-27 12:40:09 -07:00
894a121a2e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-27 17:08:52 +10:00
34521eef8f
minor game fixes
...
portal method in StackerManager.java
2013-09-27 17:08:32 +10:00
7c0e3bcc53
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-26 21:20:38 -07:00
b71ff09fb5
Fixed double server status manager in MK
...
Fixed tps of 0.
Fixed couple bugs in Shop/Conf page.
2013-09-26 21:18:31 -07:00
2a3d7426d5
Some scoreboard fixes
2013-09-26 12:38:32 +10:00
f0e6a7294e
squid hitbox larger
2013-09-24 09:18:36 +10:00
0390d4f63b
desc update suqid
2013-09-24 08:56:51 +10:00
064dd97d00
HitBox support for disguises
...
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
ea5cc7161a
pigssss
2013-09-24 08:19:07 +10:00
d8d4b69dda
baby pig to pig
2013-09-24 08:15:48 +10:00
82f5fcb963
Pig Fix!
2013-09-24 08:12:51 +10:00
68e068092f
Fix for ageable.
2013-09-23 15:09:52 -07:00
6d5acd29db
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-23 13:53:28 -07:00
10994924c2
Fixes for Bungee lobby balancer.
...
Exception handling in PlayerJoinEvents for hub (tracking a bug)
Fix in pages for shop.
Support eth1 private address setting in server status.
Fix for bug in ClientClass.
2013-09-23 13:30:40 -07:00
d4775a91a1
hitbox reduction
2013-09-23 17:45:14 +10:00
0f9f28dcc2
fixed weapon names in pigs, + baby pig on platform
2013-09-23 17:36:53 +10:00
5ba494c381
Made player names more visible in squid
2013-09-23 16:05:05 +10:00
ce89108aea
Fixed disguises in bacon brawl
2013-09-23 16:00:35 +10:00
eae38dfa22
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-23 15:50:30 +10:00
bf4dc35b5f
Added pig Game
...
added squid game
added recharged skill event
2013-09-23 15:48:35 +10:00
8aad215475
Added sheep color/shear for disguise
2013-09-22 21:12:08 -07:00
e098d93155
Added baby disguise ability.
...
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.
Code cleanup.
2013-09-22 20:53:24 -07:00
cc63fdccfc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-21 15:02:14 -07:00
558d9b4cc6
Added shop link to kits.
...
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
2013-09-21 15:01:40 -07:00
b3a78112be
Fixed gem display bug
2013-09-21 13:53:12 +10:00
eb6bbceecd
Slowed hunger degen a little, increased regen to damage dealt.
2013-09-21 13:40:04 +10:00
9064272a38
Prepared SSM for 200 player Game (added hunger)
2013-09-21 13:34:14 +10:00
9da18ea43f
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-21 08:34:24 +10:00
a92c74a28a
HG Updates
...
Other minor fixes
2013-09-21 08:34:07 +10:00
85cc6e5b2b
Updated to 1.6.4
2013-09-20 01:50:56 -07:00
3622808e09
Fix for task cancelling.
2013-09-19 02:39:53 -07:00
d2ab872856
Added some code for Global bungee communication.
...
Fixed up LobbyBalancer
2013-09-19 00:05:23 -07:00
7329cc0aea
Implemented quick game menu.
...
Fixed dom team size at 1.
Removed old server update code from server manager.
2013-09-18 22:11:49 -07:00
7d31b24c75
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-18 05:20:58 -07:00
978254c16c
Fixed dominate start issues.
...
Fixed issue with server status manager and config for server tracker.
Changed minekart mob name.
Updated Minekart with new server status stuff.
Updated Dominate with new server status stuff.
2013-09-18 05:16:29 -07:00
91ce36d6e4
Hub refactor
...
Hub parkour module
2013-09-18 19:46:45 +10:00
ae00d3df18
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-17 15:52:16 -07:00
f31a734a0d
Fixed server pages to show 5 servers.
...
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.
Revamped bungee player count method.
Revamped server status method.
2013-09-17 15:50:23 -07:00
f280fb51f2
Mute now blocks commands too.
2013-09-17 14:54:50 +10:00
c6a9d4675f
MTC changes
...
Barbarians changes
OITQ enchanter desc improvement
renamed Turf Forts
Added 2.5x gems for bridges
2013-09-17 10:37:45 +10:00
c6b3a8a56c
Added Minigames to hub TextCreator.java
...
Milk the cow changes!
2013-09-16 12:23:57 +10:00
118d52e106
Slime Buff
2013-09-16 12:03:04 +10:00
7bd13b416e
Some turf forts fixes/changes
...
Fixed SSM lobby
2013-09-16 11:52:27 +10:00
616ba6312c
fixed bug with bomber not giving tnt
2013-09-15 15:27:50 +10:00
6f03c57c22
Farmers lose 5 milk when dying.
2013-09-15 14:21:10 +10:00
6b5373c20c
Fixed Turf Forts arrow bug
2013-09-15 13:57:13 +10:00
7894f95aab
Milk Cow now has 3 cows
...
dragon escape backtrack fix
2013-09-15 13:43:56 +10:00
d51599de28
HG start
...
Added /hub and /leave to return to hub
2013-09-15 11:12:11 +10:00
cc39abfd7f
UHC fixes
...
IdleManager NPE fix
2013-09-14 20:03:24 +10:00
44b82f90b1
Shredder buff
2013-09-14 19:05:07 +10:00
c5f239baba
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-14 02:02:57 -07:00
817fa5737c
Added nether teleportation to game world.
2013-09-14 02:02:34 -07:00
5ad627decb
SSM Creeper shield nerf by 50% duration
2013-09-14 16:13:24 +10:00
743c8e9978
SSM Blaze slight buff
...
Dragons: Removed knockback (based on feedback)
Dragons: added 3 mroe dragons :D
2013-09-14 16:09:30 +10:00
72718ff7b4
nerfed farmer in milk teh cow
...
fixed some UHC bugs
made party tutorial return you to spawn
2013-09-14 15:20:28 +10:00
34c333dac9
added announcement logging
...
fixed creeper explosion disable for uhc
fixed player logout thing for UHC?
2013-09-14 12:27:40 +10:00
e49b92d280
UHC fixes
...
Game inventory disable doesnt disable punish anymore
2013-09-14 11:33:33 +10:00
9cac72dc1e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-14 09:36:05 +10:00
3ae6ba709d
smash kit display update
2013-09-14 09:34:05 +10:00
c976a46f1f
Optimized UtilText/MapUtil.java
...
Added quick game menu. Still needs work.
2013-09-13 15:25:01 -07:00
2fb200119e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-14 08:13:37 +10:00
35c10f22a1
Fixed gems in a few games
...
Milk Cow; cannot pickup water, cannot drink milk after end
2013-09-14 08:13:21 +10:00
35728ce4d3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-12 22:33:43 -07:00
c4c81085c5
Added ignore check for bungee updating.
...
Fixed PlayerCount for bungee's
Fixed bug with Party.
2013-09-12 22:33:03 -07:00
20090406a6
missing kit
2013-09-13 12:25:45 +10:00
b1744e86d8
many UHC bug fixes
...
dragon escape bug fixes
barbarians bug fixes
death tag fixes
2013-09-13 12:24:33 +10:00
60dd6c84d0
Updated World Parser / Data to account for Y of corner blocks.
...
Use same height to have no height limits.
2013-09-12 09:01:37 +10:00
9490549a96
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-12 09:01:04 +10:00
2a65086b70
Added Milk the Cow
...
Maps now set Min/Max Y
2013-09-12 08:57:51 +10:00
4ec728d6cb
Fixed party bug with expiring invitees.
2013-09-11 13:59:26 -07:00
a02b726303
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2013-09-11 13:54:41 -07:00
d6bd962768
Added in dynamic servermanager updating.
...
Added updating of bungeeServers/servers list.
Combined all bungee plugins to Mineplexer
Fixed arcade bug on player quit.
Fixed ServersUI page errors.
2013-09-11 13:53:24 -07:00
ea81e558ea
Added;
...
- Death Tag
- Dragon Escape
- Barbarians
Spleef; added hunger
Dragons; added knockback
Turf Forts; buffed shredder + fixed infil on respawn
Added knockack to 1 damage attacks.
Removed 'hit sound' from hitting mobs (just plays animal sound)
2013-09-11 12:22:55 +10:00
0d98868a1f
Fixed comparison issue in server page UI.
...
Added DisguiseBlock for disguises.
2013-09-09 18:42:20 -07:00
a6a32e45e0
Fixed player tag going on others.
2013-09-09 17:30:50 -07:00
0f577c3f8c
Added ultra tag in hub.
2013-09-09 17:17:55 -07:00
645ae4cad8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-09 17:10:43 -07:00
b90a6617f5
Fixed shops not opening and only showing 1 full green server.
2013-09-09 17:10:24 -07:00
77a6c4c658
Fix for confirmation page NPE
2013-09-09 17:07:45 -07:00
c46a550282
restructured games in arcade
2013-09-10 07:56:55 +10:00
ecaca5d6fd
just a little cleanup.
2013-09-09 02:07:20 -07:00
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
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
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
8b2cc7993f
Added UHC
...
Disabled Join Maps
2013-09-08 19:31:58 +10:00
64f4302008
More hub fix
2013-09-08 12:09:50 +10:00
e93a8c5a23
Map fix
2013-09-08 11:39:01 +10:00
4419fe54c6
Hub Map update
2013-09-08 11:34:00 +10:00
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
f612826787
SSM: dont give passive item descs in game.
2013-09-07 19:30:06 +10:00
ff0e39067a
Added Mount Manager
2013-09-07 16:01:10 +10:00
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
7ab04be00c
Added Hub Parties
...
Re-did Hub Tutorials
Added Party Tutorial
2013-09-07 14:09:12 +10:00
7a9a3fea4f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-06 17:43:59 -07:00
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
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
9fcda443e1
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-05 02:12:24 -07:00
4b1d6756e2
Added missing PlayerCount project.
2013-09-05 02:12:12 -07:00
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
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
9121d429c2
Added armor show/hide for insentient disguises.
2013-09-04 19:56:43 -07:00
97405f6cfa
Fixed NPE in SkillPage
...
Added some timing debug text // for now
Changed utiltext setting method.
2013-09-04 18:52:08 -07:00
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
87fa103711
WHITE SPACE CHANGES!
2013-09-05 07:44:53 +10:00
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
55b6bd6e95
Fixed memory leaks in SSM kits.
2013-09-04 10:46:33 -07:00
552675b1bf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-04 10:36:13 -07:00
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
2a2c48087f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 23:31:44 -07:00
d5ef0208a1
Added lag meter to hub and arcade.
2013-09-03 23:31:29 -07:00
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
ca6131d1d5
SSM Minor patches
2013-09-04 16:11:50 +10:00
48c4ca0e24
SSM minor changes
2013-09-04 15:40:02 +10:00
37897037a3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 20:46:48 -07:00
63b4776893
Garrrr, fixed craftbukkit building.
2013-09-03 20:43:32 -07:00
f07c23b99b
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-04 11:57:36 +10:00
e3eae200ae
arcade: fixed kit material NPE
...
SSM: added knight
SSM: added placeholder for wither skel
2013-09-04 11:55:19 +10:00
e63b4b8d66
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 17:30:25 -07:00
5a30173aba
Updated craftbukkit.
2013-09-03 17:29:50 -07:00
23ac045a41
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-04 08:14:20 +10:00
6b57a87285
SSM Kit Item Lore
2013-09-04 08:13:59 +10:00
346bdb030e
Cleaned warning.
...
Fixed punish command on web side.
2013-09-03 14:10:14 -07:00
c2ec238af5
Fixed kit purchase in SuperSmashMobs
2013-09-03 12:13:15 -07:00
b894aea72a
Fixed login speeds.
...
Implemented Tasks for Tutorial
Removed compiled files for website.
2013-09-03 11:34:28 -07:00
cec476c72d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-03 08:52:20 -07:00
d16b674f46
Memory cleanup (Recharge, ClassCombatShop)
...
Implemented Tasks.
2013-09-03 08:51:44 -07:00
564c1720bd
SSM Balances
2013-09-03 19:18:56 +10:00
83567fce50
SSM slime nerf
...
disguise 0 velocity packet fix
2013-09-03 10:47:15 +10:00
f2a58ab029
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-03 10:17:06 +10:00
835d78e0e7
added hub tutorial
2013-09-03 10:16:44 +10:00
74dba53e32
Fixed ignore update.
2013-09-02 16:24:04 -07:00
5aec6509ca
Fixed shop inventory loss bug.
...
Added IgnoreUpdate.dat file check for testing with FileUPdater.
Fixed bug in SkillPage
Fixed bug in ClassCombatShop
Disabled dragon spawning in hub.
2013-09-02 16:20:14 -07:00
59f2b9ebc8
Memory cleanup with all MiniPlugins.
...
Added Dragon.
Cleanup memory with Class Restore
2013-09-02 05:37:33 -07:00
66131ad0b0
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-02 04:20:18 -07:00
8840f04977
Fixed FileUpdater.
...
Added FileUpdater to DOM and Arcade.
2013-09-02 04:19:56 -07:00
ad26c519ba
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 18:45:31 +10:00
45d28569e0
Added idle fix
...
fixed hub Dragon.java
ate the rabbit stew.
2013-09-02 18:45:12 +10:00
d0098b8a46
Removed double jump effect for surrounding players in hub.
...
Disabled Dragon spawning in HubManager.java(pending fix)
Fixed priority on MOTD for FileUPdater.
2013-09-02 01:16:29 -07:00
af7a41ae71
Implemented ServerRestart event on FileUpdate check.
...
Implemented cancels in arcade/dom/mk
Implemented Restart updates in server manager page.
Implemented lobby removal is restarting.
2013-09-02 01:09:28 -07:00
43c3f8cc87
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 23:28:22 -07:00
63d2563f92
Added Disguise hurt sounds.
...
Enabled disguised hurt sounds in DamageManager
2013-09-01 23:28:07 -07:00
441e6d80b7
lobby kit disguises :D
...
slime NPE fix
2013-09-02 16:01:14 +10:00
ee20174d80
lobby adv messagfe
2013-09-02 15:47:08 +10:00
d5fd95c53b
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 15:07:27 +10:00
98b285d819
turf forts self kill fix.
2013-09-02 15:07:07 +10:00
a49f67b33c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 22:06:35 -07:00
f0b0c72ddb
Fixed arcade packethandler problem.
...
Fixed skill page issue for class combat.
2013-09-01 22:06:20 -07:00
c483d869a5
Added SSM Spider and Squid Kit
...
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
2013-09-02 14:40:06 +10:00
789a26471d
smash stats Perk
2013-09-02 09:51:53 +10:00
3041cacb26
Renamed disguise methods to lowercase.
2013-09-01 16:38:32 -07:00
4607b2fdcd
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 09:35:44 +10:00
3384d8e057
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 09:35:27 +10:00
07ad83fa41
Added getDisguise
...
Renamed new methods to lowercase.
2013-09-01 16:35:17 -07:00
668a6e4854
changed utilplayer health method to double
...
spleef eventhandelr removal
turf forts kit green/blue
added kit stats for smash
nerfed flap in smash
2013-09-02 09:35:04 +10:00
181f3d4746
Added to DisguiseManager:
...
-ReApplyDisguise
-UpdateDisguise
-IsDisguised
2013-09-01 16:30:17 -07:00
e4e861d568
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-01 16:18:39 -07:00
148c288d4f
Fixed shop bug affecting server menu and class setup in hub.
2013-09-01 16:17:44 -07:00
75ced1a033
hub animals die in void
...
hub invis doesnt remove from list
2013-09-02 08:24:37 +10:00
96f6862bd1
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-02 08:17:08 +10:00
9149cc565e
Hub turns off flight (people were staying in flying somehow)
...
Spleef block damage fix
Smash kit balances
2013-09-02 08:16:35 +10:00
5380899cfe
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-08-31 20:30:18 -07:00
d14b21d29f
Removed VoteHub.java
...
Added commons codec to all build paths for Ant
Fixed pet shop new name.
Added send all for Portal.
Updated Hubmanager
2013-08-31 20:28:35 -07:00
07dcfeb266
Compass in smash
...
can break windows in OITQ
block toss cannot dig tunnels, or take from walls.
chicken missile fixes
remove fire ticks from players on respawn
2013-09-01 12:18:48 +10:00
72bec77237
Queueing now works with less players than teams.
...
Added DragonName text-input for hub
Fixed smash bug, where spectators were causing lightning effect
2013-09-01 08:34:53 +10:00
30c5267da2
removed castel siege
2013-08-31 21:31:09 +10:00
329953b2b7
dragon update
2013-08-31 20:49:20 +10:00
2174c958d9
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-31 02:57:12 -07:00
9d56abdcbc
Fixed hub build file.
2013-08-31 02:56:58 -07:00
1a929082a1
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-08-31 19:52:12 +10:00
dd44b982f9
Added hub dragon
2013-08-31 19:51:59 +10:00
86f47cbd9e
Fixed sterling npc.
...
Enabled champion shops.
2013-08-31 02:36:31 -07:00
300981524d
Added owner disguises
2013-08-31 02:25:06 -07:00
ff75bc1207
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-31 02:01:55 -07:00
e3fa648fc9
HUb minekart rider disguise....
2013-08-31 02:01:41 -07:00
b74c11cd36
Minor text hub changes
2013-08-31 18:57:33 +10:00
c0198b1b1f
Fixed vegetate...derp.
2013-08-31 01:36:40 -07:00
0f4facd407
whitespace gone.
2013-08-31 01:29:52 -07:00
e530e3b5a8
Fix for npc vegetate.
2013-08-31 01:29:32 -07:00
e18239f89a
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-08-31 18:19:55 +10:00
dab3f33cbf
Hub text changes
...
Hub animal spawns
Hub spawn invisibility
Smash kit balances
2013-08-31 18:19:23 +10:00
50ea1867e9
Added slime vegetate.
...
Fixed dominate changes.
2013-08-31 01:16:39 -07:00
68b7e0e3fa
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-30 20:59:23 -07:00
6ee2e427b5
Changed TeamEntity from Creature to LivingEntity
2013-08-31 13:58:40 +10:00
63b3cf501f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-08-30 20:58:27 -07:00
0f7828092c
Added missing craftbukkit files.
2013-08-30 20:57:46 -07:00
fb592640a1
Fixed various merge errors.
...
(Updates)
2013-08-31 13:47:48 +10:00
81f8503180
Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2013-08-31 13:41:58 +10:00
e17368a9ac
>.< Updates
2013-08-31 13:15:16 +10:00
13110356aa
Added Enjin Translator poll ability.
...
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
2013-08-30 16:37:21 -07:00
da08321de4
Added possible second option for pulling purchases to Enjin plugin.
2013-08-30 09:45:25 -07:00
6302869c02
Fixed up lobby balancer.
2013-08-30 02:24:39 -07:00
90de0c3ed2
Added LobbyBalancer for BungeeCord
...
Added EnjinTranslator for automatic shop.
Removed enjin module from Hub
Tweaked donation/punish/accountadministrator for shop automation.
2013-08-30 01:36:55 -07:00
bb2af17856
Cleaned up files.
2013-08-30 01:26:12 -07:00
57d1d8058c
DOM-12
2013-08-29 10:04:39 -07:00
606f631559
Fixed up MK
2013-08-28 23:21:59 -07:00
7dbfe9d0dc
Moremissing stuff.
2013-08-29 16:20:36 +10:00
aad017690e
FIREFLY
2013-08-29 16:17:52 +10:00
a198d0d3cb
Added events...
2013-08-29 16:16:22 +10:00
8559e77a24
"UPDATES!"loooooooool
2013-08-29 16:13:05 +10:00
873c32c359
Added missing files.
2013-08-28 22:57:27 -07:00
b638957517
Removed more class files.
...
Fixed DOM-22, DOM-20, DOM-19, DOM-17, DOM-14, DOM-7, DOM-3, DOM-1
2013-08-28 22:26:40 -07:00
a1d622c790
Tweaked disguise movement to cut out jitters.
2013-08-28 15:00:39 -07:00
cb48c2a037
Test for git push.
2013-08-27 16:47:58 -07:00
1b7b549647
Removed class files from source control.
2013-08-27 16:21:57 -07:00
c9dd8d87eb
Fixed DOm crash issue on game start.
...
Added Teleport to Hub
Fixed DisguiseManager bleeding over.
Fixed Teleport sub commands
2013-08-27 16:03:04 -07:00
3fb52c5c71
Initial Commit
2013-08-27 08:14:08 -07:00
Jonathan Williams
Chiss