Keir Nellyer
5e5cb3284a
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-12 10:11:31 +01:00
AlexTheCoder
23a330d449
Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode
2016-09-08 03:50:45 -04:00
samczsun
fba449ca03
Don't rearrange GUI if all dev servers are ingame
2016-09-07 19:17:47 -04:00
samczsun
a8adf23c15
Allow dev servers
2016-09-07 11:45:42 -04:00
AlexTheCoder
225583a13d
Remove join restrictions on beta servers from unranked players
2016-09-06 21:36:30 -04:00
Keir Nellyer
e2455bbc9d
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-05 20:04:12 +01:00
cnr
ccd81c1820
Fix BlockIgniteEvent NPE in MavericksManager
2016-09-05 13:42:24 -05:00
Keir Nellyer
acd63c90a1
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
cnr
ae0d30558c
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
2016-09-02 00:12:12 -05:00
cnr
f6db5393a3
Merge branch 'project-cosmetics' into develop
2016-09-02 00:08:23 -05:00
TadahTech
d8486abbfd
Fix minor best game issues.
2016-09-01 20:05:53 -05:00
TadahTech
107a296239
Fuck you intellij
2016-09-01 05:49:59 -05:00
TadahTech
68743cf73c
Mavs changes.
2016-09-01 03:24:38 -05:00
TadahTech
46053e82e1
Mavs changes.
2016-09-01 02:35:31 -05:00
TadahTech
c0c75ea375
Allow team selecting to work on the mavs hub.
2016-08-31 23:46:29 -05:00
cnr
9cd5b73432
Merge branch 'update/basketball-game' into develop
2016-08-31 23:19:51 -05:00
cnr
55086efd91
Merge branch 'feature/shadowmute' into develop
2016-08-31 23:16:57 -05:00
AlexTheCoder
8ca214a4d8
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-08-30 01:37:14 -04:00
AlexTheCoder
5108a6f08d
Convert to npc for entering mavericks lobby
2016-08-30 01:02:26 -04:00
AlexTheCoder
d7d8ef021e
Disable using cosmetics inside mavericks hub
2016-08-30 00:47:48 -04:00
TadahTech
dfced7186f
Finish tweaks for the hub
2016-08-29 22:32:07 -05:00
Shaun Bennett
f72647e1d4
Merge with develop
2016-08-29 21:56:03 -04:00
LCastr0
3687c7ad98
PowerPlayClub update
2016-08-29 21:32:11 -03:00
Shaun Bennett
f3e38031ab
Add shadowmuting
2016-08-29 18:57:07 -04:00
Keir Nellyer
cd9423a8e4
De-couple chatsnap from report system
2016-08-27 22:21:56 +01:00
LCastr0
3e38eb5990
Fixes to the merging conflicts
2016-08-25 20:13:59 -03:00
LCastr0
25d64c6dee
Changes to lock command
2016-08-25 20:12:00 -03:00
TadahTech
f9cc505908
Minor tweaks to soccer fields
2016-08-25 04:02:17 -05:00
TadahTech
19cfcc414b
Fix stacking minecarts
2016-08-25 03:58:39 -05:00
TadahTech
f518185518
Tweak parkour
2016-08-24 22:55:39 -05:00
TadahTech
1654850e8c
Final Changes
2016-08-24 22:26:38 -05:00
TadahTech
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
TadahTech
42c228773c
Fix entity directions
2016-08-23 01:52:19 -05:00
TadahTech
3b9d6adfbc
Lobby Update
2016-08-23 01:37:07 -05:00
LCastr0
84c6720d1c
Fix merging errors
2016-08-18 18:30:32 -03:00
Shaun Bennett
a744566cd3
Add AntiSpam front end
2016-08-11 11:34:17 -05:00
Keir Nellyer
a8e891f247
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
2016-08-11 14:53:57 +01:00
cnr
7b1ac5ded2
Merge branch 'update/clans' into develop
2016-08-10 21:27:43 -04:00
samczsun
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
AlexTheCoder
4e0971ab0a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-08-05 14:35:57 -04:00
AlexTheCoder
14f140143b
Re-enable music in hub gadgets
2016-08-05 13:34:33 -04:00
Keir Nellyer
1854b71757
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
cnr
3610f78b37
Merge branch 'feature/thanks' into develop
2016-08-03 22:23:46 -04:00
Shaun Bennett
e113bedea5
Fix accidentally refactoring "thanks" in strings
2016-08-03 15:11:31 -05:00
Shaun Bennett
ca13b8f29e
Fix compile errors
2016-08-03 14:18:26 -05:00
Shaun Bennett
f41cd8c104
Add /thank command. Update jooq files
2016-08-02 00:10:46 -05:00
Keir Nellyer
bb9dbf1da4
PC-877 Vanish report handler when teleporting to offender's server
2016-07-29 15:08:03 +01:00
cnr
d853f8467c
Merge branch 'update/clans' into develop
2016-07-28 22:56:23 -05:00
AlexTheCoder
3aad06cc8a
Make Clans displayed as FULL instead of BETA in server compass
2016-07-28 19:11:14 -04:00
LCastr0
ab8d6daa2c
GitHub being annoying again
2016-07-28 19:59:49 -03:00
