JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
535 Commits 1 Branch 0 Tags 481 MiB
79de7f2bfc
Commit Graph

520 Commits

Author SHA1 Message Date
Chiss
dc062c7bb6 H&S Push 2013-11-07 19:49:21 +11:00
Jonathan Williams
79b739fc14 Project for servermonitor 2013-11-07 00:22:42 -08:00
Jonathan Williams
7cc880afd1 ServerMonitor tweaks. 2013-11-07 00:22:04 -08:00
Chiss
8fa7b9f283 Helpers can use WARNINGS 2013-11-07 17:03:34 +11:00
Jonathan Williams
e27f01e916 Fixed punish constructor bugs for dom/mk 2013-11-06 21:36:00 -08:00
Jonathan Williams
079a58d2cd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 20:38:41 -08:00
Jonathan Williams
f8567dcfa6 Fix for scoreboard uppercase issue in hub. 2013-11-06 20:38:33 -08:00
Chiss
8e7b5ac6fe Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 15:26:37 +11:00
Chiss
6b577af7b4 Punish Update 
H&S Additions
 2013-11-07 15:25:46 +11:00
Jonathan Williams
49e796c39d Fixed Game.Core build issue. 
Cleaned up a lot.

Added missing files for Mineplexer
 2013-11-06 20:19:56 -08:00
Jonathan Williams
e0d10f6550 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 19:48:27 -08:00
Jonathan Williams
41e9ffb018 Removed BungeeSigns 
Updated Bungee plugin to pull US servers only.
Added dynamic MOTD from mysql for BungeeCord.jar

Fixed crash for disguise block arm animation.
 2013-11-06 19:48:00 -08:00
Chiss
0d5b174ebe Stacker/Party exceptions for YouTubers 2013-11-07 10:33:39 +11:00
Chiss
9f11352f10 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 10:19:30 +11:00
Chiss
03731de7f8 Rank changes 
MAC no longer kicks lag/fly
some H&S stuff :O
 2013-11-07 10:18:36 +11:00
Jonathan Williams
70dae64389 added missing file. 2013-11-06 10:26:33 -08:00
Jonathan Williams
0a50d9b127 ServerMonitor files. 2013-11-06 09:14:08 -08:00
Jonathan Williams
9327e71519 MOre work on dynamic server baby! 2013-11-06 01:03:02 -08:00
Jonathan Williams
ff6488b371 safe file separators 2013-11-05 16:10:14 -08:00
Jonathan Williams
43d5b6441b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-05 10:19:17 -08:00
Jonathan Williams
2064c58d1b Fixed up ServerStatusRepository to insert into specific columns 
Fixed Dominate shop.

Some work on Server Monitor
 2013-11-05 10:19:04 -08:00
Chiss
bcb86fc911 PB gem for healing remove 2013-11-04 09:46:09 +11:00
Chiss
e14bc76639 arcade map directory up up right left down up right update! 
some paintball fixes
H&S start
 2013-11-04 08:59:29 +11:00
Jonathan Williams
6999d7979f Added paintball to LobbyMenu 
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
 2013-11-02 12:26:28 -07:00
Jonathan Williams
a468ac1ae0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-02 00:59:39 -07:00
Jonathan Williams
b9560cf4da Work on Dynamic server monitor. 2013-11-02 00:56:31 -07:00
Chiss
1545873f62 news feed for hub 2013-11-02 18:56:21 +11:00
Chiss
0cbefc1280 Paintball update! 2013-11-02 15:42:37 +11:00
Chiss
24723cd5e5 paintball update 2013-11-02 10:09:07 +11:00
Chiss
c72f1337e8 fixed memory leak in antihack 2013-11-01 10:40:33 +11:00
Chiss
08497e474d mobs no longer move as soon as they spawn. GET IN LINE BOYS! 2013-11-01 08:34:32 +11:00
Chiss
7dcd58ec2d HH debug prints 2013-11-01 08:27:45 +11:00
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
Chiss
8958b8998f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-26 11:35:02 +11:00
Chiss
a52bd69558 Witch SSM 2013-10-26 11:34:05 +11:00
Jonathan Williams
5470f847a9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 19:06:43 -05:00
Jonathan Williams
8883855297 Added witch disguise 
Added missing files.
 2013-10-25 19:05:26 -05:00
Chiss
49e8c15f44 important update 2013-10-25 22:56:28 +11:00
Chiss
e8ddfc266e fsd6gty72 tjn6g wgh 2013-10-25 22:20:46 +11:00
Chiss
61b7a86b67 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-25 21:25:36 +11:00
Chiss
b74b8e3915 Halloween event changes 2013-10-25 21:25:23 +11:00
Jonathan Williams
e5f99331dd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 05:16:15 -05:00
Jonathan Williams
c3754d766b Added in vegetate check for EntityGhast. 2013-10-25 05:15:17 -05:00
Chiss
5563d94111 Halloween event update 
hub News
hub mounts
hub gadgets
 2013-10-25 19:20:14 +11:00
