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

9195 Commits

Author SHA1 Message Date
xGamingDudex
7ad0b214a5 Change team display text 2016-10-20 23:08:40 +02:00
xGamingDudex
be2bc09896 Added comma to laser text 2016-10-20 22:56:12 +02:00
xGamingDudex
875bdc1fca Removed unused code 2016-10-20 22:50:12 +02:00
xGamingDudex
d119a94d53 Fixed concurrency issue 2016-10-20 22:44:43 +02:00
xGamingDudex
4e4fd2a8e9 Changed respawn title text 2016-10-20 22:44:13 +02:00
xGamingDudex
0705e38b3e Fixed NPE 2016-10-20 22:43:51 +02:00
Shaun Bennett
f8010f4ad0 Merge pull request #245 from Mineplex-LLC/update/report-improvements 
Report Feature Improvements
 2016-10-19 22:53:53 -04:00
samczsun
bafad1189b ProgressingKitManager: Temporarily add finally 2016-10-19 22:38:39 -04:00
samczsun
38ef65c32e Fix memory leak in ItemSnowball 2016-10-19 22:38:39 -04:00
samczsun
2ed03147b0 Make WinEffectGadget clean up even if exceptions occur 2016-10-19 22:38:39 -04:00
samczsun
5168044be5 Fix memory leak in WinEffectHalloween 2016-10-19 22:38:39 -04:00
samczsun
d2c0b34459 PlayerMap 2016-10-19 22:38:39 -04:00
samczsun
09fe7b736a Don't enable debugging 2016-10-19 22:38:39 -04:00
samczsun
bcb56c50f5 Fix memory leak in AntiHackGuardian 2016-10-19 22:38:39 -04:00
samczsun
25d6a4239e Fix memory leak in StatsManager, CombatManager 2016-10-19 22:38:39 -04:00
samczsun
2b6d7a4d7a Fix memory leak in ParticleFairy 2016-10-19 22:38:39 -04:00
samczsun
a59dde44c6 Remove recharge data on quit instead of later 2016-10-19 22:38:39 -04:00
samczsun
19eeae7f7f Fix memory leak in ParticleFoot 2016-10-19 22:38:39 -04:00
samczsun
6f80e21372 Fix memory leak in carl, server 2016-10-19 22:38:39 -04:00
samczsun
bd9aa38afa Make DisguiseManager clean up after lazy callers 2016-10-19 22:38:39 -04:00
samczsun
a338fb27d3 Various memory leak fixes 2016-10-19 22:38:39 -04:00
samczsun
b3ed9db2c7 Fix memory leak in ProgressingKitManager 2016-10-19 22:38:39 -04:00
samczsun
c00502d91f Fix memory leak in WinEffectPodium 2016-10-19 22:38:39 -04:00
samczsun
894e6b4a89 Fix memory leak in CombatLogNPC 2016-10-19 22:38:39 -04:00
samczsun
0cbd4a9de2 Fix memory leak in Teleport 2016-10-19 22:38:39 -04:00
samczsun
dbd5203e9d Fix memory leak in ParticleFreedom 2016-10-19 22:38:39 -04:00
AlexTheCoder
6719f11358 Fix playwire command not requiring console to use it 2016-10-19 22:36:03 -04:00
AlexTheCoder
13220e267c Re-enable animation 2016-10-19 22:36:03 -04:00
AlexTheCoder
16b195d2ab Make playwire-given carl spin tickets update while the player is logged in 2016-10-19 22:36:03 -04:00
AlexTheCoder
2e280d62de Block rain on the support server 2016-10-19 22:35:17 -04:00
AlexTheCoder
6d9d42cfdd Allow pets to be given from the support server 2016-10-19 22:35:17 -04:00
Alexander Meech
60fad6316b Ensure command used is actually /pumpkin 2016-10-19 20:59:12 -04:00
AlexTheCoder
26baf6aa67 Make Halloween pumpkins actually drop gems and shards in Block Hunt and Minestrike 2016-10-19 20:59:12 -04:00
AlexTheCoder
55b37e0261 Fix players being able to log in multiple times via different bungees 2016-10-19 20:58:05 -04:00
xGamingDudex
db9f358718 Increase Angry Heard durration 2016-10-20 02:01:40 +02:00
xGamingDudex
59712b4089 Prevent multiple abilities from dealing damage and knockback on teammate 2016-10-20 02:01:23 +02:00
xGamingDudex
21d004b3f2 Make the skelleton kit deal static 6 damage for arrows 2016-10-20 02:00:30 +02:00
xGamingDudex
6851a20e92 Fix /lives debug command 2016-10-20 02:00:01 +02:00
xGamingDudex
0d688534b1 Reduce slime smash durration 2016-10-20 01:28:25 +02:00
xGamingDudex
33a7deed58 Tweaked witch daze potion damage 2016-10-20 01:27:43 +02:00
xGamingDudex
74d6c599b5 Fixed snowman turret targeting team mates 2016-10-20 01:27:22 +02:00
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
LCastr0
225f5c6b7c Internal: 
- Removed Win room test command
 - Fixed spelling error in MountSpider
 - Changed MountChicken so it can now jump
 - Still working on the Sleigh morph
 - Added Wind Up Suit for testing
 - Removed unused code from MountSpider

External:
 - Added Sleigh Morph (Still need some work on it)
 2016-10-19 18:44:57 -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
Keir Nellyer
db0bfece23 Prevent re-saves from un-aborting user reports 2016-10-16 23:23:55 +01:00
xXVevzZXx
3ebe1a837f Fix some bugs, improve Skyfall and add Skyfall Teams 2016-10-16 14:30:11 +02:00
Keir Nellyer
3db7e27ecd Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/report-improvements 2016-10-15 15:23:26 +01:00
xGamingDudex
35c9d2ecb1 Tweaked damage/KB values and fixed text issues 2016-10-15 14:56:38 +02:00
Keir Nellyer
1ab646bbda Fix error message colouring when there are no reports to handle 2016-10-14 19:14:50 +01:00
Keir Nellyer
64bb01c92f Move /reportabort functionality over to the /reportclose gui 2016-10-14 19:14:35 +01:00
Keir Nellyer
28603ec8c5 Remove resolved TODOs 2016-10-14 18:47:25 +01:00
Keir Nellyer
4b4dc74cbf PC-1000 Token column is now 8 characters 2016-10-14 16:29:04 +01:00
Keir Nellyer
b6bda9418d PC-1000 Make all token related things work together 2016-10-14 16:28:42 +01:00
cnr
8e7ae7f55f Make Power Play status clearer on support server 2016-10-14 00:26:33 -05:00
cnr
8ebad90f52 Don't lock current month's cosmetic on resub day 
This fixes an issue where a player might lose the current month's
cosmetic on the date of resubscription until his/her payment method was
charged
 2016-10-14 00:26:33 -05:00
cnr
0e5d8cc785 Replace pumpling spawn flicker with short glow 2016-10-14 00:25:55 -05:00
Keir Nellyer
3b7169ad3d PC-1000 Implement token generating method 2016-10-14 01:14:51 +01: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
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
Keir Nellyer
03e219f552 Add header to /reportstats and further improvements 2016-10-13 02:15:49 +01:00
Keir Nellyer
2e16eef5d9 Make /reportstats work with offline players and other small improvements 2016-10-13 01:18:23 +01:00
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
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