JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,504 Commits 1 Branch 0 Tags 481 MiB
65be5fcd99
Commit Graph

6279 Commits

Author SHA1 Message Date
Teddy
b0eb5a6d4e Cards Against Humanity, skipped/left blank 2016-01-18 10:34:43 +00:00
Teddy
56b3e482f2 Master Builders, added stats 2016-01-18 10:32:38 +00:00
Shaun Bennett
044d2bac83 Fix some Invisibility preference bugs 2016-01-17 22:55:04 -05:00
Shaun Bennett
2b6074a210 Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command' 2016-01-17 22:46:56 -05:00
Sarah
5ed9295944 updating Hub command as well 2016-01-17 18:10:16 +01:00
md_5
4927bb8c0b Fix some misc suspicious calls to Collection methods. 2016-01-17 20:20:48 +11:00
md_5
55c54eeff4 Fix ServerMonitor not actually removing ServerGroup instances. 2016-01-17 20:11:25 +11:00
Sarah
52bda30f85 Mysts OCD again...... 2016-01-17 03:03:00 +01:00
Sarah
4a5d6b5f2a Mysticates OCD.... 2016-01-17 02:48:15 +01:00
md_5
6cf08193df Fix small memory leak in Mineplexer. 
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
 2016-01-16 20:36:49 +11:00
Sarah
410bc1c74b not being able to disguise as banned/muted players 2016-01-15 19:12:50 +01:00
Teddy
c16a719be1 Bridges, added stats 2016-01-15 13:37:55 +00:00
Teddy
9cd7240b61 BouncyBalls, giving errors when Loading, skipping chat stats 2016-01-15 13:28:42 +00:00
Teddy
ec75169b70 BossBattles, giving errors when Loading, removed chat stats. 2016-01-15 13:07:21 +00:00
Teddy
3315a510dc Barbarians stats added + Block break stat tracker added 2016-01-15 13:01:26 +00:00
Teddy
6a3e9ac19f BaconBrawl stats added 2016-01-15 12:10:53 +00:00
Shaun Bennett
404e049c31 Give item fix for offline players 2016-01-14 08:06:27 -05:00
Mysticate
cf7f5af9ca Fixed who the winner is in MB Games. 2016-01-14 07:41:36 -05:00
Mysticate
2e433d8b06 Made sure that the active morph gets disabled on clear 2016-01-14 07:17:40 -05:00
Teddy
d33d682ebb Implementing stats for every game, got all stat names ready 2016-01-13 18:40:29 +00:00
Virizion
ee6425bbaf Removed extra blank lines. 2016-01-12 23:31:35 -05:00
Virizion
dfd5a63b78 More changes and fixes. 2016-01-12 23:29:08 -05:00
fooify
63897b9b54 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-12 20:05:34 -08:00
Virizion
528a7435e7 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2016-01-12 20:25:08 -05:00
Virizion
b27d5849d8 General fixes. 2016-01-12 20:23:25 -05:00
Teddy
f1314d5c26 JSON now handled by JsonMessage Builder 2016-01-12 13:25:47 +00:00
libraryaddict
b1c6af4d1a Update CB 2016-01-12 20:18:03 +13:00
NewGarbo
ed8d9459b2 goes with the commit below VVVV 2016-01-12 07:02:19 +00:00
NewGarbo
d3452772ed outposts work (grr git is weird trying to switch over to clans/beta) 2016-01-12 07:02:03 +00:00
NewGarbo
c873b6b886 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-12 06:58:53 +00:00
libraryaddict
c3e11e87ea Fix small issues with burning and ignition 2016-01-12 19:10:32 +13:00
libraryaddict
11da5a3fe1 Fix fire combusting and cancelled damage events 2016-01-12 18:56:48 +13:00
Shaun Bennett
4e9a4c87d4 Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop 
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
  fixing "Kicked for flying again" again...
 2016-01-11 17:20:51 -06:00
Shaun Bennett
3693a2b2c5 Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop 
* commit 'ed439569453dc248623834af6fb553341779e46c':
  Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
  Remove unused imports.
  Prevent players from stacking others with a menu inventory opened.
  Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
 2016-01-11 16:26:09 -06:00
Shaun Bennett
025b87c806 Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop 
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
  Muted players can't write on signs.
 2016-01-11 16:23:34 -06:00
