Sam
4b1c93150b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-03 20:12:39 +01:00
Sam
8d5d0c6272
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-03 18:29:37 +01:00
Sam
fc0217f1fd
More magic OITQ
2016-09-03 18:25:17 +01:00
cnr
f6db5393a3
Merge branch 'project-cosmetics' into develop
2016-09-02 00:08:23 -05:00
cnr
9cd5b73432
Merge branch 'update/basketball-game' into develop
2016-08-31 23:19:51 -05:00
Sam
47df09b770
Handle null sound
2016-08-31 12:07:35 +01: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
TadahTech
39ea280098
NextBestGame code and new hub releases
2016-08-29 20:21:36 -05:00
LCastr0
3687c7ad98
PowerPlayClub update
2016-08-29 21:32:11 -03:00
Sam
7a3ce9813c
Payload (OITQ)
2016-08-29 23:08:04 +01:00
Sam
a35c162dc4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-26 21:26:16 +01:00
LCastr0
3e38eb5990
Fixes to the merging conflicts
2016-08-25 20:13:59 -03:00
TadahTech
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
TadahTech
3b9d6adfbc
Lobby Update
2016-08-23 01:37:07 -05:00
Sam
e6530a6f44
More tweaks and fixes
2016-08-20 12:14:01 +01:00
LCastr0
84c6720d1c
Fix merging errors
2016-08-18 18:30:32 -03:00
Sam
29a07c60ab
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-16 11:02:15 +01:00
Shaun Bennett
a744566cd3
Add AntiSpam front end
2016-08-11 11:34:17 -05: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
Sam
2b8754aa32
Metal Kit bug fixes
2016-08-02 23:34:12 +01:00
LCastr0
ab8d6daa2c
GitHub being annoying again
2016-07-28 19:59:49 -03:00
cnr
dd38a1dd76
Merge branch 'update/clans' into develop
2016-07-27 20:40:35 -05:00
cnr
05e59ae9cc
Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
...
This reverts commit 917b83250d
2016-07-27 19:03:04 -05:00
AlexTheCoder
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
cnr
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
LCastr0
195a82f78f
Github is annoying me about this, but I don't know what it is
2016-07-24 13:18:33 -03:00
AlexTheCoder
fc3ceddf4d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-07-21 15:47:59 -04:00
AlexTheCoder
2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
cnr
917b83250d
Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
...
This reverts commit 30287a0832b8650d741d
2016-07-14 00:10:37 -05:00
samczsun
7dcf7378ef
Many changes
...
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
AlexTheCoder
d3270b9289
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-11 14:50:16 -04:00
AlexTheCoder
30287a0832
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing
2016-07-11 14:46:08 -04:00
AlexTheCoder
0be317e5be
Implement tweaks and finalize implementations for bosses and fix loot dropping bugs
2016-07-11 11:36:48 -04:00
xGamingDudex
5349d26115
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-07-08 03:41:13 +02:00
xGamingDudex
c50ec49ad9
Minor updates
...
Tweaked some location values.
Added more event handling to the reveiw hub and mavericks hub.
Added builder info holograms to all sides of the display slots in the
mavericks hub.
2016-07-08 02:59:33 +02:00
AlexTheCoder
eccd7deedc
Fix merge errors and properly force disable particles by checking the game's settings
2016-07-05 17:25:01 -04:00
AlexTheCoder
b51ee4a066
Create an event for stronger control over Velocity changes
2016-07-05 07:51:41 -04:00
LCastr0
050ae75e49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-07-02 13:33:33 -03:00
LCastr0
7a6335a021
Fixes for win rooms? Or not yet?!
2016-07-02 13:32:35 -03:00
samczsun
3e1c44bfa3
UHC improvements
...
Lots of hacky NMS stuff. Ask me if you're confused
Basically, decorate the world async
Keep spawn chunks loaded
Make sure view distance is capped so no chunks are genned on teleport
Add regeneration and resistance on spawn to prevent damage
Set health objective score manually
Teleport player two times to ensure no block glitching
Disable kicking and NCP while teleporting
2016-06-30 17:15:01 -05:00
xGamingDudex
6d9e84b817
Merge branch 'develop' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
samczsun
045e1b3064
Fix various Clans bugs
...
Viper destroying armor
Legendaries not saving properly
Combat log NPC for vanished players
2016-06-30 05:20:44 -05:00
xGamingDudex
cd5555c3f9
Fixed invis entities after pasting blocks + removed debug code
2016-06-28 04:03:40 +02:00
xGamingDudex
966eaf1616
Fixed some entity tracking bugs regarding chunk update packets
2016-06-27 00:16:04 +02:00
Shaun Bennett
fd843b88cb
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
cnr
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
LCastr0
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
LCastr0
a441727e09
Freedom update:
...
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
Shaun Bennett
249a5c70aa
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
Shaun Bennett
906e0e0044
Allow API error messages from HTTP 503
2016-06-22 20:31:18 -07:00
