Commit Graph

485 Commits

Author SHA1 Message Date
Shaun Bennett
5905ef5ef7 Treasure Stuff 2014-08-30 14:27:11 -05:00
Shaun Bennett
e52f6deab4 Merge remote-tracking branch 'origin/master' 2014-08-30 04:24:34 -05:00
Shaun Bennett
6a58b86a19 Don't display wins and losses to other players on Achievement Gui 2014-08-30 04:24:25 -05:00
Jonathan Williams
b07670f6af Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:04:32 -07:00
Jonathan Williams
1bd0209b39 Added multi-server tags for npcs
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
Chiss
41daba98c4 Background work for Minestrike
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
Chiss
1f6b9374eb disable le minestrike 2014-08-29 11:55:06 +10:00
Chiss
c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00
Jonathan Williams
409e2c6141 Tweaked menus for quick game, Cosmetic menu.
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
Jonathan Williams
526ca42add Fixed Gem booster problem.
FIxed stat problem.
2014-08-27 12:48:24 -07:00
Chiss
311711f2f0 Disabled fireworks for non-gadget enderpearls. 2014-08-27 15:24:10 +10:00
Chiss
9cde497a5c Fixed ethereal pearl text 2014-08-27 15:20:55 +10:00
Chiss
9439daa852 Fixed bug where spectators could trigger anti-cheat in bridges 2014-08-27 15:16:20 +10:00
Chiss
596bcbfae6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-27 14:23:01 +10:00
Chiss
da5f953212 Fixed BlockMorph leaving blocks behind when player was teleported. 2014-08-27 14:22:35 +10:00
Shaun Bennett
8439838328 After years of research and experimenting, we settled on an achievement icon 2014-08-26 19:01:59 -05:00
Shaun Bennett
78eee68592 Change achievement icons, fix another typo 2014-08-26 18:39:01 -05:00
Shaun Bennett
c04319345a Merge remote-tracking branch 'origin/master' 2014-08-26 17:41:07 -05:00
Shaun Bennett
507d356346 Fix last achievement typo 2014-08-26 17:40:58 -05:00
Jonathan Williams
232785a7dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 04:56:34 -07:00
Jonathan Williams
417d398195 Swapped Morph and Pet active slot.
Fixed a couple things on Staff server.
2014-08-26 04:56:23 -07:00
Shaun Bennett
99951bc573 Fix achievement typos 2014-08-26 04:20:33 -05:00
Jonathan Williams
064b0e8b36 Removed sheep mount and fixed up server monitor. 2014-08-26 01:31:57 -07:00
Chiss
81e92c0e8e changed wording in achi GUI 2014-08-26 18:24:20 +10:00
Chiss
6f1204c844 Set gem reward for all achievements 2014-08-26 18:20:33 +10:00
Chiss
ab29a5fa29 Fixed text output in Achi GUI for completed 2014-08-26 18:06:01 +10:00
Chiss
d62b59776f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 17:54:50 +10:00
Chiss
116fe496a8 Changed post game achievement output
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
Jonathan Williams
7a8ab5c96a Comment for weirdness. 2014-08-26 00:53:41 -07:00
Jonathan Williams
a4cf9e2f4b Fixed stat bugs. 2014-08-26 00:52:51 -07:00
Jonathan Williams
526b5c333a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4 Added Gem booster use. 2014-08-26 00:33:48 -07:00
Chiss
0546c9e175 Fixed so only Supply drop chests trigger achievement 2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8 Added Gem Rewards for Achievements 2014-08-26 17:10:20 +10:00
Jonathan Williams
162a86d4b2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
Jonathan Williams
b8b6c031cd Re-did and added a game to the quick game menu.
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
Chiss
95e7517a9e disabled debug cmd for rave suit 2014-08-26 16:17:38 +10:00
Chiss
8fc6013ff3 Disabled Chest GUI 2014-08-26 16:12:01 +10:00
Chiss
dd61077850 Added missing Achievements 2014-08-26 14:46:10 +10:00
Chiss
1b3e32ca26 Added Arcade Achievements 2014-08-26 14:42:17 +10:00
Chiss
f0e01aa257 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 13:42:54 +10:00
Chiss
28d523d696 Added Achievements 2014-08-26 13:42:42 +10:00
Shaun Bennett
905d4db6f1 Use emerald instead of bed 2014-08-25 21:32:30 -05:00
Shaun Bennett
2e0b074053 More achievement gui changes 2014-08-25 20:56:21 -05:00
Chiss
07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
Chiss
0e3cf67402 Some new cosmetics 2014-08-25 12:59:29 +10:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Shaun Bennett
ff441f2262 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Chiss
642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00