Teddy
88c53bf464 Added default ChatStat for all games to prevent my server from dying when testing 2016-01-11 19:35:00 +00:00
NewGarbo
d656c7a212 fixed clans banned players counting as being online after joining and their territory then being blown up 2016-01-11 18:02:03 +00:00
Teddy
02ff8bdbdb Custom stats working, escaping bug fix and List reset bug 2016-01-11 12:59:57 +00:00
Teddy
40d913beaf Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour 2016-01-11 12:35:44 +00:00
Teddy
b9d44d9a24 not updating properly, fixed 2016-01-11 12:14:29 +00:00
Teddy
78eaee98df Typo mistake 2016-01-11 12:09:08 +00:00
Teddy
ec6e916c7b more stable, progress for making 'easier-to-use' 2016-01-11 12:06:30 +00:00
NewGarbo
3773ab3f0b fixed safelog npcs sticking around some time 2016-01-11 10:14:32 +00:00
NewGarbo
60a78e396f remove legendary announcement in chat/middle text 2016-01-11 09:16:11 +00:00
Shaun Bennett
6c055c31a0 Fix flashing through doors, Update to 0.18c 2016-01-10 20:39:56 -05:00
NewGarbo
d5b5ac7bb0 changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out 2016-01-10 23:06:39 +00:00
NewGarbo
d4ccb82791 didn't push this earlier 2016-01-10 23:03:16 +00:00
NewGarbo
6673081fb3 fixed LeechingAttribute from throwing an error when setting health above 20 2016-01-10 22:31:51 +00:00
NewGarbo
04c7f2c1f1 made pressure plates, buttons, and levers from working with block toss 2016-01-10 22:20:50 +00:00
NewGarbo
bccee71ff7 made signs placed by muted players get cleared on being placed 2016-01-10 21:16:49 +00:00
NewGarbo
734351011a made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading. 2016-01-10 21:15:50 +00:00
NewGarbo
9c3a62a308 made it so punished players can't place signs 2016-01-10 21:03:34 +00:00
NewGarbo
68808efb49 made players not be able to chat while chat is silenced 2016-01-10 20:57:12 +00:00
NewGarbo
fa3de2a479 made clans ban messages not public 2016-01-10 20:55:29 +00:00
NewGarbo
51872faa04 fix mutes not working 2016-01-10 20:53:55 +00:00
Mysticate
fa7eef5045 Muted players can't write on signs. 2016-01-10 13:13:38 -05:00
Teddy
5caeb8bee0 even nicer visual 2016-01-10 17:34:15 +00:00
Teddy
c814132b24 ratio's and nicer visuals 2016-01-10 17:33:18 +00:00
Teddy
83375a6883 stats not updating 2016-01-10 16:01:40 +00:00
Teddy
1bce624ab3 Finally got rid of MalformedJSON 2016-01-10 15:13:11 +00:00
Thanos paravantis
ed43956945 Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats. 2016-01-10 16:37:51 +02:00
Shaun Bennett
46695f8449 Fix hub fly for YOUTUBE_SMALL 2016-01-09 18:44:32 -05:00
Shaun Bennett
83e5c7399e Fix YOUTUBE_SMALL preferences 2016-01-09 18:41:19 -05:00
Shaun Bennett
8193b5121b Dont allow /disguise for YOUTUBE_SMALL 2016-01-09 18:39:47 -05:00
Shaun Bennett
cd3037e7e5 Fix treasure purchases 2016-01-09 18:37:24 -05:00
fooify
942460b471 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-09 13:05:44 -08:00
Teddy
263e1326cd JSON progress 2016-01-09 20:22:29 +00:00
NewGarbo
fa509f0043 fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP 2016-01-09 19:58:31 +00:00
Thanos paravantis
ce1bac8037 Remove unused imports. 2016-01-09 17:03:14 +02:00
Thanos paravantis
62e1fb3688 Prevent players from stacking others with a menu inventory opened. 2016-01-09 17:01:57 +02:00
Sarah
0f587ba5d9 fixing "Kicked for flying again" again... 2016-01-09 12:07:57 +01:00
Thanos paravantis
ba3e7cb197 Merge branch 'master' into bugfix/thanos 2016-01-09 12:23:54 +02:00
Shaun Bennett
2df626b35e Fix CustomDataManager crash 2016-01-08 18:06:33 -05:00
Shaun Bennett
511b39caa7 Merge branch 'master' into develop 2016-01-08 17:05:54 -05:00
Teddy
43fb04b482 Import clean up 2016-01-08 13:46:57 +00:00
Teddy
78405749a4 Changed TreasureShard rewarding, removed Queue 2016-01-08 13:46:39 +00:00
Shaun Bennett
ee73b374a6 Forgot to uncomment in ClansLoginManager 2016-01-08 06:36:59 -05:00
Shaun Bennett
a75e2c15b8 Merge remote-tracking branch 'origin/develop' into develop 2016-01-08 06:35:37 -05:00
Shaun Bennett
15109707f3 Merge pull request #119 in MIN/mineplex from clans/alpha to develop 
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
  Clans Alpha 0.18b fixes
 2016-01-08 05:34:35 -06:00
NewGarbo
025615d080 Clans Alpha 0.18b fixes 2016-01-08 11:24:36 +00:00
Sarah
5482d1dc40 Fixing "kicked for Flying" 2016-01-08 12:17:28 +01:00
Shaun Bennett
0a56a838d2 Fix ClansLoginManager, Remove pointless code in CoreClientManager 2016-01-08 05:45:49 -05:00
Shaun Bennett
6096fcad42 Fix hotbar issues 2016-01-08 04:06:11 -05:00
Shaun Bennett
504d9d508c Slightly reduce Squid's Ink Blast damage in SSM 2016-01-08 03:15:30 -05:00
Shaun Bennett
1d2f61db8c Disable purchasing Christmas Treasure 2016-01-08 03:15:05 -05:00
Shaun Bennett
d361ce948e Merge branch 'develop' into william-gladiators 
# Conflicts:
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
 2016-01-08 02:21:32 -05:00
