Commit Graph

7214 Commits

Author SHA1 Message Date
xGamingDudex 9fca9283e2 Fixed skin layers for Player/Human disguises 2016-05-05 10:39:00 +02:00
LCastr0 d0e7590b2a Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-04-26 23:23:45 -03:00
LCastr0 a7ef8bec49 Adds new constructor to NotePlayer, to be able to send the song to specific players
Some WindUp costume fixes
Added actionbar and song to WindUp suit
Created new booster manager
2016-04-26 23:21:59 -03:00
xGamingDudex 38d03b8468 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-04-27 00:03:29 +02:00
xGamingDudex 79f210e242 Schematic and WinEffect update
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
2016-04-27 00:01:30 +02:00
LCastr0 f0cfac8e73 Merge pull request #31 from Mineplex-LLC/develop
Merge from develop
2016-04-24 23:15:36 -03:00
LCastr0 28de514d1a Adds some utils for UtilColor
Small changes in Wind Up suit
2016-04-24 21:39:35 -03:00
md_5 807b12e846 Fix TnT datawatcher 2016-04-25 10:38:01 +10:00
md_5 d8f7301e69 Update to latest Spigot 2016-04-25 10:29:17 +10:00
LCastr0 491c509317 Added UnlockCosmetics command (/unlockCosmetics <type>)
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
2016-04-23 22:16:02 -03:00
cnr c7970d1bd0 Prevent super paintball spectators from reviving teammates. Fixes PC-103 2016-04-22 19:48:03 -05:00
xGamingDudex ccd630e2ae Leftovers from merge 2016-04-23 00:56:19 +02:00
xGamingDudex b7099088a9 Merge remote-tracking branch 'origin/develop' into project-cosmetics
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
Jonathan Williams fe0cee65e8 Added gem and coin rewards back into bonus. 2016-04-22 05:33:25 -05:00
Jonathan Williams 260c617007 Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop 2016-04-22 05:12:30 -05:00
Jonathan Williams e28621ae26 Set oldElo equal to new elo on new row. 2016-04-22 05:04:13 -05:00
AlexTheCoder 2a4c3209b4 - Enable ELO 2016-04-22 05:44:56 -04:00
AlexTheCoder 70541fd6f2 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-22 05:41:24 -04:00
Jonathan Williams d73b720323 Merge branch 'features/elo' into develop 2016-04-22 04:34:35 -05:00
Jonathan Williams 477acf044e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-22 04:34:21 -05:00
Jonathan Williams 6db7e648f5 Don't insert new row if the update doesn't succeed because of elo mismatch on loss. 2016-04-22 04:20:59 -05:00
Jonathan Williams 7b18efa7b0 Prevent farming elo up with multiple games by dc and joining new game. 2016-04-22 04:05:07 -05:00
Jonathan Williams ddd1c5af9b Removed EloSettings and fixed scoreboard. 2016-04-22 03:10:09 -05:00
Jonathan Williams 34f94c0381 Reverted scoreboard because of MC maxlines turd nugget. 2016-04-22 02:55:27 -05:00
Jonathan Williams a31eccc15b Multiply new rating by team size. MIssed that undo! 2016-04-22 02:53:02 -05:00
Jonathan Williams 4577cf0398 Fixed scoreboard :D 2016-04-22 02:47:48 -05:00
Jonathan Williams 7cc4811ede Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo 2016-04-22 02:39:35 -05:00
Jonathan Williams f922be51fe Scoreboard tweak. 2016-04-22 02:39:08 -05:00
AlexTheCoder 04fe30df43 - Fix sb 2016-04-22 03:38:20 -04:00
AlexTheCoder 5e255fc4ed Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 03:36:21 -04:00
Jonathan Williams 757c945320 Added in kFactor ratio application to rating delta. 2016-04-22 02:35:37 -05:00
AlexTheCoder 03bdc8d2db Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 03:17:54 -04:00
Jonathan Williams b69a75355c Fixed scoreboard alignment. 2016-04-22 02:17:40 -05:00
Jonathan Williams aa6d25139f Tweaked elo for team games. 2016-04-22 02:04:57 -05:00
AlexTheCoder b1c05e2ed0 Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 02:12:02 -04:00
Jonathan Williams 776093288a Fixed rating not setting in EloPlayer constructor. 2016-04-22 01:11:48 -05:00
AlexTheCoder 2d2c8858e6 Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 02:06:55 -04:00
AlexTheCoder 1d3ad3c5fd - Enabled ELO for testing 2016-04-22 02:06:37 -04:00
Jonathan Williams 977fbe684a Fixed elo query. 2016-04-22 01:06:33 -05:00
Jonathan Williams 44d4255628 Added endElo in the appropriate spots. 2016-04-22 00:58:07 -05:00
Jonathan Williams 6d00e8b41f Refactored Elo to work correctly. 2016-04-22 00:21:11 -05:00
AlexTheCoder d0e3b094c1 - cleaned up and prepped for live update 2016-04-21 20:57:35 -04:00
Shaun Bennett 86df07123c Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:54:20 +10:00
Shaun Bennett e46798f20e Fix NPE in AdminCommand from IncognitoManager being null 2016-04-22 10:49:34 +10:00
AlexTheCoder e55bec505b - Fix players ending up teleported back to arena due to broken respawn engine 2016-04-21 20:13:39 -04:00
AlexTheCoder df55d48ab8 - Looks better 2016-04-21 01:03:14 -04:00
AlexTheCoder d57cc48f0f - Added new features! 2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr. f86b18b603 Elo Works Now
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
cnr 2d02d79cec Fix survival games' Beastmaster wolf spawning
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
2016-04-20 18:45:54 -05:00
Joseph Prezioso Jr. 2d45ab61cc Elo re-calculated
Elo is now being incremented more consistently (and not multiple times)
2016-04-20 15:48:27 -04:00