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

1563 Commits

Author SHA1 Message Date
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
TadahTech ab9bf2f405 Fixes possible bug with party leaders not seeing chat. 
Adds pling when you received an invite.
 2016-07-28 03:40:24 -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
AlexTheCoder 9a73784b7c Make clans in the hub route through clans hubs 2016-07-25 11:18:10 -04:00
TadahTech 5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -05:00
LCastr0 f4c40c61bb Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-24 13:18:53 -03: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
TadahTech ceccf2d2ac Don't give the item when a game is in progress. 2016-07-23 22:36:53 -05:00
TadahTech 5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05:00
AlexTheCoder 55c63364f2 Fix KOTH starting in other hub worlds and hub basketball teams always being null 2016-07-21 16:57:24 -04:00
AlexTheCoder 286a7aa32a Even more debug 2016-07-21 16:16:38 -04:00
AlexTheCoder b5ce35544f Fix merge conflict 2016-07-21 15:48:56 -04: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 97ef408e14 Debug 2016-07-21 15:46:48 -04:00
AlexTheCoder 11992129d1 Convert to EntityPortalEnterEvent 2016-07-21 14:01:08 -04:00
AlexTheCoder d59882007b Slightly increase boundaries 2016-07-21 13:55:09 -04:00
AlexTheCoder 37cf863625 Tiny fixes 2016-07-21 13:46:13 -04:00
AlexTheCoder 57f9f7db4b Fix ClassCastException 2016-07-21 13:25:17 -04:00
Keir Nellyer 9b58c53e90 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-21 16:11:09 +01:00
cnr 9a06cce0a0 Merge branch 'feature/party-v2' into develop 2016-07-20 16:41:50 -05:00
TadahTech 67a185acc9 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-20 15:52:59 -05:00
AlexTheCoder ff210271c9 Add javadocs 2016-07-20 12:21:15 -04:00
AlexTheCoder 0b4c9d78ff Finalize game integration into map 2016-07-20 11:22:14 -04:00
TadahTech 136eb078ef PC-426: Update UX for non-premium players: 
Removes the in game advertisement display when selecting servers.
Removes all chat throttling.
Adds a message sent on join to the player, promoting the newest sale or promotion.
 2016-07-20 06:59:37 -05:00
AlexTheCoder 0eac157701 Implement basketball features in the hub and begin setting up coordinates 2016-07-19 12:45:38 -04:00
Keir Nellyer f0c2686ca7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-14 23:01:11 +01:00
cnr a7b30f4f59 Merge branch 'thanos-mineware' into develop 2016-07-13 21:26:25 -05:00
Thanos Paravantis 6082418fc7 Update game tags on the hub game compass 2016-07-13 23:59:37 +03:00
Shaun Bennett 369dabffae Amplifier updates - move to boost shards only 2016-07-13 15:07:24 -05:00
Thanos Paravantis 711a04ffa8 Add Bawk Bawk Battles to hub compass 2016-07-13 21:40:31 +03:00
Keir Nellyer 5c83f09456 SnapshotRepository no longer extends MinecraftRepository 
It doesn't need to.
 2016-07-08 23:26:33 -04:00
TadahTech ce72d25832 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-08 13:09:02 -05:00
xGamingDudex 4aad663bec Left over from merge 2016-07-08 03:59:16 +02: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
Keir Nellyer cb555a41ab Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-07 20:47:19 -04:00
Keir Nellyer 0dc17bf6fa Further code cleanup 2016-07-07 18:12:52 -04:00
Keir Nellyer 4e0287ad03 Re-import report feature classes in Hub and Arcade 2016-07-07 14:01:18 -04:00
cnr 17f89f6937 Merge branch 'project-cosmetics' into develop 2016-07-06 13:00:29 -05:00
Thanos Paravantis 0eab6db116 Soccer bug fixes and minor improvements 
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
 2016-07-05 15:39:10 -05:00
TadahTech 584c8f50f0 PC Party bugs and tweaks. 2016-07-04 05:12:02 -05:00
TadahTech 06feb615a9 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-04 04:18:01 -05:00
xGamingDudex 0393e682c3 Merge clean up 
Every bloody time there are files who don't want to join the rest in the
merge commit.... >.>
 2016-06-30 23:10:28 +02: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