Shaun Bennett
db7d814e02 Disable hub music 2016-01-08 01:42:05 -05:00
Shaun Bennett
19bb44cb9a Disable HolidayManager and HolidayGiftManager 2016-01-08 01:41:02 -05:00
Shaun Bennett
9c3b07123f Revert to normal HubType 2016-01-08 01:39:54 -05:00
Shaun Bennett
003af1b87c Disable Holiday Words in DMT and Build 2016-01-08 01:38:49 -05:00
Shaun Bennett
b6b455c1c0 Merge pull request #117 in MIN/mineplex from clans/alpha to develop 
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
  Added C.Mod rank, and started on rank info.
  changed outpost forcefields to be a bit larger to surround the outpost more.
  made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
  added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
  fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
  fixed outpost being built instantly on output block place.
  holograms above outpost block should be centered in the block and made them despawn on outpost death
  legendary pickkup message fix (FINALLY FIXED NOW )
  quick modification to outposts, and fixed the legendary announcements being weird
  updated clans version
  quikc change
  outpost changes, and some other things
  lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
  fixes (?)
  lots of changes that i can't remember at this point
  Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
  player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
  a couple more prettificatons to pvp timer messages.
  one more quick message change/fix
  qa changes to pvp safety
  ...
 2016-01-08 00:35:15 -06:00
NewGarbo
15d2118bc1 Added C.Mod rank, and started on rank info. 2016-01-07 23:32:51 +00:00
NewGarbo
e1e8c2bb97 changed outpost forcefields to be a bit larger to surround the outpost more. 2016-01-07 21:02:55 +00:00
NewGarbo
43f075014a made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request. 2016-01-07 20:05:33 +00:00
Teddy
6bf0970dbe Unused import removed 2016-01-07 19:52:04 +00:00
NewGarbo
fff6d8e03f added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. 2016-01-07 19:36:52 +00:00
NewGarbo
90a06d97b5 fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost) 2016-01-07 14:04:26 +00:00
NewGarbo
d4fdda8ef2 fixed outpost being built instantly on output block place. 
cleaned up a bit
 2016-01-07 14:03:15 +00:00
NewGarbo
5c810a46c9 holograms above outpost block should be centered in the block and made them despawn on outpost death 2016-01-07 13:26:18 +00:00
NewGarbo
e9789b2ee8 legendary pickkup message fix (FINALLY FIXED NOW ) 2016-01-07 10:31:23 +00:00
NewGarbo
d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
NewGarbo
b685a207bc quick modification to outposts, and fixed the legendary announcements being weird 2016-01-07 09:34:16 +00:00
NewGarbo
ef929b39b3 updated clans version 2016-01-06 22:38:45 +00:00
NewGarbo
76c0230805 quikc change 2016-01-06 22:35:09 +00:00
NewGarbo
52c4a55180 outpost changes, and some other things 2016-01-06 22:32:36 +00:00
libraryaddict
de6f6cf5f0 Add a IsLive check in Spleef 2016-01-07 08:49:26 +13:00
libraryaddict
c920d4efa1 Modify MapText to actually work, modify UtilText to save the images of characters 2016-01-07 04:48:44 +13:00
Teddy
99f0404fff Queue speed up 2016-01-05 21:05:02 +00:00
Teddy
e2824dd0e0 Debugs removed 2016-01-05 21:01:51 +00:00
Teddy
d4fd6a6bf7 Treasure not giving Shards when dupes occur, fixed. 2016-01-05 21:00:43 +00:00
Thanos paravantis
101caf12ff Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop. 2016-01-05 20:48:28 +02:00
Sarah
db2cddc443 Fixing Join/Quit messages 2016-01-05 19:10:40 +01:00
Teddy
d819671d16 Queue implemented for duplicate shard reward 2016-01-05 16:21:34 +00:00
Shaun Bennett
a73309fc11 Merge remote-tracking branch 'origin/develop' into develop 2016-01-04 18:14:10 -05:00
Shaun Bennett
f749300d48 Fix team stats not displaying properly 2016-01-04 18:13:54 -05:00
Shaun Bennett
10eb65a8d6 Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop 
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
  updating denial message
  Love you Sarah <3
  Fixing Disguise File
  update /Disguise for Hub as well
  updating /disguise
 2016-01-04 15:58:43 -06:00
Shaun Bennett
652084d071 Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop 
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
  Turf Wars: Include Teddy's border fix.
  Turf Wars: Undo bracket formatting.
  Turf Wars: Apply knockback on all players when there are only two in the match.
  Turf Wars: Add comment on block physics event.
  Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
 2016-01-04 15:56:32 -06:00
