Commit Graph

8492 Commits

Author SHA1 Message Date
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