Jonathan Williams
21128eb153 Prepping filterChat and CoreClientManager for mysql 
Removed get all clients at server start.
 2013-10-23 16:36:13 -05:00
Chiss
1977572ced Added Halloween Minigame 
Updated gadgets and other minor things.
 2013-10-22 15:46:31 +11:00
Chiss
7cec55713c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-19 16:52:27 +11:00
Chiss
1944c0003c Hub gadgets 2013-10-19 16:52:15 +11:00
Jonathan Williams
985ce795d2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-18 00:50:49 -07:00
Jonathan Williams
90fbc397ff Converted gem rewards to boolean return from website. 
Implemented gem transactions and source.
 2013-10-18 00:46:06 -07:00
Chiss
02258b9fd3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-18 09:12:19 +11:00
Chiss
882ede9a21 tp ah exception 2013-10-18 09:09:29 +11:00
Jonathan Williams
7e77f78d2f Removed all client list pull. 2013-10-17 00:54:14 -07:00
Jonathan Williams
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
Jonathan Williams
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
Chiss
410e08b06a Clearer MAC reporting to staff 2013-10-17 09:05:03 +11:00
Chiss
4d6a0e2133 Ah no kick 2013-10-17 09:02:52 +11:00
Chiss
d9ecbf4037 AH Update 2013-10-17 09:01:36 +11:00
Chiss
d23f72567a fixed bug. 2013-10-16 17:22:28 +11:00
Chiss
9cdcbed086 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 12:24:02 +11:00
Chiss
2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Jonathan Williams
483f8ffde3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-15 14:20:45 -07:00
Jonathan Williams
9569c3906e Starting work on dynamic server. 2013-10-15 14:19:14 -07:00
Jonathan Williams
1a5f6a9b74 Coreclient fix. 2013-10-15 14:18:13 -07:00
Chiss
40e49dd3d4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 08:11:04 +11:00
Chiss
ec80d8a568 added AntiHack 
added dragonrider coolness
 2013-10-16 08:10:45 +11:00
Jonathan Williams
c68bfce21a Fix for null pointer in core client cleanup 2013-10-14 12:20:49 -07:00
Jonathan Williams
922d269a52 Added core client cleanup in case of weird glitch from bungee 2013-10-13 22:40:06 -07:00
Jonathan Williams
1cdb89f4bf Derp, missing arcade. 2013-10-13 21:51:38 -07:00
Jonathan Williams
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
Chiss
230ad4aa7b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-14 10:29:48 +11:00
Chiss
9ffc793f61 added Dragon Rider 
anti-stack changes (dont anti-stack mined blocks)
 2013-10-14 10:29:20 +11:00
Jonathan Williams
6dee9c983f Increased interval between sending restart commands from server monitor. 2013-10-13 02:25:17 -07:00
Jonathan Williams
1c1fb056a6 Memory leak fix for explosion blocks. 2013-10-13 01:27:41 -07:00
Jonathan Williams
25dec6fb46 Fixed player arm animation bug. 
Added EnderDragon AI control and vegetation
 2013-10-12 20:31:43 -07:00
Chiss
36b825d36d Snake update (woo) 2013-10-13 10:33:16 +11:00
Chiss
d784a0b017 snake speed ramp up decrease 2013-10-13 09:38:03 +11:00
Chiss
a34b6da238 even less blocks 2013-10-13 09:20:00 +11:00
Chiss
bb39f18573 Explosion creates less blocks. 2013-10-13 09:18:49 +11:00
Chiss
e12477c4b6 snake max speed decrease 2013-10-13 08:46:02 +11:00
Chiss
1fd894934a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-13 08:43:06 +11:00
Chiss
377f4b0680 Gem fix, now correctly displays scaled gems. 
UHC public changes
Snake fixes.
 2013-10-13 08:42:49 +11:00
Jonathan Williams
c5385ee7dc Fixed ultra join in arcade manager. 2013-10-12 02:53:22 -07:00
Jonathan Williams
e723075298 Increased lobby menu size. 
Fixed memory leak in Explosion
 2013-10-12 02:52:35 -07:00
Jonathan Williams
03c74aa419 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-12 01:55:52 -07:00
Jonathan Williams
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
Chiss
c8386bbc40 blue kit for snake 2013-10-12 18:22:20 +11:00
Chiss
a315064a3f snake fix 
parkour radius increase
 2013-10-12 18:21:19 +11:00
Chiss
0564bd740a SSM wolf balance 2013-10-12 17:17:24 +11:00
Chiss
4eecca3063 Wolf fixes 2013-10-12 17:13:28 +11:00
Chiss
8766767d96 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 16:59:38 +11:00
Chiss
27fb3b4262 Snake changes 
SSM Wolf fixes
 2013-10-12 16:59:23 +11:00
Jonathan Williams
f2c295c391 Fixed global ultra joining full games. 2013-10-11 22:03:17 -07:00
Chiss
0b2dcc2617 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 09:34:59 +11:00
Chiss
8376316994 Added Paintball 
Added SSM Kit: Wolf
UPDATES.
 2013-10-12 09:34:46 +11:00