Shaun Bennett
962efe4a61 Fix not being able to join games through portals 2016-01-04 16:41:07 -05:00
Shaun Bennett
ed81411373 Fix carl bonus messages 2016-01-04 15:58:27 -05:00
Thanos paravantis
3770211e66 Turf Wars: Include Teddy's border fix. 2016-01-04 22:58:11 +02:00
Thanos paravantis
982e684a45 Turf Wars: Undo bracket formatting. 2016-01-04 21:42:58 +02:00
Shaun Bennett
c50fb52a88 Disable New Years Countdown 2016-01-04 14:21:21 -05:00
Shaun Bennett
c739ecc26d Fix forcefield for YOUTUBE_SMALL 2016-01-04 14:20:39 -05:00
Thanos paravantis
47c78bcba1 Turf Wars: Apply knockback on all players when there are only two in the match. 2016-01-04 17:19:40 +02:00
Thanos paravantis
f6ce98f65b Turf Wars: Add comment on block physics event. 2016-01-02 23:33:08 +02:00
Thanos paravantis
03c6395a30 Turf Wars: Fix sneaking near turf edge and wool placement near ladders. 2016-01-02 23:30:27 +02:00
AlexTheCoder
2b365e4afd - Fixed blacklisting to stop join spam 2016-01-02 14:35:05 -05:00
Sarah
dd6d7b1b96 updating denial message 2016-01-02 16:45:15 +01:00
NewGarbo
b47665e115 lots of work on outposts, 
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
 2016-01-02 14:02:50 +00:00
Morten
7e1b0b9110 Love you Sarah <3 2016-01-02 03:19:39 +01:00
Sarah
a06a0060aa Fixing Disguise File 2016-01-02 01:53:19 +01:00
Sarah
a30c2b0d75 update /Disguise for Hub as well 2016-01-02 00:53:56 +01:00
Shaun Bennett
2e017fa5ca Fix redis command 2015-12-31 16:11:51 -06:00
Shaun Bennett
8232d11cd1 Remove in game notifications, change sale message 2015-12-31 15:07:26 -06:00
Shaun Bennett
74eb04e5b4 Merge pull request #112 in MIN/mineplex from feature/new-year to develop 
* commit '6b3a5416643389a7bcac8df93f40f492452971e5':
  Accurate timings
  Small edits
  Flame
  Made it activate in all lobbies via command.
  Added a new years countdown to the hub.
 2015-12-31 14:51:49 -06:00
William Burns
6b3a541664 Accurate timings 2015-12-31 18:53:57 +00:00
Shaun Bennett
456b0dbeb7 Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop 
* commit 'f83016e0074ce810f727276a0feb127ecd69098f':
  Also really quickly fixed the Invisibility in lobby bug (hopefully)
  Removed a weird query :/
  Finished up the Unban feature...
  Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware
 2015-12-31 11:27:08 -06:00
Sarah
8ef1a524c1 updating /disguise 2015-12-31 12:01:24 +01:00
Mysticate
efbd1c52d2 Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter 2015-12-31 03:01:23 -05:00
Mysticate
5ff9d1985b Monitoring for josh + the mods 2015-12-31 03:00:40 -05:00
William Burns
637baed830 Small edits 2015-12-31 01:24:58 +00:00
William Burns
874695cdf6 Flame 2015-12-31 00:50:53 +00:00
William Burns
a64dc6a8d4 Made it activate in all lobbies via command. 2015-12-31 00:46:31 +00:00
William Burns
1b40cece80 Added a new years countdown to the hub. 2015-12-30 20:04:01 +00:00
AlexTheCoder
a4853e667c - Gameplay edits and disabling broadcaster code 2015-12-30 03:23:21 -05:00
William Burns
f1c7424939 Fixing hotbar 2015-12-29 15:19:09 +00:00
Shaun Bennett
55cdf4148a Merge branch 'develop' 2015-12-29 03:21:03 -06:00
Shaun Bennett
16ee74885e Add maintenance line 2015-12-29 02:52:53 -06:00
Shaun Bennett
7ad12d0a6b Show Host Rank in private servers 2015-12-29 00:50:20 -06:00
Shaun Bennett
7104f1363a Give YT rank access to extra preferences 2015-12-29 00:34:18 -06:00
fooify
fe337986bf Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-28 16:16:10 -08:00
Virizion
8a8d5b088b Switch to 7x7 builds. 2015-12-28 16:48:03 -05:00
Virizion
3d9a252868 Added auto pickup and fixed some stuff. 2015-12-27 15:26:43 -05:00
Virizion
162b3eb33f Stopped a bunch of block events. 2015-12-27 14:34:24 -05:00
Virizion
845014b677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-25 15:49:41 -05:00
Shaun Bennett
c680d91b56 Nerf TypeWars gems (again) 2015-12-25 03:12:04 -06:00
Shaun Bennett
dd8e91e463 Update MOTD 2015-12-25 03:03:53 -06:00
Shaun Bennett
25d36b546a Remove unnecessary files 2015-12-25 01:53:00 -06:00
Shaun Bennett
d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
fooify
41f56e9853 Lots of typo fixes and such 2015-12-24 11:13:54 -08:00
fooify
b356bce177 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-24 11:09:08 -08:00
Virizion
b0f8edb0f9 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-23 18:25:52 -05:00
NewGarbo
aa50c4762f fixes (?) 2015-12-23 18:55:44 +00:00
libraryaddict
1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
libraryaddict
000b1f85b7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-24 07:41:55 +13:00
libraryaddict
67bdc6832f Tentative beginnings for clans resource packs 2015-12-24 07:40:49 +13:00
NewGarbo
369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
 2015-12-23 18:31:51 +00:00
