Commit Graph

1340 Commits

Author SHA1 Message Date
Shaun Bennett 99951bc573 Fix achievement typos 2014-08-26 04:20:33 -05:00
Jonathan Williams 5fdf466722 Fixed bug in server monitor.
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07: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 3eae26ef80 Updated Achievement Output 2014-08-26 18:03:29 +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
Chiss 7e7906865f Fixed some stats being added after send-off 2014-08-26 17:45:35 +10: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 86930de23e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java
2014-08-26 08:19:50 +10:00
Chiss 07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
CoderTim 933d32d8f8 Fixed team death/kills stats 2014-08-25 18:06:50 -04:00
CoderTim 9acc7d8496 Added team kill and death achievement trackers 2014-08-25 17:43:49 -04:00
CoderTim 4ce537a3a7 Fixed some NPEs and achievement bugs 2014-08-25 16:27:02 -04: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
Chiss 7669998ad3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-25 08:38:29 +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 23f6d0ae1a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-24 16:46:00 +10:00
Chiss 3f5cff3e21 Killing cheaters for a few things in bridges 2014-08-24 16:45:47 +10:00
CoderTim c89461628b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-23 16:00:26 -04:00
CoderTim fb90336d4e Finished stats/achievements 2014-08-23 16:00:15 -04:00
Chiss 642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00
Chiss 7348a26951 fixed damage dealt npe 2014-08-23 18:00:23 +10:00
Chiss af9bf0727a Fixed damage taken stat NPE
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
Jonathan Williams 70beb58bd6 Enabled debugging in Hub/Arcade 2014-08-23 01:49:48 -05:00
Jonathan Williams fd0c4745f8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-23 00:40:17 -05:00
Jonathan Williams 931cb5ece8 Removed MineKart code.
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
Chiss 0700b9df12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 15:04:55 +10:00
Chiss 3ec43f90e8 GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements 2014-08-23 15:04:43 +10:00
Jonathan Williams 3a47a161c5 Enabled snake parkour
Updated servermanager/serverNpcPage to handle free and beta timers.
2014-08-22 22:53:15 -05:00
CoderTim 4afafe2d51 Some stats fixes 2014-08-22 21:54:08 -04:00