Commit Graph

6965 Commits

Author SHA1 Message Date
Shaun Bennett 012edfed45 Use loaded schematics to display fountain progress 2016-05-18 18:04:21 +10:00
Shaun Bennett 8d7ef7cc9a Fix UtilBlock setting ghost blocks 2016-05-18 18:03:54 +10:00
Shaun Bennett e3833b95ad Update Gem Fountain purchase gui 2016-05-18 15:59:04 +10:00
Shaun Bennett b802cdec6d Rename shop to "Fountain Keeper" 2016-05-14 14:01:28 +10:00
Shaun Bennett 93c2886601 Add boosters to inventory menu 2016-05-06 13:31:59 +10:00
Shaun Bennett 184d247fc9 Start adding BoosterPage. Move Boosters to core to support UI's 2016-04-29 17:37:34 +10: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
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
cnr c7970d1bd0 Prevent super paintball spectators from reviving teammates. Fixes PC-103 2016-04-22 19:48:03 -05: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
Shaun Bennett 8a5fdccb60 Add to fountain button 2016-04-22 11:26:05 +10: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
Shaun Bennett 435d3968a2 Fix Fountain string being changed to Counter from refactor 2016-04-21 19:46:20 +10:00
AlexTheCoder df55d48ab8 - Looks better 2016-04-21 01:03:14 -04:00