NewGarbo
ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
William Burns
08b5e7b4db Working loadouts. 2015-12-23 09:21:43 +00:00
Morten
f83016e007 Also really quickly fixed the Invisibility in lobby bug (hopefully) 2015-12-23 00:39:16 +01:00
Morten
8c399f03da Removed a weird query :/ 
Status: Finished
 2015-12-22 21:36:19 +01:00
Morten
9336eb19fa Finished up the Unban feature... 2015-12-22 21:31:57 +01:00
fooify
0ac2158988 i before e! 2015-12-22 11:02:57 -08:00
fooify
255dd0bdb3 fixed cosmetic menu item dropping bug 2015-12-22 11:02:37 -08:00
fooify
592fcbd282 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-22 10:55:11 -08:00
fooify
a8d9956846 more grammatical errors hast been fixed 2015-12-22 10:35:20 -08:00
Virizion
0322ae1217 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-12-22 00:02:21 -05:00
William Burns
b255c58653 Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-21 21:56:08 +00:00
Shaun Bennett
2ccd7a5de0 Fix Type Wars stat icon 2015-12-21 13:20:04 -05:00
Shaun Bennett
7a72762c78 Update MOTD 2015-12-21 12:56:37 -05:00
Shaun Bennett
c63014b51f Type-Wars merge 2015-12-21 12:49:10 -05:00
Sarah
a5436d63c0 Updating Holiday Achievements 2015-12-21 18:45:26 +01:00
Sarah
7c66bdbbde Updating Stats GUI 2015-12-21 18:25:44 +01:00
Sarah
010b1b0a5d Achievements.... 2015-12-21 18:08:11 +01:00
Sarah
6e3274ff2f changing Category 2015-12-21 18:06:00 +01:00
Sarah
f15c318e5c adding PM message. 2015-12-21 18:02:25 +01:00
Sarah
082b5e156c fixing Kit NPEs 2015-12-21 17:48:17 +01:00
Sarah
ff5761cc1d Fixing ending Stats. 2015-12-21 17:44:15 +01:00
Sarah
590da2128c Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-12-21 17:43:51 +01:00
Morten
1726aa2530 Added a feature to unban clients across the network 
But there still a bug when you type a username of a none registered member.
Will fix ASAP - likely after Mineware
 2015-12-21 12:58:19 +01:00
Shaun Bennett
5469289d82 Wrong iterator! 2015-12-21 06:57:56 -05:00
Shaun Bennett
fae2a5d2bf Update game display 2015-12-21 04:40:30 -05:00
Shaun Bennett
a235103066 Merge pull request #106 in MIN/mineplex from update-menu to develop 
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
  Adjust GUI, fix beta button
  Yo shaun debug this m8 ty
 2015-12-21 03:36:46 -06:00
Shaun Bennett
f4050fb1ff Adjust GUI, fix beta button 2015-12-21 04:35:57 -05:00
Shaun Bennett
99285b2ac8 Merge remote-tracking branch 'remotes/origin/type-wars' into develop 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-12-21 03:50:55 -05:00
Mysticate
0f5be6444b Yo shaun debug this m8 ty 2015-12-21 02:23:59 -05:00
Sarah
816da0f633 Fixing Gems 2015-12-20 12:00:32 +01:00
fooify
fe658b30a1 Grammatical errors hath been fixed! 2015-12-19 15:03:42 -08:00
Sarah
f1188529f2 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 13:09:26 +01:00
Sarah
c56cd0d56e adjusting some timings 2015-12-19 13:08:53 +01:00
Sarah
35966d88cf Fixing Tutorial Minion 2015-12-19 13:05:39 +01:00
Sarah
7327d9463f Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 13:00:49 +01:00
Sarah
8a54388480 fixing last commit 2015-12-19 13:00:12 +01:00
Sarah
32a0dd6668 adding Tutorial notification 2015-12-19 12:59:37 +01:00
Sarah
152e759c10 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 12:56:05 +01:00
Sarah
7cb002ca86 Adding Tutorial notification 2015-12-19 12:55:28 +01:00
Sarah
f8bffc9f88 nuke delay and Stats 2015-12-19 12:45:06 +01:00
Virizion
c0ab31fdac Finished up fixes. 2015-12-19 00:19:50 -05:00
AlexTheCoder
66c9fa122c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-18 21:33:59 -05:00
AlexTheCoder
09528a9262 - Initial broadcast stuff 2015-12-18 21:33:40 -05:00
Virizion
a5c18f4677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-18 20:05:03 -05:00
Sarah
b3afa0094e Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes 2015-12-19 00:59:15 +01:00
Sarah
dab2416ccd Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 00:49:16 +01:00
Sarah
6c5e3d7509 Fixing visibility. 2015-12-19 00:48:42 +01:00
William Burns
c2e88c2794 Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data 2015-12-18 18:16:32 +00:00
William Burns
13cfc0e12a Updated to a better check 2015-12-18 18:16:20 +00:00
William Burns
f57304764c Added a hotbar layout editor 2015-12-18 15:16:00 +00:00
NewGarbo
1840572c49 Lots of changes, specifics: 
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
 2015-12-18 11:13:38 +00:00
