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

10053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keir Nellyer
76539648da PC-1109 Fix /reportstats if player doesn't have at least 5 reports in 
each role
 2016-10-12 17:36:54 +01:00
Keir Nellyer
ca09253292 PC-954 Tweak error message when no reports are available for handling 
Also close gui after clicking item and remove old un-necessary code.
 2016-10-12 17:30:19 +01:00
Keir Nellyer
f42678a9ef PC-954 Fix incorrectly sized inventory 2016-10-12 17:23:42 +01:00
Keir Nellyer
eb6d893414 PC-954 Allow staff to select what kind of report they'd like to handle 2016-10-12 17:15:48 +01:00
Keir Nellyer
15cf3a2bee PC-1019 Give indication of when a report is forwarded to a team 2016-10-11 14:30:43 +01:00
Keir Nellyer
3dc9038bae Fix incorrect column name in statement 2016-10-11 01:22:43 +01:00
Keir Nellyer
1f47d51935 Merge branches 'develop' and 'update/report-non-sequential' of github.com:Mineplex-LLC/Minecraft-PC into update/report-non-sequential 
# Conflicts:
#	Plugins/Mineplex.ReportSite/view.php
 2016-10-11 00:55:26 +01:00
Keir Nellyer
f39ee7c247 Update chatsnap site to handle new token system 2016-10-11 00:45:33 +01:00
Keir Nellyer
5c5c159ee3 Add support for assigning tokens to snapshots (excluding actual 
generation part)
 2016-10-11 00:22:29 +01:00
Sam
2b2bb817be Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-09 12:24:51 +01:00
Sam
2b124cb16c I have really lost track on what I'm doing... 2016-10-09 12:24:49 +01:00
Shaun Bennett
0dca2e9d46 Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub 2016-10-08 19:42:29 -04:00
Sam
28a2a8c098 More from GI testing 2016-10-08 11:14:55 +01:00
Keir Nellyer
e4d3621512 Create SnapshotMetadata class in prepartion of snapshot tokens 2016-10-07 18:25:20 +01:00
LCastr0
8ab61b2b06 Public: 
- Added Chicken Mount
 - Added Turkey Morph

Internal:
 - Changed the Morph system (Using UtilMorph)
 2016-10-06 14:19:44 -03:00
LCastr0
d4c5f1f5c9 Merge branch 'update/ppc-items' of github.com:Mineplex-LLC/Minecraft-PC into update/ppc-items 2016-10-06 14:00:46 -03:00
LCastr0
3707de6742 Made Haunted Chests buyable 2016-10-06 12:43:19 -04:00
LCastr0
9f66bf438c Fixes for the CustomerSupport server 2016-10-06 12:43:19 -04:00
LCastr0
353a64e1d4 Made Haunted Chests buyable 2016-10-06 13:15:23 -03:00
LCastr0
86c15af8d6 Fixes for the CustomerSupport server 2016-10-06 12:01:15 -03:00
Sam
e5e953a8ab Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-06 15:03:53 +01:00
Sam
bb9ca490b1 GI changes 2016-10-06 15:03:51 +01: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
cnr
bd90c465dd Update PPC button to reflect new claiming style 2016-10-05 22:03:04 -04:00
cnr
20c37bf3d6 Unlock PPC cosmetics on the first of the month 
The relevant cosmetic will be revoked if the player's subscription
lapses during that month
 2016-10-05 22:03:04 -04:00
cnr
8793be56ed Add 'come back on $DATE' message to carl for Power Play 2016-10-05 22:03:04 -04:00
LCastr0
a1ec102419 Fixed Slimeball Soccer field location 2016-10-05 21:54:17 -03:00
LCastr0
5939c304a5 Added option to run /unlockcosmetics and /lockcosmetics for other players 2016-10-05 20:13:30 -03:00
LCastr0
876d35b482 Cosmetics Bug Fixes (#229) 
* 	Fixes for the Block Morph

* Fixes for the Witch Morph

* Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again
 2016-10-05 17:16:25 -04:00
Alexander Meech
dae3c60247 Make support text for power play claims more accurate (#228) 
* Make support text for power play claims more...

...accurate

* Reverse text
 2016-10-05 17:13:32 -04:00
Shaun Bennett
25000f7367 Merge pull request #226 from Mineplex-LLC/bugfix/report-hotfix 
Report feature hotfixes
 2016-10-05 17:13:08 -04:00
Lucas de Castro Queiroz
49510e6f9f Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again 2016-10-05 16:21:40 -03:00
LCastr0
314c88333a Merge pull request #230 from Mineplex-LLC/develop 
Merges develop into project-cosmetics
 2016-10-05 16:14:51 -03:00
Keir Nellyer
643656de0d Merge remote-tracking branch 'origin/bugfix/report-hotfix' into bugfix/report-hotfix 2016-10-05 15:32:05 +01:00
Keir Nellyer
e6bb0c2d78 Improve handling of circumstances whereby a report exists but no 
corresponding chatsnap log on chatsnap site
 2016-10-05 15:31:46 +01: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
Keir Nellyer
a4e1fb3c8d Prepare database for snapshot tokens 2016-10-05 14:31:01 +01:00
Keir Nellyer
46db80a056 Always check game object is not null before attempting to access it (#225) 2016-10-04 15:32:04 -04:00
Sam Sun
5d8c079be6 Understand the squid disguise code (#217) 2016-10-04 15:28:12 -04:00
Keir Nellyer
22707d6d2e Only execute if throwable is null 2016-10-04 16:34:19 +01:00
Keir Nellyer
6709001c89 Remove double handle check, pointless and can potentially cause issues 2016-10-04 16:25:51 +01:00
Keir Nellyer
afee339e16 Any report with a handler and no conclusion is an active report, 
therefore we don't need to check if the report is active
 2016-10-04 16:20:11 +01:00
Keir Nellyer
c462282632 Merge branches 'bugfix/report-hotfix' and 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/report-hotfix 2016-10-04 10:40:43 +01:00
LCastr0
515fd9fb70 Merge branch 'project-cosmetics' of github.com:Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-10-03 22:44:24 -03:00
LCastr0
fb29947705 Fixes for the Witch Morph 2016-10-03 22:43:49 -03:00
Sam
53c6c07208 Lazer to Laser 2016-10-03 23:17:14 +01:00
Sam
e48dfbefe4 Even more fixes! 2016-10-03 21:20:15 +01:00