xGamingDudex 03511a7234 Updated values 
Updated teleport mav world value to fit new version of the map.
Split themes of multiple words to new lines.
Fixed bug where 16+ long lines on scoreboard would get random colors.

Seem to have forgotten to include the MavWorldManager earlier... ups.
 2016-06-30 22:56:26 +02:00
xGamingDudex f9208b67ef Added schematic support for ground in MB. 
Also fixed an NPE and moved a constructor to protected.
 2016-06-29 15:19:46 +02:00
xGamingDudex 32ee27d9ee Small bugfixes with QA 
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
 2016-06-29 03:49:53 +02:00
LCastr0 24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
xGamingDudex a69101bef3 Cleaned out some debug messages and added some java-docs. 2016-06-28 01:35:37 +02:00
xGamingDudex d6672c44f4 Finalized the hub module and finished local testing 
Cleaned up some source. Applied some small updates. Finished local
testing.
 2016-06-27 00:34:17 +02:00
Keir Nellyer 90df695624 Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 00:18:07 +01:00
LCastr0 d75abe3aea Persistence fixes 2016-06-25 00:36:00 -03:00
LCastr0 83f4b25887 Testing persistence fixes 2016-06-25 00:33:36 -03:00
Keir Nellyer 323d865b57 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-06-24 18:13:51 +01:00
TadahTech 0cda8ab7a3 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 04:11:59 -05:00
TadahTech 8fbb06ae3d Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-06-24 04:11:38 -05:00
Shaun Bennett 95f7c757cb Fix booster group naming for the quick menu 2016-06-24 04:07:27 -05:00
Shaun Bennett d708c478d7 Dont display other boosters, fix typo 2016-06-24 03:16:42 -05:00
cnr b58ff8c066 Add YouTube and Twitter buttons to UI 2016-06-24 01:30:10 -05:00
Shaun Bennett def57e2c0b Fix HubManager, add failsafe for BoosterManager 2016-06-23 23:19:02 -07: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
Shaun Bennett 043f9576dd Fix smash mobs booster group 2016-06-23 22:50:31 -07:00
Shaun Bennett a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
LCastr0 c1b7be6363 Fix merge problems 2016-06-23 16:33:20 -03: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
TadahTech a29b22b8be Undo comments. 2016-06-23 03:12:49 -05:00
Shaun Bennett 621d72f541 Fix merge issues, update lore text 2016-06-22 20:51:58 -07: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
Keir Nellyer a795ee3d0f Fix feature initialisation code 2016-06-23 01:18:16 +01:00
Keir Nellyer 09a74e3772 Work on pushing chat snapshots to db 2016-06-23 00:38:24 +01:00
xGamingDudex 31352a86d7 Added Mavericks module to Hub 2016-06-23 01:17:16 +02:00
TadahTech 50534c3af9 UI And server manager changes 2016-06-22 17:28:43 -05:00
TadahTech e53b474f3f Fix typo. 2016-06-22 00:59:22 -05:00
TadahTech ebff8f865b Undid a little too much. 2016-06-22 00:58:30 -05:00
TadahTech 38a13d01f1 Open server menu properly 2016-06-22 00:56:44 -05:00
TadahTech 4d31867e98 PC Party updates. 2016-06-22 00:35:57 -05:00
Shaun Bennett 2f1954e41c Rename to booster group 2016-06-15 18:18:09 -05:00
Shaun Bennett cbfbd6fe1c Booster GUI update 2016-06-15 17:40:20 -05:00
Shaun Bennett aa785ed3d5 Code clean-up and documentation 2016-06-12 21:18:11 -05:00
TadahTech 22e22ff508 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-06-12 00:42:22 -05:00
Keir Nellyer 6bc8039dbd Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-11 14:04:43 +01:00
Keir Nellyer 197acee4ae Implement server weighting 2016-06-11 13:47:45 +01:00
Shaun Bennett e6920b4549 Work on booster gui, display wait time 2016-06-10 17:17:43 -05:00
Shaun Bennett 1d365d726c brawl fountain now displays proper info on the weekend 2016-06-09 23:40:58 -05:00
Shaun Bennett 08e47b4b1b Enable tips in bonus gui 2016-06-09 22:41:41 -05:00
Keir Nellyer 8e48b00264 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-09 15:16:38 +01:00
Shaun Bennett ece08c23a9 Fix merge issues 2016-06-09 00:40:05 -05:00
Shaun Bennett d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett c9d5b91c52 Proper booster activation events 2016-06-08 19:22:25 -05:00
Shaun Bennett 37a412f1bf Starting to merge boosters into arcade code 2016-06-07 17:24:24 -05:00
TadahTech 474a9dc975 Heavy UI and Command work. Begin testing 
Time: 2hrs
 2016-06-05 23:37:08 -05:00