Shaun Bennett
298ea1e5e6 Merge pull request #101 in MIN/mineplex from update-paintball to develop 
* commit 'd561915fd32885036b55cc6a05899934a544e131':
  FORMATTING CHANG EI'M GOING TO CRY UGH
  DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
  Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.
  Epic chnage that saved the day omg
  Die player cache
  Quick changes to improve things.
  Uncommented bouncy balls
  Final tweaks to random armorstand
  Quick thing before merge
  Worked on double.
  Switching branches
  Formatting
  Reformatted
  Fixed paintball to the max. :>>
  Class
  Switching branches c:
  Sniper work
  Work. Deemed unsuitable due to an issue with the paintballs flying wide.
  Added a sniper kit! :D
 2015-12-17 23:32:22 -06:00
Shaun Bennett
f80648bfbc Update DBPool to load from file 2015-12-18 00:32:07 -05:00
Mysticate
d561915fd3 FORMATTING CHANG EI'M GOING TO CRY UGH 2015-12-17 23:16:57 -05:00
Mysticate
2bf734a15c DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D 2015-12-17 23:08:07 -05:00
Shaun Bennett
2c09fd969b Attempt at fixing spectator page 2015-12-17 22:24:44 -05:00
Virizion
806b656dcf Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-17 21:56:01 -05:00
Shaun Bennett
53f9a051c5 Fix spectator page sorting team list 2015-12-17 21:52:34 -05:00
Virizion
7621fe793d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-17 21:50:32 -05:00
Virizion
5f506e3810 Moved team generation. 2015-12-17 21:49:15 -05:00
Mysticate
066d0a861f Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-17 21:00:15 -05:00
NewGarbo
4bf7e15055 player gold exploit checking. i know this code is strange but please don't delete it. we need it for now. 2015-12-18 01:05:02 +00:00
Jonathan Williams
c2fb6e6c15 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-17 18:34:25 -05:00
Jonathan Williams
2953fe395f Changed dns api key to new key. 
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
 2015-12-17 18:33:49 -05:00
William Burns
e7243d4b9c Re-add getArcadePlayer(Player player) 2015-12-17 22:19:45 +00:00
William Burns
3e8c3cb928 Changed to setData in PlayerCustomData 2015-12-17 22:16:05 +00:00
William Burns
2ac28c4fd5 Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-12-17 21:44:31 +00:00
William Burns
5c045bfce4 Changes to core client manager, and finishing custom data! 2015-12-17 21:27:44 +00:00
libraryaddict
7f188072ad Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-18 10:03:41 +13:00
libraryaddict
66372c397b First version of ResourcePackManager that handles all resource packs globally 2015-12-18 10:03:03 +13:00
William Burns
7d9b97180d Testing ArcadePlayer implementation 2015-12-17 01:48:55 +00:00
Mysticate
d28c2be1c3 Epic chnage that saved the day omg 2015-12-16 20:26:04 -05:00
NewGarbo
b4c3ce9fba a couple more prettificatons to pvp timer messages. 2015-12-16 23:19:04 +00:00
NewGarbo
eb9ba92fb1 one more quick message change/fix 2015-12-16 22:53:24 +00:00
NewGarbo
2ee1ccbcf9 qa changes to pvp safety 2015-12-16 22:48:55 +00:00
William Burns
ee202bc7f5 Add MineplexPlayer -> ArcadePlayer 2015-12-16 22:32:34 +00:00
William Burns
4077aa808f Add to Arcade and Hub 2015-12-16 22:01:51 +00:00
William Burns
370c59ce75 Added custom data 2015-12-16 21:52:41 +00:00
NewGarbo
d619a9644b few changes to pvp timer, and fixed bugs etc 2015-12-16 18:25:30 +00:00
Sarah
4e9e0243cd Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-16 18:16:08 +01:00
William Burns
baf0f254bb Custom data, waiting for JLO 2015-12-16 14:41:57 +00:00
Virizion
628ee8a137 Some small fixes. 2015-12-16 00:02:21 -05:00
Virizion
7fa1963268 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-15 23:06:13 -05:00
Mysticate
d16dd4a9d2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:35:55 -05:00
Mysticate
4566577c68 Die player cache 2015-12-15 19:26:09 -05:00
Mysticate
b36bf37197 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:22:38 -05:00
NewGarbo
7ac1fd86b4 made pvp timer players immune to skills 2015-12-15 21:12:49 +00:00
NewGarbo
baef84f4d9 fixed pvp timer subtitles bugged out 2015-12-15 20:09:54 +00:00
Shaun Bennett
211e440e67 Merge remote-tracking branch 'remotes/origin/master' into develop 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
 2015-12-15 15:00:14 -05:00
