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

8080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Burns
b8d12c0c9d Small wording changes. 2016-04-27 20:04:36 +01:00
xXVevzZXx
1b5b18c9b2 Prevent exception while adding variables to gamemodes 2016-04-27 17:50:01 +02:00
xXVevzZXx
aa219ec3e5 Implement gamemode feature with modifiable variables and working on first moded games 2016-04-27 17:42:50 +02:00
AlexTheCoder
a16145479e - Disabled picking up lava 
- Leaving ranked matches temp bans players from rejoining them
 2016-04-27 03:18:44 -04: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
AlexTheCoder
6bf86a1550 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-26 10:17:01 -04:00
Shaun Bennett
41e2ea6490 Fix off by one error in GoalCounter 2016-04-26 16:20:14 +10:00
Shaun Bennett
714000163b Add messages when fountain is complete and resets 2016-04-26 16:19:27 +10:00
Shaun Bennett
4a8c38e1c8 Add fountain reset command 2016-04-26 15:33:52 +10:00
Shaun Bennett
cabf4c4c8b Add BlockProgressBar for Gem Fountain 2016-04-26 15:26:07 +10:00
Shaun Bennett
e8370579c0 Counter refactoring 2016-04-26 13:55:06 +10: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
Keir Nellyer
8969ec172b Merge branch 'feature/report' into feature/report-v2 2016-04-24 18:26:10 +01:00
Keir Nellyer
949f9ca712 Don't allow players to report themselves 
I left this to last minute to make testing easier, as with this check
 in place it means at least two players are required to test the report
 mechanism.
 2016-04-24 18:10:01 +01:00
Keir Nellyer
96aa5d1c4b Removed duplicate code 
Somehow this got duplicated and so therefore was causing compile time
 errors, might have been something to do with my git merge.
 2016-04-24 17:22:21 +01:00
Keir Nellyer
dab1f9485c Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-04-24 17:17:17 +01:00
Keir Nellyer
9df4dac023 Remove dead code 
This was left over from before I took over development of the report
feature.
 2016-04-24 17:16:36 +01:00
Keir Nellyer
713263214f Run ReportPurgeTask asynchronously 
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
 2016-04-24 17:15:12 +01:00
Keir Nellyer
57e9cd6e19 Add class headers and remove @author tags 
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
 2016-04-24 17:10:29 +01:00
Keir Nellyer
84f5bd2f31 Handle abusive report types 2016-04-24 16:51:01 +01:00
Shaun Bennett
a0fd852537 Move field to top of class in Game 2016-04-24 13:38:58 +10:00
Shaun Bennett
b21dfad12e Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2016-04-24 13:37:45 +10:00
Shaun Bennett
c60beec68c Implement Fountain GUI 2016-04-24 12:40:38 +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
phobia
b21939444c Some changes to error handlng for clans regions 2016-04-23 16:40:39 +10: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
AlexTheCoder
2f94b8cebc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-22 06:04:33 -04: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