LCastr0 cb71bf4ba5 Removes morphs from gadget persistence (PC-429) 2016-06-05 17:44:34 -03:00
TadahTech e7f4f00433 Files changed that need to be edited later on with the new Party System. 
Memory commit
 2016-06-04 22:56:30 -05:00
TadahTech bccc11eeaf Files changed that need to be edited later on with the new Party System. 
Memory commit
 2016-06-04 22:41:01 -05:00
TadahTech 22a438d5c1 Party system rewrite init. Barebones frame work: Total time - 2hrs. 2016-06-04 01:54:17 -05:00
LCastr0 c5cbca3ed0 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-02 18:30:22 -03:00
cnr 894b7db18e Remove remaining fake ultra tag artifacts 2016-06-02 02:25:15 -05:00
Alex-The-Coder ff415a4569 Remove hub logitech advertisement 2016-05-30 14:44:07 -04:00
Shaun Bennett 4e9a48ab4f Finish off the tip system 2016-05-30 12:02:12 -05:00
Shaun Bennett e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Keir Nellyer 20038f9e64 Massive changes made to how the report feature functions 
Re-enabled report feature (merge from develop disabled it).
Moved reports from Redis to MySQL.
Made everything asynchronous.
Many many other miscellaneous changes.

Bugs will now be worked out and then this should be ready for QA testing
 2016-05-29 00:25:26 +01:00
LCastr0 255191f01a Changed gadget persistence to use Player Key/Value system (Thanks to Connor) 
Changed the method names for some classes
 2016-05-26 23:58:36 -03:00
LCastr0 460cb08f54 Adds old gadget names 
Adds another fix for winroom speed
Moves gadgets to individual packages, easier to manage in a future update
Adds gadget persistence (Or maybe not)
Changed mount locked item data to 8 instead of 7
 2016-05-25 12:19:06 -03:00
Shaun Bennett 1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
Shaun Bennett 12c5ba80b7 API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation 2016-05-24 17:13:33 +10:00
LCastr0 ed68ef332b Fixes for Win Room (Players were able to see other players) 
Added command to allow other players to run ranked commands
Fixes code styles
 2016-05-22 21:05:48 -03:00
cnr 7f44281441 Merge branch 'develop' into project-cosmetics 2016-05-19 10:04:19 -05:00
Ben 35c7b9a2bd Incognito Updates: 
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
 2016-05-17 18:10:07 -05:00
xGamingDudex 296f304d29 Changed the way UtilItem.dropItem handles despawning 2016-05-15 17:04:50 +02:00
phobia a67fec95fc Remove ultra tag 2016-05-15 03:21:58 -05:00
xGamingDudex 2db98613ab Cosmetic Update 
* Redid the Reward manager
	Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
 2016-05-12 23:42:37 +02:00
AlexTheCoder fab24e2139 Allow admins to be opped on testing servers 2016-05-12 17:24:37 -04:00
Sam Sun 2ae072f5b7 Rename modules to correct name 2016-05-12 11:44:35 -04:00
Alex-The-Coder 05312a9bef Update where players spawn upon first join... 
...to avoid flight kick upon login
 2016-05-11 21:57:42 -04:00
Conrad 8eba2c9ccb Merge pull request #59 from Mineplex-LLC/feature/logitech-brand 
Move billboard up 1
 2016-05-09 11:55:22 -04:00
AlexTheCoder 7932258579 Move billboard up 1 2016-05-09 03:44:16 -04:00
AlexTheCoder de1fabf53d Disable report system as it is not ready to go live 2016-05-09 02:10:51 -04:00
Keir Nellyer 7c80c3826b Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 21:49:16 +01:00
AlexTheCoder 34e8d65f4d Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly 2016-05-07 21:16:12 -04:00
Keir Nellyer b68127b111 Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 00:37:59 +01:00
AlexTheCoder f329051399 Changed design of billboard and fixed its centering in hubs 2016-05-05 18:25:51 -04:00
Keir Nellyer a663cb3e01 Revert "Revert "Report system (version 1)"" 
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-05-04 15:24:29 +01:00
LCastr0 cfc6f3703d Merge pull request #50 from Mineplex-LLC/develop 
Merge from develop
 2016-05-03 13:24:32 -03:00