Shaun Bennett
aef704d972 Slight winter reward rarity changes 2015-12-15 14:58:09 -05:00
Shaun Bennett
5f14d6675f Fix shard values 2015-12-15 14:56:19 -05:00
Shaun Bennett
07f610d4bd More Fixes 2015-12-15 14:45:12 -05:00
Shaun Bennett
607c164753 Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop 2015-12-15 13:55:01 -05:00
Shaun Bennett
92b82d786b Don't give Winter Holiday Chests to offline players 2015-12-15 13:34:47 -05:00
Shaun Bennett
b9a688c4e7 Update monthly bonuses 2015-12-15 13:07:49 -05:00
Shaun Bennett
e3e757da8a Fix mounts owned count 2015-12-15 13:06:11 -05:00
Shaun Bennett
3edba0fac6 Fix Grinch Hat 2015-12-15 12:28:06 -05:00
Shaun Bennett
f2107b7b79 Merge remote-tracking branch 'origin/develop' into develop 2015-12-15 12:07:40 -05:00
Shaun Bennett
2216fdc52c Dont disable new gadgets in games 2015-12-15 12:07:34 -05:00
Sarah
40ae7743c6 reverting last "fix" 2015-12-15 14:20:21 +01:00
NewGarbo
6a346790f7 disable tutorial 2015-12-15 12:00:56 +00:00
NewGarbo
1da04b84b5 test push (change version to 0.17d) 2015-12-15 11:57:33 +00:00
NewGarbo
c63bac6433 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-15 11:42:16 +00:00
libraryaddict
47ad563596 Spawn nametags far far away from players 2015-12-15 22:46:30 +13:00
AlexTheCoder
6c1c40a972 - Fixed command bugs 2015-12-15 02:25:16 -05:00
AlexTheCoder
02f6a14f07 - Game commands 2015-12-15 02:06:59 -05:00
Sarah
cf58fdee4a trying to fix the spigot Chat spam thingy. 2015-12-15 05:29:59 +01:00
Cheese
871c97f7af changed chest %'s 2015-12-15 09:25:44 +11:00
Sarah
afa45c47ca Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial 2015-12-14 14:23:42 +01:00
NewGarbo
9137fcfe40 loads of changes (pvp timer, unsafe stuff) 2015-12-14 12:39:00 +00:00
AlexTheCoder
73c84c530e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-14 06:40:16 -05:00
AlexTheCoder
ee63332062 - Moved setting changes 2015-12-14 06:39:35 -05:00
Cheese
0f38c7b287 increased minimum coal 2015-12-14 22:12:50 +11:00
Cheese
951cd65903 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 22:05:22 +11:00
Cheese
045bc760c2 increassed cooldown, people getting trapped perm 2015-12-14 22:05:08 +11:00
Cheese
809ff649be lowered rarities a bit 2015-12-14 22:03:09 +11:00
Shaun Bennett
7181a26e58 Remove pointless equals() 2015-12-14 05:56:39 -05:00
Cheese
9e72e5adf1 nicer text 2015-12-14 21:43:11 +11:00
Cheese
daa9f165b1 removed coins from gadgets 2015-12-14 21:41:47 +11:00
Cheese
52394c89dd fixed skins beign wrong way around 2015-12-14 21:34:27 +11:00
Cheese
0ecd5a05f5 fixed hat ownership 
reduced coal cost
 2015-12-14 21:32:06 +11:00
Cheese
00de6880ba fixed wrong types 2015-12-14 21:25:30 +11:00
Cheese
342e9f2345 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 20:53:49 +11:00
Cheese
1189535748 icon fixes 2015-12-14 20:53:34 +11:00
Shaun Bennett
816c057eb3 Notify server about opening chest 2015-12-14 04:49:44 -05:00
Shaun Bennett
6ec8ec4c01 Merge pull request #97 in MIN/mineplex from william-gladiators to master 
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
  Another door bug, and a title fix.
  Health looks nicer.
  Bug fixes. Title shortened.
 2015-12-14 03:45:55 -06:00
