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

9363 Commits

Author SHA1 Message Date
xGamingDudex 82f1ec1ac6 Tweaked spider smash 2016-10-20 01:01:46 +02:00
xGamingDudex 2306dbc909 Fixed creeper XP 2016-10-20 01:01:31 +02:00
xGamingDudex 8de69d2573 Fixed guardian passive to acctually work 2016-10-19 17:49:59 +02:00
xGamingDudex 0b02bc9e2d Fixed with daze potion self damage and only randomly working 2016-10-19 16:35:49 +02:00
xGamingDudex 9e3cf58ff5 Type in blaze smash 2016-10-18 19:39:06 +02:00
xGamingDudex 35c9d2ecb1 Tweaked damage/KB values and fixed text issues 2016-10-15 14:56:38 +02:00
Sam 76a413548b More unused imports 2016-10-13 23:31:32 +01:00
Sam 4810960d82 Stop visible armorstands 2016-10-13 23:19:11 +01:00
Sam 99c72a3b31 Fix debug command 2016-10-13 23:10:59 +01:00
Sam e698037a73 Remove unused import 2016-10-13 22:44:48 +01:00
Sam c93e6be98b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-13 22:43:08 +01:00
Sam ca0da15b8c Fix magma cube 2016-10-13 22:43:04 +01:00
Sam f72f6e8aaa Tweaks 2016-10-13 20:20:00 +01:00
Sam 2fb6be2d10 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-13 16:11:05 +01:00
Sam a5d52d9e2f MERGE PLEASE! 2016-10-13 16:11:01 +01:00
Shaun Bennett 8974b2b395 Fix Carl Error 2016-10-13 04:07:05 -04:00
Shaun Bennett bb32a06caf Add Halloween Words 2016-10-12 23:30:52 -04:00
AlexTheCoder 7ec530a8c7 Fix lobby protection on build server, make map locks persistent, implement larger parsing size, make map lock command require op, prevent raining on build server, and make block hunt actually work with any map with required information regardless of order 2016-10-12 23:01:25 -04:00
Shaun Bennett 62d08e74e3 Remove voting code 2016-10-12 22:54:14 -04:00
Alexander Meech 87122e9904 Update youtube link 2016-10-12 22:54:14 -04:00
Alexander Meech 63c14a99ab Update playwire displayed cooldown time 2016-10-12 22:54:14 -04:00
AlexTheCoder 6d36034115 Remove voting from carl the creeper, move spin tokens to playwire, unify link messages in all carl the creeper links 2016-10-12 22:54:14 -04:00
xADudex 311751cc39 Pumpkin's Revenge (#237) 
* Initial Commit

* Update

* Bunch of new stuff

* Fixed fletcher arrow typo

* Added reward pet, fixed typo, tweaked lose cinematic

* Lots of tweaks and fixes with QA

* Cleaning up a little code

* Removed debug message on prince death

* Added nighttime to halloween game lobby maps

* Tweaked spawn rates and mob caps

* Typo

* Tweaked texts, cleaned import and cleared all mobs from boss cinematic

* Fixed creepers not getting properly removed during boss cinematic

* Reward typo

* Fixed rare NPE

* Typos

* Tweaked mini zombie

* Typo

* Prevent zombie from spawning minis after being removed

* Tweaked wave announcements + formated WaveVictory

* Changed color of prince tag + formated ZombieSpawner

* Fixed (another) rare NPE

* Tweaked boss wave cinematic
 2016-10-12 22:40:05 -04:00
AlexTheCoder 66dfe06b34 Clean up bucket fixing in clans 2016-10-12 21:50:18 -04:00
AlexTheCoder 2ac7f72327 Fix clans water exploit and ruined pickaxe duping exploit 2016-10-12 21:50:18 -04: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
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
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