AlexTheCoder 3d98c08a67 Add in missing file 2016-05-02 16:33:11 -04:00
AlexTheCoder ccd5b47d75 Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager 2016-05-02 16:20:41 -04:00
AlexTheCoder 070326e72d Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding 2016-04-30 19:26:16 -04:00
Conrad d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Keir Nellyer 6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-29 23:42:27 +01:00
Keir Nellyer 81cebc4ce7 Swap static helpers for a much better solution 
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.

Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
 2016-04-29 23:37:40 +01:00
AlexTheCoder b4c5be81f3 - Fixed random weather in MCL 
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
 2016-04-27 23:12:38 -04:00
Shaun Bennett b21dfad12e Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2016-04-24 13:37:45 +10:00
xGamingDudex b7099088a9 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
 2016-04-23 00:55:48 +02:00
Jonathan Williams d73b720323 Merge branch 'features/elo' into develop 2016-04-22 04:34:35 -05:00
Jonathan Williams 6d00e8b41f Refactored Elo to work correctly. 2016-04-22 00:21:11 -05:00
Shaun Bennett 54f0b99756 Add fountain gui command 2016-04-21 11:41:16 +10:00
Shaun Bennett cb48df6a3d Update fountain count every 5 seconds. Display Hologram 2016-04-19 14:30:38 +10:00
xGamingDudex ffc0459e5a Cosmetic Update 
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils

* Edited some particles, hats and death animations
 2016-04-16 02:24:41 +02:00
Jonathan Williams 2b2b251548 Merge branch 'clans/beta' into develop 2016-04-15 12:41:14 -05:00
Jonathan Williams a730b81feb Commented out TournamentManager, moving off develop. 2016-04-15 12:38:25 -05:00
Jonathan Williams cf3141ddc0 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-15 12:30:32 -05:00
Jonathan Williams 85f4ff1299 Starting on Tournaments. 2016-04-13 17:14:48 -05:00
Ben a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
Keir Nellyer 390b2878dc Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-07 14:28:30 +01:00
Ben 876a7a8eb6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-05 12:37:23 +01:00
Shaun Bennett 23232efd63 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
 2016-04-05 13:04:39 +10:00
Ben 7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Jonathan Williams cd5ad89f51 Made clans sort by server number. 2016-04-04 17:46:51 -05:00
Jonathan Williams 2b3e466469 Removed pesky '?' causing login query to stall. 2016-04-04 16:30:57 -05:00
Jonathan Williams 60010f90b4 Load simple clan token on player login to reduce overhead. 
Increased dbpool connections to 4
 2016-04-04 13:47:45 -05:00
Jonathan Williams 781c4bfdbd Removed db call off main thread for ClanServerPage 2016-04-04 10:31:13 -05:00
Shaun Bennett ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
 2016-04-05 00:57:28 +10:00
