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

4314 Commits

Author SHA1 Message Date
Shaun Bennett
cbc9aeedc6 Report Feature Improvements (#269) 
Report Feature Improvements
 2016-11-16 22:52:14 -05:00
Sam
22b7ce60eb For sam 2016-11-17 02:56:58 +00:00
AlexTheCoder
0070fed6c7 Fix playwire multithreading and convert to new 5-ticket per 24-hour system 2016-11-16 21:42:47 -05:00
Sam Sun
4709161180 Attempt to fix CTF Proxies (#280) 2016-11-16 21:40:42 -05:00
md-5
735550c157 Use Mineplex Pair Util Class in Halloween 2016 (#274) 
JavaFX is not included in OpenJDK.
 2016-11-16 20:29:33 -05:00
Sam
8d6eb13504 Add "%player% is your teammate" in 2 player team games (#273) 
* Add "%player% is your teammate" in 2 player team games

* Add to Team Skyfall
 2016-11-16 20:10:16 -05:00
Sam
51c7801a9f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-15 20:01:21 +00:00
cnr
70ca2c7964 Add 1.11 support 2016-11-15 13:58:31 -06:00
Sam
faba1f2369 Forgot the actual UHC class... 2016-11-13 12:35:48 +00:00
Sam
efc73d220f Change how UHC handles time 2016-11-13 12:35:38 +00:00
Sam
07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00:00
Sam
aa4ef9f4ad Big bugs 2016-11-12 21:50:38 +00:00
Keir Nellyer
6e5db69b0c Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-10 13:52:44 +00:00
Sarah
e71187aa33 Add new Brawl Games (#260) 
* add more Brawl games

* fix some bugs in new brawl games

* fix even more bugs

* Fix some super paintstrike bugs

* Add some Javadoc
 2016-11-09 20:38:49 -05:00
Nate Mortensen
3b83a9bdc3 Reformat Block Hunt 2016-11-08 10:44:39 -05:00
Nate Mortensen
6db79c3ca5 Remove disguises when players switch to Seeker 2016-11-08 10:44:39 -05:00
Nate Mortensen
0607355ee0 Prevent cloaked players from having their visibility reset 2016-11-08 10:44:39 -05:00
Nate Mortensen
e3b701f948 Don't give infestors an initial disguise 2016-11-08 10:44:39 -05:00
Sam
6a9648e646 Solo Mode and Faster UHC 2016-11-05 11:06:12 +00:00
xXVevzZXx
af7de62ff7 Fix non upgradeable perks being not unregistered 2016-11-04 06:02:13 -05:00
Keir Nellyer
407ec0d924 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-03 20:11:21 +00:00
Nate Mortensen
f587445ffc Remove extraneous horses when the game ends 
When players using the horseman kit win a game,
they never die, which is the only time that spawned
horses are removed.  To fix this, at the end of the
game all horses belonging to players that have survived
are explicitly removed, which removes all remaining horses.
 2016-11-02 17:01:17 -04:00
LCastr0
9267a36528 Disable Halloween 2016 (#261) 
* Removed all the halloween related items:
 - Haunted chests can only be opened if player already had ammo
 - Removed Halloween theme from the hub
 - Removed pumpkins from in-game

* Added Halloween items to the Omega Chest

* Fixed weight for items in the omega chest

* Changed Disk to Disc in RewardManager
Changed values for omega rarities

* Final commit (removed win room test command)

* Removed Halloween words from Draw My Thing and Master Builders
 2016-11-02 16:49:31 -04:00
Sarah
afac2aea3f Skyfall Update (#262) 
* Fix some bugs, improve Skyfall and add Skyfall Teams

* re-enable debug

* Fix Perks not being unregistered from the EventHandler

* Remove unused import

* Remove unused imports
 2016-11-02 16:48:44 -04:00
Sam
b122fba97e Fix arrows not getting removed! 2016-11-02 16:48:01 -04:00
samczsun
07c93606f8 GameChatManager: Check if the game exists 2016-10-28 17:57:25 -04:00
samczsun
873e93747e HolidayManager: Fix CME 2016-10-28 17:57:25 -04:00
samczsun
49c5df6e68 Parties: Check if target is null before inviting 2016-10-28 17:57:25 -04:00
samczsun
1d961c7d81 GamePlayerManager: Don't load kits if offline 2016-10-28 17:57:25 -04:00
samczsun
d2a2fdfd46 UHC: Fix NPE 
Players who joined after the gamestate has been set to PREPARE
should not be considered as in the game
 2016-10-28 17:57:25 -04:00
samczsun
a729b03ce7 UtilParser: Handle null lastDamageCauses 2016-10-28 17:57:25 -04:00
samczsun
0c1f6cbedc Rewrite CombatLogModule 2016-10-28 17:57:25 -04:00
samczsun
70ed2e4fbb CompassModule 
Integrate with CombatLogModule
 2016-10-28 17:56:46 -04:00
samczsun
e8becf3819 Op on dev servers too 2016-10-28 17:56:08 -04:00
samczsun
e7b744f527 UHC rewrite 2016-10-28 17:56:08 -04:00
Keir Nellyer
4b3cadbb5a Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
 2016-10-27 23:53:32 +01:00
Shaun Bennett
f06325d972 Super Smash Mobs Update (#243) 
Update/ssm
 2016-10-26 22:03:43 -04:00
Keir Nellyer
f5a81f083e Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-26 10:28:13 +01:00
cnr
44e016f272 Fix infinite loop in GameWorldManager 2016-10-25 01:44:07 -05:00
xGamingDudex
eaee382e7f Small typo 2016-10-23 16:22:27 +02:00
xGamingDudex
c0ec1e1ff7 Prevent infinite speed effect on creeper 2016-10-23 03:11:51 +02:00
xGamingDudex
7b7b7aadf8 Fix a notorious XP bug in the wolf kit 2016-10-23 01:28:57 +02:00
xGamingDudex
1a847862d5 Prevent sometimes duplicate usage of the snowman smash 2016-10-23 01:28:04 +02:00
xGamingDudex
4531902adc Prevent guardian abilities from affecting team mates 2016-10-23 01:27:34 +02:00
xGamingDudex
0306d0d9d1 Fix chicken rocket to deal damage and knockback 2016-10-23 01:27:09 +02:00
xGamingDudex
2d0d78e1b7 Prevent snowman smash from affecting self, and give 3 snowmen 2016-10-22 21:28:11 +02:00
Keir Nellyer
e0d05d3c87 PC-1140 Keep reports region-separated 2016-10-22 15:06:18 +01:00
xGamingDudex
295f1f255f Fixed rare NPEs 2016-10-22 13:09:56 +02:00
xGamingDudex
720e965d08 Fixed chicken rocket. 2016-10-22 10:49:21 +02:00
xGamingDudex
4e433665cc Fixed golem smash affecting team mates 2016-10-22 10:49:02 +02:00
xGamingDudex
8414a17978 Don't apply velocity to team mates 2016-10-22 10:48:36 +02:00
xGamingDudex
d2be1fc646 Don't set team mates on fire on direct fireball hit 2016-10-22 10:48:09 +02:00
xGamingDudex
1ae89adfb0 Remove debug messages 2016-10-22 09:40:06 +02:00
xGamingDudex
cfd2343f0e Fixed zombie perk Deaths Grasp 2016-10-21 16:51:47 +02:00
xGamingDudex
b8c474a92d Fixed daze potion 2016-10-21 16:51:29 +02:00
xGamingDudex
bcfdfd4619 Added better team mate detection for team super smash 2016-10-21 16:51:16 +02:00
xGamingDudex
ff1d29bd2e Apply wool bomb damage to self in team games 2016-10-21 01:37:14 +02:00
xGamingDudex
70d554fa2d Fixed witch daze potion 2016-10-21 01:12:02 +02:00
xGamingDudex
ca0f36d142 Prevent armorstand used by laze to block projectiles 2016-10-21 00:55:44 +02:00
xGamingDudex
45c5ba66bd Prevent multiple perks from affect team mates and cleaned up some code 2016-10-21 00:55:18 +02:00
xGamingDudex
c8edc2d01e Rewrote daze potion damage calculations 2016-10-21 00:54:04 +02:00
xGamingDudex
6a6a589cb7 Fixed wolf cub sometimes not being removed 2016-10-21 00:25:37 +02:00
xGamingDudex
db3106d8a4 Prevent golem fissure from effecting team mates 2016-10-20 23:20:26 +02:00
xGamingDudex
d26103d321 Increase Whirlpool damage 2016-10-20 23:20:02 +02:00
xGamingDudex
d42a5f1897 Prevent Chicken Rocket from resetting cooldown when hitting team mates 2016-10-20 23:13:32 +02:00
xGamingDudex
08b7b7cb48 Removed unused files. Move wool bomb patch to correct file 2016-10-20 23:11:55 +02:00
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
samczsun
bafad1189b ProgressingKitManager: Temporarily add finally 2016-10-19 22:38:39 -04:00
samczsun
09fe7b736a Don't enable debugging 2016-10-19 22:38:39 -04:00
samczsun
b3ed9db2c7 Fix memory leak in ProgressingKitManager 2016-10-19 22:38:39 -04:00
samczsun
894e6b4a89 Fix memory leak in CombatLogNPC 2016-10-19 22:38:39 -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
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
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
cnr
0e5d8cc785 Replace pumpling spawn flicker with short glow 2016-10-14 00:25:55 -05: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
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
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
Sam
2b124cb16c I have really lost track on what I'm doing... 2016-10-09 12:24:49 +01:00
Sam
28a2a8c098 More from GI testing 2016-10-08 11:14:55 +01: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
Shaun Bennett
a6727bf104 Halloween Fixes/Prep 2016-10-05 22:57:44 -04: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
46db80a056 Always check game object is not null before attempting to access it (#225) 2016-10-04 15:32:04 -04: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
Sam
4e9cf4dbb4 More fixes 2016-10-03 19:45:15 +01:00
Sam
668abad83a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-01 15:49:10 +01:00
Sam
4bfc632fd5 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-01 15:45:05 +01:00
Sam
36c26c0b2c Fix MineStrike Issues (#222) 
* Check if the costume is null before doing anything.

* Disable entity specing
 2016-09-29 23:37:41 -04:00
Sam Sun
81070eac62 Plug up memory leaks in IdleManager (#224) 
Somehow, IdleManager was keeping Player references loaded
despite having removed them on PlayerQuitEvent.

This may be because of the runnable scheduled for 5 ticks after a teleport
which would insert players after they quit.

In any case, this was keeping entire worlds loaded in UHC. Pretty bad.

Moral of the story? Use UUIDs!
 2016-09-29 23:29:53 -04:00
Timothy Andis
7d4c817856 Game Lobby/Playwire/Command Fixes (#223) 
* Tweak team locations to accommodate MPS'
Disable certain commands from being used.

* Change PlayWire things.

* Update MPS locations.

* Update.

* Remove debug

* Remove debug. Ty Sam
 2016-09-29 23:00:26 -04:00
Sam
22f8a1496a Guardian fixes 2016-09-29 22:44:03 +01:00
Shaun Bennett
9d6985ddcd Fix MPS zip file name, null amp stand 2016-09-29 09:10:25 -04:00
Shaun Bennett
b3d8c72953 Add Game Lobby world settings (#220) 2016-09-29 00:22:42 -04:00
Shaun Bennett
7ff6e33941 LegacyGameLobbyManager bug fixes 2016-09-28 23:05:02 -04:00
Timothy Andis
620e219b14 Change MPS world zip (#219) 
* Change MPS map name
 2016-09-28 21:32:51 -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
Sam
c4e36b2269 Moppletop's September Bug Sprint (#214) 
* Earth Cost issue

* Instances of "Tip" to "Thank"

* PC-930

Fix an infinite loop when the game ends.

* PC-959

Fixes an issue where people could spam drop grenades.

* PC-668

Cosmetic Set bonuses no longer carry into MS games

* Changes metal's passive

Metal's passive is now that it gains 0.5 hearts per armor piece. This
avoids the problem of being unkillable
 2016-09-27 21:11:49 -04:00
Sam
78e6f3bf71 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-27 19:02:56 +01:00
Sam
68c62acb00 Guardian changes 2016-09-27 19:02:54 +01: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
Sam
96e1e944e1 Addition of the GWEN kit and a billion other things 2016-09-25 22:32:23 +01:00
Keir Nellyer
42ea7f85af Remove un-required tab changes 2016-09-25 01:36:23 +01:00
Sam
f8a135cf50 Full system conversion 2016-09-25 00:56:06 +01:00
Sam
315a50aa16 Whoops 2016-09-24 21:34:45 +01:00
Sam
baafa62713 Just more converting 2016-09-24 21:09:25 +01:00
Sam
f5a7f35d94 More kits 2016-09-23 18:58:14 +01:00
samczsun
187c6ec67c Remove debug messages 2016-09-22 21:25:40 -04:00
Sam
f6acedba5f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-22 17:11:25 +01:00
Sam
2ba2b21577 Progress on converting SSM to a new cleaner system 2016-09-22 17:11:21 +01: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
a3d210871d Add ignored checks to GWEN (#211) 2016-09-21 23:21:02 -04:00
Shaun Bennett
e15804fc15 Prevent players from joining 1.9+ games with 1.8 clients (#212) 2016-09-21 23:19:55 -04:00
Shaun Bennett
9be26a92d1 Remove NCP 2016-09-21 22:21:49 -04:00
Sam
ac967f6b18 OITQP no longer in Beta (#210) 
* Convert OITQP into a module based system.

* More magic modules

* Achievements and Stats

* Achievement menu update

* Removed some Util methods I added that were never used.

* Missed a few things

* To Alex, Love Sam

* Gem and achievement kits
 2016-09-21 22:05:21 -04:00
Sarah
c1c46aceb8 Skyfall Game(#208) 
* basic prototype of the game Skyfall

* new crumble mechanic

* Developing basic game with basic mechanics and basic kits.

* Fix merge issues

* Add Supply Grop and Deathmatch and change map crumbling

* Make cosmetical changes for QA and add Stat Trackers and Achievements

* Add version requirement

* Change scoreboard layout

* Dont crumble the first island, but the islands over the spawn points

* Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava

* Unused imports

* Fix kit description, modify island crumbling and add ring damage

* Revert to normal crumble values

* Add Javadoc

* Remove more unused imports

* Check for material data on ring generation

* Add Block effect for Booster Ring recharge

* Unused imports...

* Add Elytra removal message and countdown

* "Fix" food issues and some other minor things

* Add chest refill to scoreboard from beginning

* Fix supply drop

* Unused imports.....

* Re-enable Anti Cheat

* Add java doc, remove system messages and add exeptions

* The end of the great label debate

* Fix method naming conventions

* Remove more labels

* Disable Booster kit
 2016-09-21 21:57:38 -04:00
samczsun
92a0d606d4 Fix timings 2016-09-21 21:37:57 -04:00
samczsun
ec4add259d Teleport players back to center of arcade lobby 2016-09-21 21:37:57 -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
Sam
209ea32ef9 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-20 09:18:20 +01:00
Keir Nellyer
2cdab061b6 PC-886 Move report bans over to punishment gui 2016-09-16 17:40:14 +01:00
Keir Nellyer
ebe212c8ff Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-15 17:30:27 +01:00
Alexander Meech
93c227a22d Change Mavs Basketball to 5 Minutes (#201) 
* Update ScoringManager.java
* Update Basketball.java
 2016-09-14 20:49:24 -04:00
Sam
1458cb84b9 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-14 20:14:05 +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
Sam
38473dcffd Fix metal taking too little damage with full iron (#203) 2016-09-10 22:47:52 -04:00
Shaun Bennett
e12ed35da1 Fix NPE and kit upgrades issue 2016-09-07 23:13:28 -04:00
Shaun Bennett
9318ba4de2 Merge branch 'develop' into bugfix/samczsun 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
 2016-09-07 20:12:57 -04:00
Sam
5bf35d49db Message inconsistancy 2016-09-06 21:38:43 +01:00
Sam
7a5a6c3d00 Fix duplicate message 2016-09-06 19:55:31 +01:00
samczsun
08090f5e06 PC-818 
Seismic Charges can no longer remove barrier blocks
 2016-09-05 18:25:16 -04:00
samczsun
11c97691a9 PC-937 
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
 2016-09-05 18:25:16 -04:00
samczsun
3aaa9b2514 Sort tab list properly 2016-09-05 18:25:16 -04:00
Sam
8ebaad4736 Beta ready commit 2016-09-05 17:59:49 +01: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
Sam
34ee62bdc3 Fix NPE 2016-09-03 20:32:10 +01:00
Sam
b3212fc003 Particle changes 2016-09-03 20:13:08 +01:00
Sam
4b1c93150b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 20:12:39 +01:00
Sam
8d5d0c6272 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 18:29:37 +01:00
Sam
fc0217f1fd More magic OITQ 2016-09-03 18:25:17 +01:00
Sam
e0424c78b2 Added spawn barrier 2016-09-03 18:24:56 +01:00
Sam
7eb148cc59 Ultimate colour change 2016-09-03 18:24:44 +01:00
cnr
374142e63f Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:42:51 -05:00
TadahTech
e2f974e1e6 Add sounds and messages to basketball. 2016-09-02 00:40:23 -05: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
9e0bb6ff96 Tweak invite starting index. 
Disable NextBestGame in an MPS
 2016-09-01 20:59:28 -05:00
TadahTech
d8486abbfd Fix minor best game issues. 2016-09-01 20:05:53 -05:00
TadahTech
a6360249b7 Use party if a player has it. 2016-09-01 08:47:43 -05:00
TadahTech
6f3d7dcd29 Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have 2016-09-01 08:45:43 -05:00
TadahTech
41936e0efc Remove users from the map. 2016-09-01 08:31:16 -05:00
TadahTech
fdc54e1dd1 Fix BestGame not cancelling for parties. 2016-09-01 08:29:51 -05:00
cnr
05f640266f Fix basketball scoring infinite loop 2016-09-01 06:36:47 -05:00
TadahTech
53846acbf6 Dont let Minestrike use NextBestGame 2016-09-01 05:39:47 -05:00
TadahTech
46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
Sam
57292414c6 Gems for winners 2016-08-31 22:55:13 +01:00
Sam
0b7fdc01eb Initial balence change 2016-08-31 16:30:50 +01:00
Sam
6a139d5c55 Tiny code improvement 2016-08-31 13:28:48 +01:00
Sam
7599630328 Pyromancer Ultimate name change 2016-08-31 13:27:07 +01:00
Sam
8d222aafec Fix increasing loop in Overtime 2016-08-31 13:26:54 +01:00
Sam
1bfebf358f Add Overtime 2016-08-31 12:07:50 +01:00
Sam
b1faecea49 Kit Fire incorrect values 2016-08-31 12:07:25 +01: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
TadahTech
a68f7395e4 Use proper server group / remove testing. 2016-08-30 00:10:38 -05:00
TadahTech
94bfc9aa15 Use proper server group / remove testing. 2016-08-29 22:33:01 -05:00
TadahTech
39ea280098 NextBestGame code and new hub releases 2016-08-29 20:21:36 -05:00
Alexander Meech
464c9fcdc3 Update steal chance 2016-08-29 20:37:02 -04:00
Sam
7a3ce9813c Payload (OITQ) 2016-08-29 23:08:04 +01:00
Sam
9454e1f409 Skywars and Kit Progression 2016-08-29 23:07:48 +01:00
Sam
ec8ed76270 Convert old perks to new perks 2016-08-28 09:06:07 +01:00
Sam
88f4813534 Perk related issue 2016-08-28 09:05:49 +01:00