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
Thanos Paravantis
38769d9616
Add missing tracker classes
2016-04-25 23:01:41 +03:00
Thanos Paravantis
d945bfa17a
Fix array out of bounds on veteran tracker
2016-04-25 23:01:17 +03:00
Thanos Paravantis
d0336be7b7
Add new achievements and modify current ones
2016-04-25 22:59:24 +03:00
Thanos Paravantis
41ef1a757c
Prevent null winner on veteran tracker
2016-04-25 18:03:25 +03:00
Thanos Paravantis
7c92971346
Remove new thread and use bukkit runnable only
...
Previously, a new thread was created to display the description
of a challenge. Instead of creating a new one, only a single
bukkit runnable is now created. With that change, when the challenge
is skipped, the correct description will show up instantaneously.
2016-04-25 18:00:37 +03:00
Thanos paravantis
a6bf059e6c
Modify challenge names and challenge intro titles
2016-04-25 12:47:55 +03: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
Thanos paravantis
c214431cbf
Move and rename stat trackers
2016-04-24 22:44:42 +03:00
Thanos paravantis
856eb6059b
Update statistics and implement data tracker
2016-04-24 22:39:56 +03: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
Thanos paravantis
e2a6500bce
Update game achievements
2016-04-24 13:37:39 +03: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
Thanos paravantis
bfabfab2d1
Fix circle spawn locations
2016-04-24 00:27:39 +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
Thanos paravantis
c526c86813
Add notes to fix recent bugs
2016-04-22 23:26:53 +03:00
Thanos paravantis
fa75bc15ad
Merge branch 'develop' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-04-22 22:03:15 +03: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
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
