41b40fa12c
Fix painting breaking.
2016-08-25 03:54:10 -05:00
77e0090531
Tweak preferences
2016-08-25 00:17:31 -05:00
1654850e8c
Final Changes
2016-08-24 22:26:38 -05:00
ba2bee4f25
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:29:01 -05:00
bca19788db
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:28:36 -05:00
df1fc60d3d
Merge branch 'update/skywars-finalised' into develop
2016-08-24 17:12:58 -05:00
c9d14dc522
Update clans to new preferences. Remove debug messages.
2016-08-23 03:12:36 -05:00
bbe44e7d75
Remove debug.
2016-08-23 02:04:07 -05:00
02f703e68e
Remove debug.
2016-08-23 01:57:39 -05:00
3b9d6adfbc
Lobby Update
2016-08-23 01:37:07 -05:00
2c37d17db3
Slight code change
2016-08-22 19:42:30 +01:00
7fb6ff58d0
Moved gadgets to use a whitelist system instead of blacklist for
...
collisions
2016-08-22 01:00:29 +02:00
e64324b36c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-20 11:40:15 +02:00
c4cb5d8db4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-19 12:56:24 +01:00
a79fa9cd46
Update GWEN preference name to reflect its purpose
2016-08-18 01:59:31 -05:00
08e1b765f7
Send local Anticheat messages regardless of preference
2016-08-18 01:59:31 -05:00
78fe41a8af
Update Anticheat ban message and duration
2016-08-18 01:59:30 -05:00
999237fe69
Accurately report game TPS
2016-08-18 01:59:05 -05:00
405f67f8b2
Implement/activate Anticheat phase two
...
- Remove anticheat guardians from Arcade
- Uncomment/implement Anticheat phase two actions
- Specifically: immediate ban on Kill Aura type A, VL 200.
- Give moderators less-specific messages, and limit messages by severity
2016-08-17 23:23:20 -04:00
69275cb79c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-17 20:57:18 +02:00
0176f31f1e
Complete implementation of kit progression
2016-08-16 18:55:26 +01:00
29a07c60ab
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-16 11:02:15 +01:00
08e65cb17e
Implement MineplexLink spectator check
2016-08-14 17:40:28 -04:00
6e32906805
More Gadget Collision patches
2016-08-14 22:50:48 +02:00
045445791a
Fixed gadget collision checks
2016-08-14 21:06:28 +02:00
e71cec874e
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-14 20:09:01 +02:00
8f4303cf39
Progress on Upgrade Details
2016-08-13 22:40:33 +01:00
0f4f1a3582
Remove pointless try/catch
2016-08-13 01:39:56 -05:00
c99a23d670
Add region and server to chat payload
2016-08-13 00:57:39 -05:00
a744566cd3
Add AntiSpam front end
2016-08-11 11:34:17 -05:00
4562b00dcb
Repurpose MAC reports pref for GWEN reports
2016-08-11 04:01:14 -04:00
7b1ac5ded2
Merge branch 'update/clans' into develop
2016-08-10 21:27:43 -04:00
7de9da3d1c
Complete rework of disguising and antihack hook
...
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.
Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.
Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines
The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
e05f90372a
Add kit upgrade details
2016-08-10 19:05:40 +01:00
907ac7473f
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-10 16:52:37 +02:00
4c825cf80b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-08 22:48:33 +01:00
4180f03a52
Use the correct SalesPackageBase for gadgets
2016-08-07 22:40:26 -04:00
95302177f8
Add cooldowns to all gui items tied to giving rewards to prevent some exploitation
2016-08-07 14:47:14 -04:00
4e0971ab0a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-08-05 14:35:57 -04:00
bf7065732b
Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have
2016-08-05 13:34:04 -04:00
0ca4fe2d38
Disable MAC kick for suspicious movement
2016-08-04 12:41:59 -04:00
3610f78b37
Merge branch 'feature/thanks' into develop
2016-08-03 22:23:46 -04:00
85c4c181ec
Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl
2016-08-03 18:22:36 -05:00
e113bedea5
Fix accidentally refactoring "thanks" in strings
2016-08-03 15:11:31 -05:00
72f078fe54
Fix using wrong name, add missing jooq files
2016-08-03 15:04:06 -05:00
6d93efc1a2
Adjust button text as well
2016-08-03 14:57:30 -05:00
ad6c1dd970
Adjust some text wording
2016-08-03 14:55:33 -05:00
2e80838376
Update ClaimTips lore
2016-08-03 14:25:07 -05:00
1ae7f6cb25
Integrate the new ThankManager into Amplifiers
2016-08-03 14:03:12 -05:00
3f0938815d
Merge branch 'update/clans' into develop
2016-08-03 12:39:52 -04:00
TadahTech
cnr
Sam
xGamingDudex
Sam
Shaun Bennett
samczsun
AlexTheCoder