Commit Graph

11137 Commits

Author SHA1 Message Date
Sarah
738090bb30 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 00:34:38 +02:00
Sarah
d7731d330c Do some visual adjustments, add back button to quest stats menu, remove quest from buy bar after completion 2017-06-01 00:34:21 +02:00
Kenny Goodin
1cf04592da Whoops, actually add the 'fail-safe' 2017-05-31 16:00:00 -04:00
Kenny Goodin
13ad590487 Reduce QuestDaemon log spam, add failsafe for when no active quests are loaded 2017-05-31 15:58:28 -04:00
Sarah
c355015041 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-31 21:51:25 +02:00
Sarah
5c8e6d84b0 Add increment command, Questtrackers, change some visuals, allow Quests to have multiple required items 2017-05-31 21:51:04 +02:00
Sam
8a9e113389 Improvements to the targetting system 2017-05-31 17:09:08 +01:00
Sam
70eec9e38c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:17:41 +01:00
Sam
edfadde239 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:05:13 +01:00
Sam
0edd2c8947 Feedback from testing 2017-05-31 13:05:06 +01:00
Kenny Goodin
ff12121926 Fix QuestDaemon command that didn't actually do anything 2017-05-31 02:35:16 -04:00
Kenny Goodin
028a4ecce3 Remove author tag 2017-05-31 02:15:23 -04:00
Kenny Goodin
ffdd82c34e Ignore quests in QuestDaemon process that have a cost of -1 2017-05-31 02:02:30 -04:00
cnr
6e2d39035d Add Bob Ross morph to PPC for June 2017-05-30 22:50:41 -05:00
Graphica
a87685eae0 Change color selector and put colors in order 2017-05-30 22:49:30 -05:00
Graphica
cf8109b3bd Add method for detecting bottom slabs to UtilBlock 2017-05-30 22:49:30 -05:00
Graphica
9c48919e42 Reduce paint time down to 30 seconds 2017-05-30 22:49:30 -05:00
Graphica
6b2a99a881 Make quotes be activated with a shift click 2017-05-30 22:49:30 -05:00
Graphica
a61c4cd816 Fix holograms not following players in 1.9+ 2017-05-30 22:49:30 -05:00
Graphica
98929f043f Make brush types varied and colored in player hotbars 2017-05-30 22:49:30 -05:00
Graphica
7baf3bad30 Clean up Hologram class code 2017-05-30 22:49:30 -05:00
Graphica
2c6112347a Add Bob Ross Morph 2017-05-30 22:49:30 -05:00
Kenny Goodin
b139d0550b Periodically purge expired elements from recently seelected quests repo 2017-05-30 20:36:39 -04:00
AlexTheCoder
2fc423306b Add appropriate starter level for multi-tiered achievements with level names to fix incorrect array length 2017-05-29 22:49:23 -05:00
cnr
b9af3a8dfb Sort CMA in the tab list next to Mod 2017-05-29 22:49:01 -05:00
Alexander Meech
e501982712 Update cma scoreboard id 2017-05-29 22:48:25 -05:00
Alexander Meech
f793539cc4 Allow cma to see freeze/unfreeze information 2017-05-29 22:48:25 -05:00
Alexander Meech
57f2f7b686 Give cma access to clans punishments 2017-05-29 22:48:25 -05:00
Alexander Meech
1adb4b8239 Give cma access to freeze 2017-05-29 22:48:25 -05:00
Alexander Meech
cd8e805435 Give CMA access to unfreeze 2017-05-29 22:48:25 -05:00
Alexander Meech
2895397aec Implement CMA rank 2017-05-29 22:48:25 -05:00
cnr
1a59c050d3 Disable Alien Invasion event 2017-05-29 22:45:54 -05:00
cnr
f1bad41e89 Revert "Enable double XP + gems + shards for the weekend"
This reverts commit aa271a1bd3.
2017-05-29 22:44:54 -05:00
Sam
c3a80ed0cb Fix pumpkin king's death not being logged properly 2017-05-29 12:40:18 +01:00
Sam
9e9bfe79de Pumpkin king boss 2017-05-28 16:27:54 +01:00
Sam
911fd030f3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-28 13:20:24 +01:00
cnr
e51818c15d Reduce alien shard reward to 5 per hit and make lobbies nighttime 2017-05-28 02:08:17 -05:00
Sam
18197de7be Correct operator... 2017-05-27 18:24:51 +01:00
Sam
5bdcd3474f Only give the chest once 2017-05-27 18:23:53 +01:00
Sam
b9ad85dd1e Pumpkin King boss 2017-05-27 18:19:14 +01:00
Sam
ffa2a736ec Give players an omega chest for completing the event 2017-05-27 17:03:52 +01:00
Sam
8f2c84b842 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 16:46:20 +01:00
Sam
8e87b1d3e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 13:55:36 +01:00
Sam
7705bd34a3 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/aliens 2017-05-27 01:05:04 +01:00
Sam
27d9233566 While we're at it, change the easter egg achievement requirement 2017-05-27 01:05:02 +01:00
Sam
4d4988577e Use a more sensible method of awarding shards 2017-05-27 01:01:16 +01:00
Sam
e3f678d71d Bugs 2017-05-27 00:56:38 +01:00
cnr
aa271a1bd3 Enable double XP + gems + shards for the weekend 2017-05-26 18:20:27 -05:00
cnr
4a7ca75b24 Open UFO event for the weekend 2017-05-26 18:08:24 -05:00
Sam
36733e9918 Fix gametype imports 2017-05-26 18:37:35 +01:00