Shaun Bennett fecd3c1eaa Final changes 2016-04-04 23:28:38 +10:00
Jonathan Williams ee22274ef5 Removed Stacker debug messages. 2016-03-23 16:02:06 -05:00
Shaun Bennett e8dcc4a3e2 Merge branch 'develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-03-23 11:02:20 +11:00
Jonathan Williams 2cff7003e6 Added more debug to Stacker interaction. 2016-03-21 20:30:54 -05:00
Jonathan Williams faf6834e23 Added some protection for stacker and offline players. 2016-03-20 16:27:59 -05:00
Shaun Bennett 1228ca227e Add support for 1.9 resource packs, Text Tutorials 2016-03-11 11:50:08 -06:00
Ben 5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Ben befb27d3db Finalized Vanish system 2016-03-09 01:45:17 +00:00
Shaun Bennett 3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Keir Nellyer 99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2016-02-22 19:02:54 +00:00
md_5 c811906a7e REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a) 2016-02-19 18:21:01 +11:00
Shaun Bennett 7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
md_5 b58ea5b51a Provide option to load config from mineplex.yml, not per game folders. 2016-02-19 15:25:09 +11:00
Shaun Bennett 1c5ae77329 Fix Valentines quick server menu button 2016-02-16 16:54:05 -06:00
Shaun Bennett 15ed2570e2 Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
Shaun Bennett 0d19a8017f Update Featured arcade game, various bug fixes 2016-02-12 06:51:30 -06:00
Shaun Bennett e8559d423a Add Valentines Vendetta to quick server menu 2016-02-12 05:27:50 -06:00
Shaun Bennett 960a0cdabb Fix constructor error, add ValentinesGiftManager to Arcade 2016-02-12 05:06:13 -06:00
Shaun Bennett 66aa89b5e0 Fix sheep look bug, valentines gift effects, valentines achievements 2016-02-12 04:32:26 -06:00
Shaun Bennett 4f0f81c8df Update Courtship messages 2016-02-12 01:47:20 -06:00
Shaun Bennett d8965179f7 More valentines adjustments/fix gladiators tutorial being enabled 2016-02-11 23:01:59 -06:00
Shaun Bennett 00f7880dd2 Fix compile error 2016-02-09 21:15:15 -06:00
Shaun Bennett f6e091f029 Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop 
* commit '57638ff68496b6f10012f8782633066b52a8a715':
  More work on valentines
  Valentines gifts
  Added love potion and hub sheep thing.
  Started on Love Potion system. Switching branches.
  Varius tweaks and changes.
  Added sheep mount to index.
  Added various cosmetic items for Valentines day.
 2016-02-09 20:28:37 -06:00
Shaun Bennett a868b8b2b8 Valentines gifts 2016-02-08 22:26:33 -06:00
Shaun Bennett c059425e9d Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
Mysticate a8ff714ee4 Added love potion and hub sheep thing. 2016-02-07 10:19:40 -05:00
Mysticate c1393697f8 Started on Love Potion system. Switching branches. 2016-02-06 14:08:17 -05:00
Mysticate c0d6cbbb85 Added various cosmetic items for Valentines day. 
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
 2016-02-04 13:12:53 -05:00
Keir Nellyer 8cf32ef8bf Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-30 00:46:43 +00:00
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Shaun Bennett c1f91cbfb0 Final changes 2016-01-29 03:56:49 -05:00
Shaun Bennett 863be023d9 Prep for update 2016-01-29 03:36:52 -05:00
Shaun Bennett eb29c6b367 Fix constructor 2016-01-28 22:28:18 -05:00
Shaun Bennett 0177cf91bb Merge with develop 2016-01-28 22:23:17 -05:00
Shaun Bennett 051d70771b Facebook Command 2016-01-28 22:15:35 -05:00
teddy 63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
Keir Nellyer ac37417fca Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
 2016-01-27 21:44:04 +00:00
Shaun Bennett 311d42db30 Use Garbo's description changes 2016-01-22 19:48:06 -05:00
Shaun Bennett a41816ca22 Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00
Teddy 1e72ebcbe6 Merge branch 'master' into rankdescriptions 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-01-21 12:54:12 +00:00
Keir Nellyer dd0fc23467 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-21 10:12:02 +00:00
md_5 447583624e Fix ascii.png duplication. 2016-01-21 17:47:21 +11:00
Shaun Bennett 359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop 
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
 2016-01-20 12:23:55 -06:00
Shaun Bennett 037a2f8353 Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command 2016-01-20 13:04:31 -05:00
Shaun Bennett 8977735baf Include a version.properties in maven build 2016-01-20 11:57:21 -05:00
Shaun Bennett ea315a1447 Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop 
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
 2016-01-20 10:19:09 -05:00