Jonathan Williams
923a066013 Added ServerMonitor 2013-10-10 09:02:21 -07:00
Jonathan Williams
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
Chiss
ed804e3336 Dragon escape update 2013-10-09 21:50:39 +11:00
Jonathan Williams
ca4760a7d6 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-10-08 02:22:29 -07:00
Jonathan Williams
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
Chiss
1fc446ae13 Lobby text now displays map 2013-10-08 17:56:57 +11:00
Chiss
b64803e499 Smash Wolf 2013-10-08 17:44:04 +11:00
Chiss
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
Jonathan Williams
c9af91fcd6 Tweak on lobby to show number instead of player count in item. 2013-10-05 01:49:55 -07:00
Jonathan Williams
1431961b39 Fixed issues with Pet menu. 
Fixed typo in Welcome Tutorial
 2013-10-05 00:59:45 -07:00
Jonathan Williams
f389378bd2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-10-04 23:57:58 -07:00
Jonathan Williams
4ed1d97a33 Added missing pet buttons. 2013-10-04 23:56:16 -07:00
Jonathan Williams
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
Chiss
ab45c717dd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-10-05 07:49:21 +10:00
Chiss
3ba848567c paintball added 
hg additions
minor changes to other games
 2013-10-05 07:49:05 +10:00
Jonathan Williams
57b0d06786 Added DisguiseWolf 
Added lobby menu (disabled autogive for testing)
Removed unused commands.
 2013-10-02 22:23:01 -07:00
Jonathan Williams
44da981cf4 Fixed dominate bug again. 
Fixed quick game menu bug.
 2013-09-27 23:06:53 -07:00
Jonathan Williams
86199d2795 Fix for dominate. 2013-09-27 20:05:30 -07:00
Jonathan Williams
f9400a0eb4 Fixed multiple finishes for parkours 2013-09-27 12:45:24 -07:00
Jonathan Williams
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
Chiss
894a121a2e Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-27 17:08:52 +10:00
Chiss
34521eef8f minor game fixes 
portal method in StackerManager.java
 2013-09-27 17:08:32 +10:00
Jonathan Williams
7c0e3bcc53 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-26 21:20:38 -07:00
Jonathan Williams
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
Chiss
2a3d7426d5 Some scoreboard fixes 2013-09-26 12:38:32 +10:00
Chiss
f0e6a7294e squid hitbox larger 2013-09-24 09:18:36 +10:00
Chiss
0390d4f63b desc update suqid 2013-09-24 08:56:51 +10:00
Chiss
064dd97d00 HitBox support for disguises 
Squid hitbox added
Changed squid swimming!
 2013-09-24 08:56:09 +10:00
Chiss
ea5cc7161a pigssss 2013-09-24 08:19:07 +10:00
Chiss
d8d4b69dda baby pig to pig 2013-09-24 08:15:48 +10:00
Chiss
82f5fcb963 Pig Fix! 2013-09-24 08:12:51 +10:00
Jonathan Williams
68e068092f Fix for ageable. 2013-09-23 15:09:52 -07:00
Jonathan Williams
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
Jonathan Williams
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
Chiss
d4775a91a1 hitbox reduction 2013-09-23 17:45:14 +10:00
Chiss
0f9f28dcc2 fixed weapon names in pigs, + baby pig on platform 2013-09-23 17:36:53 +10:00
Chiss
5ba494c381 Made player names more visible in squid 2013-09-23 16:05:05 +10:00
Chiss
ce89108aea Fixed disguises in bacon brawl 2013-09-23 16:00:35 +10:00
Chiss
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
Chiss
bf4dc35b5f Added pig Game 
added squid game
added recharged skill event
 2013-09-23 15:48:35 +10:00
Jonathan Williams
8aad215475 Added sheep color/shear for disguise 2013-09-22 21:12:08 -07:00
Jonathan Williams
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
Jonathan Williams
cc63fdccfc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-21 15:02:14 -07:00
Jonathan Williams
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
Chiss
b3a78112be Fixed gem display bug 2013-09-21 13:53:12 +10:00
Chiss
eb6bbceecd Slowed hunger degen a little, increased regen to damage dealt. 2013-09-21 13:40:04 +10:00
Chiss
9064272a38 Prepared SSM for 200 player Game (added hunger) 2013-09-21 13:34:14 +10:00
Chiss
9da18ea43f Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-21 08:34:24 +10:00
Chiss
a92c74a28a HG Updates 
Other minor fixes
 2013-09-21 08:34:07 +10:00
Jonathan Williams
85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Jonathan Williams
3622808e09 Fix for task cancelling. 2013-09-19 02:39:53 -07:00
Jonathan Williams
d2ab872856 Added some code for Global bungee communication. 
Fixed up LobbyBalancer
 2013-09-19 00:05:23 -07:00
Jonathan Williams
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
Jonathan Williams
7d31b24c75 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-18 05:20:58 -07:00
Jonathan Williams
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
Chiss
91ce36d6e4 Hub refactor 
Hub parkour module
 2013-09-18 19:46:45 +10:00