Commit Graph

10914 Commits

Author SHA1 Message Date
Sam 8c821af9de Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-08 02:09:24 +01:00
cnr 7cc7769378 Send gem hunters players to normal hub upon cashout 2017-06-07 18:26:56 -05:00
Kenny Goodin 83f6b4fa1d Fill in actual quest rarity weights 2017-06-07 02:18:37 -05:00
Sam 697d4a11ed Fix the Quest achievement looking for the wrong stat 2017-06-06 23:00:17 +01:00
Sam 8f87578a57 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-06 19:28:54 +01:00
Sam a63399943d Leaderboards and UFO world event 2017-06-06 19:28:41 +01:00
Sam 4a91d2821b Achievements 2017-06-05 20:57:30 +01:00
cnr 629ced569c Fix treasure location comparison between worlds 2017-06-05 11:52:44 -05:00
cnr 347cddccc0 Use UUID in enjin commands instead of name 2017-06-03 14:22:04 -05:00
Sam c3f3d71610 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-03 14:53:34 +01:00
Sam 674253c89a Gen Hunters Title 2017-06-03 14:53:33 +01:00
Sam 092c5db6b2 Merge remote-tracking branch 'refs/remotes/origin/update/gem-hunters-11-5' into update/gem-hunters 2017-06-02 20:10:51 +01:00
Sarah 844052c0c6 Async db calls... 2017-06-02 07:05:23 -05:00
Alexander Meech 62d15eeee1 Make podium generation setting based on map rather than hardcoded server group 2017-06-02 02:42:21 -05:00
Dan Mulloy abaaaebd43 Use "Coming soon!" instead of empty string 2017-06-02 00:04:47 -05:00
Dan Mulloy 414573c18d Make Carl more robust, print better warnings when he breaks 2017-06-02 00:02:00 -05:00
cnr 2701476ea8 Merge branch 'feature/quests' into develop 2017-06-01 21:47:38 -05:00
Sarah 73897e407b Add fix for new game lobbies 2017-06-02 03:41:06 +02:00
Sarah 4b54232514 make slime not go small 2017-06-02 02:21:13 +02:00
Sarah 0c6fcba21f Improve NPC visuals 2017-06-02 02:00:20 +02:00
cnr b6a1a3a054 Only request quests once on startup 2017-06-01 17:29:42 -05:00
Kenny Goodin cea9b00b68 Subscribe to quest request channel before requesting from daemon 2017-06-01 18:27:02 -04:00
cnr 60a696a82e Subscribe to response channel before requesting quests 2017-06-01 17:25:30 -05:00
Sarah b823fc62c9 Fix quests not disappearing after completing 2017-06-02 00:03:34 +02:00
Sarah aaf4be1dc2 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:59:53 +02:00
Sarah 9b64f5da66 change quest name to "Mineplex Mission" 2017-06-01 20:59:35 +02:00
Kenny Goodin 2f1f7a1e7d Debug quest supplier 2017-06-01 14:59:22 -04:00
Sarah 9bfa586f61 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:16:08 +02:00
Sarah 3c5f8bf72d add names to quests in the stats gui, add different reward colors, properly remove "next Page" and "Previous Page" buttons from stats page 2017-06-01 20:15:39 +02:00
Alexander Meech 01e7dc85dd Merge branch 'develop' into feature/quests 2017-05-31 22:21:24 -04:00
cnr 921aaea5bd Disable Toggle check from the plugin side until tomorrow 2017-05-31 21:16:58 -05:00
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
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