Shaun Bennett 77d9f7cf32 Merge branch 'master' into develop 2016-01-20 10:12:20 -05:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11: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
Sarah 410bc1c74b not being able to disguise as banned/muted players 2016-01-15 19:12:50 +01:00
Keir 53133d51ee Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-01-13 11:47:13 +00: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
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 8193b5121b Dont allow /disguise for YOUTUBE_SMALL 2016-01-09 18:39:47 -05:00
Keir 5f362a878a Run some Redis functions async (as it sometimes blocks). 2016-01-09 22:21:15 +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 511b39caa7 Merge branch 'master' into develop 2016-01-08 17:05:54 -05:00
Keir 7ce028203b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-08 13:59:43 +00:00
Sarah 5482d1dc40 Fixing "kicked for Flying" 2016-01-08 12:17:28 +01: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 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 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
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
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 962efe4a61 Fix not being able to join games through portals 2016-01-04 16:41:07 -05: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
Sarah dd6d7b1b96 updating denial message 2016-01-02 16:45:15 +01: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
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
Keir 5841ab1101 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-12-29 23:47:00 +00:00
Shaun Bennett 7ad12d0a6b Show Host Rank in private servers 2015-12-29 00:50:20 -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
Keir cc421c1435 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-12-24 21:19:30 +00:00
Morten f83016e007 Also really quickly fixed the Invisibility in lobby bug (hopefully) 2015-12-23 00:39:16 +01:00
Shaun Bennett f4050fb1ff Adjust GUI, fix beta button 2015-12-21 04:35:57 -05:00
Mysticate 0f5be6444b Yo shaun debug this m8 ty 2015-12-21 02:23:59 -05:00
Shaun Bennett f80648bfbc Update DBPool to load from file 2015-12-18 00:32:07 -05: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
libraryaddict 66372c397b First version of ResourcePackManager that handles all resource packs globally 2015-12-18 10:03:03 +13:00
William Burns 4077aa808f Add to Arcade and Hub 2015-12-16 22:01:51 +00:00
Keir 6f82f8349d Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
 2015-12-16 14:07:56 +00:00
Keir 6d9bcb8e66 Reworked serialization and store more data in json files for later parsing. 
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
 2015-12-15 21:30:45 +00:00
Shaun Bennett 5be91de006 Merge master 2015-12-13 23:40:18 -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
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
Shaun Bennett c470ad880d Merge pull request #77 in MIN/mineplex from foo to master 
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
  Fixed Micro Battle icon not appearing in stats menu
  Gravity's icon changed to ENDER_PORTAL_FRAME
  world's smallest bugfix - admin->co-host
  Fixed advertisement being able to be bypassed by spec and instant join
  fixed naming pets non-alphanumeric characters
  changed reference to premium ranks
  removed important debug thing
  fixed ssm enderman always facing south on teleport
  fixed bacon blast exloding blocks
  fixed shield smash and fissure affecting spectators
  fixed slab issue with Assassin's Flash
  Re-fixed Barbarian bug
  Fixed SG Barbarian bug
  SSM bug fix: magma cube flame dash doesn't make player invisible
  fixed several smash bugs and one global issue
  Slightly bumped Monster Maze jump time value
  fixed bridge bug "Death Bomber counts suicides as well"
  typo fix in legendary aura description
  Update achievement kit reference text
  Fixed tnt bug (SG)
  ...
 2015-12-11 18:57:18 -06:00
xGamingDudex 6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
Cheese d7f39bdfd8 costume sets 2015-12-11 20:59:55 +11:00
Jonathan Williams 95a81ef368 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
 2015-12-11 01:26:20 -05:00
Cheese 66011cde8c fixed player count 2015-12-11 17:25:23 +11:00
Jonathan Williams 222173ab17 Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
Cheese 05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +11:00
Shaun Bennett d6aed5dff7 More work 2015-12-10 21:32:10 -05:00
Shaun Bennett 4d8b8bd58b Fix errors, update cosmetic menu 2015-12-10 19:27:32 -05:00
Shaun Bennett a9e6224eca Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:21:33 -05:00
Shaun Bennett 5d96ceb41e Let owner+ disguise as staff - easy way to check a player's rank 2015-12-10 19:20:11 -05:00
Shaun Bennett 72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:18:49 -05:00
xGamingDudex 5b0909012d Renamed GadgetActivateEvent to GadgetEnable event 
Some files didn't make it to prev commit
 2015-12-11 01:07:47 +01:00
Shaun Bennett 851b613d2e Now playing fix 2015-12-10 17:04:15 -05:00
Keir 8459cf0f95 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
 2015-12-09 18:13:26 +00:00
Shaun Bennett 2e49611035 LinkedHashMaps, Buttons 2015-12-08 17:45:27 -05:00
Shaun Bennett ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
xGamingDudex b1536547d3 Cosmetic Update 2 
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
 2015-12-08 00:50:08 +01:00
