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

1367 Commits

Author SHA1 Message Date
Keir Nellyer
e0d05d3c87 PC-1140 Keep reports region-separated 2016-10-22 15:06:18 +01:00
Shaun Bennett
0dca2e9d46 Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub 2016-10-08 19:42:29 -04:00
Kenny
0f44483f07 Merge pull request #233 from Mineplex-LLC/project-cosmetics 
Project cosmetics
 2016-10-06 04:31:56 -04:00
LCastr0
d6e9283cce Changed world time so its not too dark 2016-10-06 05:26:58 -03:00
Shaun Bennett
a6727bf104 Halloween Fixes/Prep 2016-10-05 22:57:44 -04:00
LCastr0
c0754a23c8 Fix Slime Soccer, Add /unlockcosmetics and /lockcosmetics for other players (#232) 
* Added option to run /unlockcosmetics and /lockcosmetics for other players

* Fixed Slimeball Soccer field location
 2016-10-05 22:08:27 -04:00
LCastr0
a1ec102419 Fixed Slimeball Soccer field location 2016-10-05 21:54:17 -03:00
LCastr0
8da5813f29 Add Halloween Cosmetics (#227) 
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color

External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat

* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods

External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed

* Internal:
Renamed RewardType enums to have upper case

External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet

* Slack integration to test stuff (Will not be in the code in the last commit)

* Fixed Grim Reaper Hoe not being removed after the morph is disabled

* Details for the Haunted Chest

* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph

* Fixes for lores and names
Support server stuff

* Fixes for the Lock and Unlock cosmetics commands

* Fixes for the Grim Reaper Morph

* Fixes for the Grim Reaper Morph
Removed debug messages

* Fixed a memory leak. Thanks to Sam

* Fix imports

* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()

* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
 2016-10-05 10:27:45 -04:00
Shaun Bennett
3ede0e5644 Merge Report System v2 (#216) 
Report system (v2)
 2016-09-28 17:39:26 -04:00
Timothy Andis
3d7647b26b Game Lobby Update (#215) 
* Game Lobby update. Phase 1.

* Correctly apply kit data to players who use the next best game feature.

* I can do integer comparisons, I promise.

* So much stuff, all minor.

* Suck it Carl.

* Fix Party bug.
Update LobbyManager

* Allow QA to test KitProgression @shaun cherry pick this plz.

* Proper generation check (testing)
Remove debugging from NextBestGame

* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.

* ClansHub and Tweaks to the lobby manager

* WA Tweak.
 2016-09-28 10:17:05 -04:00
Keir Nellyer
f63561b05e Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-26 10:19:13 +01:00
samczsun
3f3241bec9 Reformat developer servers 2016-09-25 16:28:01 -04:00
Keir Nellyer
b24429783b 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/bonuses/BonusManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-09-22 16:28:16 +01:00
Shaun Bennett
7f447f8084 Setup compass for game changes 2016-09-22 00:33:48 -04:00
Timothy Andis
bf61296948 PlayWire Ad integration (#207) 
* PlayWire integration.

* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*

* PlayWire stuff.

* PlayWire streaks and tweaks.
 2016-09-21 21:24:58 -04:00
Keir Nellyer
2cdab061b6 PC-886 Move report bans over to punishment gui 2016-09-16 17:40:14 +01:00
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
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