Shaun Bennett
daf1d29ce0 Fix Carl 2015-12-14 04:44:11 -05:00
Shaun Bennett
50bf97ae4a Fancy treasure changes 2015-12-14 04:19:15 -05:00
Cheese
670eaa1954 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:16:03 +11:00
Shaun Bennett
e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Cheese
288c20fc74 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:13:05 +11:00
Cheese
9e35399d1d rarities tweaked + shards 2015-12-14 19:09:55 +11:00
Shaun Bennett
db9db558a0 Update GUI slots 2015-12-14 02:56:07 -05:00
Shaun Bennett
4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Cheese
c508b5ea96 chest visuals 2015-12-14 18:13:19 +11:00
Shaun Bennett
063c87c4fe Merge remote-tracking branch 'origin/master' 2015-12-14 00:29:11 -05:00
Shaun Bennett
cdbcae7e3e Cosmetic Menu Update 2015-12-14 00:28:28 -05:00
Cheese
048a9a81b8 gadget ammo should no logner be purchasable 2015-12-14 16:20:39 +11:00
Virizion
93c13d138d Remove some debug stuff I forgot to remove. 2015-12-14 00:10:45 -05:00
Virizion
09643d3e61 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:08:32 -05:00
Cheese
7f9e5c4ec9 more coal 2015-12-14 16:06:49 +11:00
Cheese
f6f04fe256 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 16:04:05 +11:00
Cheese
55fffdad59 fixed some colors 2015-12-14 16:03:51 +11:00
Virizion
b3b41e453b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:01:41 -05:00
Virizion
d8f44434ff Fixed a bunch of bugs. Still need to fix clicking compass ending game. 2015-12-14 00:00:40 -05:00
Shaun Bennett
e8b0e5dd8e Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
Shaun Bennett
8e31c79c58 Merge remote-tracking branch 'origin/master' 2015-12-13 23:46:46 -05:00
Cheese
bccade55bc reduced coal fumes size 2015-12-14 15:43:45 +11:00
Shaun Bennett
5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Cheese
f26c31b7ec xmas a little harder 2015-12-14 15:33:09 +11:00
Shaun Bennett
fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
Cheese
1073981778 Merge branch 'master' into update-xmaschaos 2015-12-14 15:30:15 +11:00
Cheese
94169a5b8a it made me push it :( 2015-12-14 15:29:34 +11:00
Cheese
c34ac3ec52 xmas 2015-12-14 15:21:43 +11:00
Jonathan Williams
dcf3c1ea88 Deleted and added new Cache since renaming was jacked up. 2015-12-13 23:14:17 -05:00
Mysticate
42244ae798 Snowman AI fix 2015-12-13 22:43:11 -05:00
Mysticate
a04eaddc42 Fixed bump 2015-12-13 22:25:18 -05:00
libraryaddict
f90484c37f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-14 15:43:03 +13:00
libraryaddict
b5bdf7ced4 Remove custom name on players on join and arcade spectator 2015-12-14 15:42:32 +13:00
Virizion
54911bb213 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-13 19:54:57 -05:00
Virizion
12eba41975 Fixed corner stairs. 2015-12-13 19:52:32 -05:00
Mysticate
0dd7db27cd FIXED FORAMTTING 2015-12-13 19:49:41 -05:00
Mysticate
a827f95eb4 Fixed scoreboard. VIVA LA FIESTA 2015-12-13 19:24:24 -05:00
Mysticate
0e9e8c155f Quick fix that I don't think i caused. 2015-12-13 19:11:06 -05:00
Mysticate
0c383f8bf4 Remove bad message 2015-12-13 18:58:03 -05:00
Mysticate
90145bf8e7 Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos

Conflicts:
	Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
 2015-12-13 18:57:35 -05:00
Mysticate
35ab40727b XMAS UPDATE OMG :O 2015-12-13 18:55:21 -05:00
xGamingDudex
64fb2b11d8 Added fake skin data 
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
 2015-12-13 23:09:25 +01:00
William Burns
d91e4ab4f7 Another door bug, and a title fix. 2015-12-13 20:27:37 +00:00
Shaun Bennett
677e95a7fd Update IntellIJ grouping 2015-12-13 14:05:28 -05:00
Sarah
63f5794c79 Only fix Giant facings is prepare Phase 2015-12-13 14:31:21 +01:00
William Burns
e31124e212 Health looks nicer. 2015-12-13 13:29:46 +00:00
William Burns
4fad564e15 Bug fixes. Title shortened. 2015-12-13 12:50:06 +00:00
Cheese
b095fa9efe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-13 21:15:32 +11:00
Cheese
011a194dc6 fixed exploit 2015-12-13 21:14:57 +11:00
Virizion
8bcc36adb1 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-13 01:39:42 -05:00
Virizion
ec86cad7ee Changed descriptions. 2015-12-13 01:38:38 -05:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
libraryaddict
9058428484 Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage 2015-12-13 16:40:46 +13:00
Sarah
a92361f2fe some more descriptions for Tutorials 2015-12-12 20:03:35 +01:00
AlexTheCoder
cf05cf5d7b - All finished 
- Added method for disabling explosion manager miniplugin
 2015-12-12 05:12:17 -05:00
AlexTheCoder
1535e167cd - Inventory enum fix 2015-12-12 02:36:01 -05:00
AlexTheCoder
49186680f0 - Game ID conflict resolution 2015-12-12 00:31:13 -05:00