Cheese 4ba2e8c96c fixed old staff being stuck invis. 
partially changed scoreboard to show playercount
 2015-12-08 10:31:11 +11:00
Shaun Bennett 42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
Keir 67b3fe1d23 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
 2015-12-07 18:11:40 +00:00
Shaun Bennett 3cdf8c4b08 Merge remote-tracking branch 'origin/master' 2015-12-07 04:23:33 -05:00
Shaun Bennett 2afbe23a7c Load songs from update folder 2015-12-07 04:23:26 -05:00
Cheese 7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese 8c4615203c sale message 2015-12-07 20:07:20 +11:00
Shaun Bennett 7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Shaun Bennett 488895ea53 Note block player 2015-12-06 21:12:10 -05:00
Cheese d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese 9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Shaun Bennett 32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
Cheese 5aabd00972 set hub to christmas 
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
 2015-12-06 14:55:28 +11:00
Keir ef6fd0eaa3 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-12-05 00:05:05 +00:00
Cheese 4a53667539 gadget restructure 
converted frost lord and titan particles into 4 subcategories.
 2015-12-05 10:22:00 +11:00
fooify 348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08:00
fooify b04f139883 Fixed advertisement being able to be bypassed by spec and instant join 2015-12-01 19:26:52 -08:00
Keir 9508556d57 Refactor. 2015-12-01 22:47:51 +00:00
fooify 48ae23ebff changed reference to premium ranks 2015-11-30 19:58:41 -08:00
xGamingDudex 509835ea64 Implemented new mount data system replacing instead of entities as data. 
+ Removed some unnecessary code
+ Made StackManager use new mount system

This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
 2015-11-29 19:08:00 +01:00
Cheese 963caae719 Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes' 2015-11-28 16:00:28 +11:00
Sarah e81aa72c7e Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-27 20:33:18 +01:00
Shaun Bennett a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Cheese ec0e2d2d64 fixed colors 2015-11-27 21:09:25 +11:00
Cheese dda0e827e1 FGIXEXFSD 2015-11-27 20:46:33 +11:00
Cheese 936e61de57 gui changes :) 2015-11-27 19:42:04 +11:00
Shaun Bennett 0b0710458f Hub updates/try to fix chiss stuff 2015-11-27 03:22:17 -05:00
Cheese 4e2f48b37e Merge branch 'master' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
 2015-11-27 19:16:30 +11:00
Keir edf93ec43f Initial ChatSnap implementation. 2015-11-26 16:55:27 +00:00
libraryaddict 3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
Shaun Bennett ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
xGamingDudex 84fde1c087 Fixed double jump and entity ground tool. 
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.

Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
 2015-11-25 16:42:32 +01:00
Cheese 7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
Keir dcca67e571 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-22 13:54:16 +00:00
Cheese 6eb1bef1c6 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-11-21 11:09:28 +11:00
Cheese 0bc64fec16 Proxy limit fixes 2015-11-21 09:28:15 +11:00
Keir ad16c59ab7 Forgot to commit this crucial part... 2015-11-20 22:05:10 +00:00
AlexTheCoder 386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder f51358552a -B 2015-11-20 05:57:29 -05:00
Jonathan Williams 700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Cheese 3a5ab3f17c Merge branch 'master' into monster-league 2015-11-20 11:51:07 +11:00
Keir bceb69bc12 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2015-11-19 23:52:02 +00:00
Sarah ad280c96c9 adding interactive Chat elements. 2015-11-19 20:45:40 +01:00
William Burns 4620a5a162 Hub fix 2015-11-18 21:47:52 +00:00
Keir cb5672b94c Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-18 20:34:24 +00:00
Jonathan Williams 88dbe261db Added logging for stacker. 2015-11-15 18:34:35 -06:00
Cheese e7b86b4462 hub skytext 2015-11-14 13:05:11 +11:00
Cheese 9de3981dec ms update 2015-11-13 11:24:11 +11:00
Shaun Bennett bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett 639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett 0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Shaun Bennett 6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05:00
AlexTheCoder bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
NewGarbo ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
Keir 2722aeaaec Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-11 14:53:49 +00:00
Jonathan Williams 0e6146d5c9 Added expire to Stacker throw. 2015-11-11 04:32:56 -06:00