Commit Graph

4468 Commits

Author SHA1 Message Date
cnr 347cddccc0 Use UUID in enjin commands instead of name 2017-06-03 14:22:04 -05:00
Sam dbde734e76 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-03 14:54:43 +01: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
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
Sarah b823fc62c9 Fix quests not disappearing after completing 2017-06-02 00:03:34 +02:00
Sarah 9b64f5da66 change quest name to "Mineplex Mission" 2017-06-01 20:59:35 +02: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
Sam 66b89d6e64 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-01 13:01:48 +01:00
AlexTheCoder 03d9032f82 Add backend system for saving/loading clans mounts with varied stats and skins 2017-06-01 02:16:12 -04: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 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
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
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 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
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
Sam 8f2c84b842 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 16:46:20 +01:00
Sam 27d9233566 While we're at it, change the easter egg achievement requirement 2017-05-27 01:05:02 +01:00
Sam e3f678d71d Bugs 2017-05-27 00:56:38 +01:00
Sam 36733e9918 Fix gametype imports 2017-05-26 18:37:35 +01:00
Sam d70cd38049 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-26 18:34:23 +01:00
Sarah b7ba532568 Add quest stats page, make rewards be able to be items as well, fix some quest trackers, fix spelling mistakes 2017-05-25 00:40:41 +02:00
Sam a134c1da5c Sign off changes 2017-05-24 19:19:52 +01:00
Sam 9df9fb80da Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-22 22:59:46 +01:00
Sam 92604bf6ad Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:36 +01:00
Sam 1db7454e81 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:19 +01:00
cnr 85993053aa Fix circular Anticheat dependency 2017-05-19 23:40:56 -05:00
cnr c60d357cfe Fix AntiHack quick-logout NPE 2017-05-19 14:53:40 -05:00
cnr 2a7fea5936 Fix Anticheat ban message 2017-05-17 19:38:39 -06:00
cnr eec20cc620 Merge branch 'update/ssm' into develop 2017-05-17 19:22:59 -06:00
cnr cc98f4fdd5 Disable banner service calls 2017-05-15 17:59:56 -07:00
cnr 9bc118dc41 Fix Anticheat ban lengths 2017-05-15 16:38:42 -07:00
Sam f23e778d92 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-13 17:31:00 +01:00
Sam b52bc80985 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-13 15:18:10 +01:00
Sam c8f20f3df5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-13 15:15:52 +01:00
Sam 5454c00163 Hub integration 2017-05-13 15:15:51 +01:00
AlexTheCoder 9cf5fda540 Update leaderboards system to use more malleable seasons system 2017-05-13 01:05:18 -04:00
Sam ff07d38d00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-12 23:04:47 +01:00
Sam 6ecbf85dc8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 22:22:01 +01:00
Sam abb983ac04 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 17:34:55 +01:00
cnr b18d36b361 Merge branch 'feature/castlesiege2.0' into develop 2017-05-11 20:29:46 -07:00
samczsun 7658046d62 Change messages 2017-05-11 19:29:32 -07:00
samczsun 1390ea1579 Implement triggers 2017-05-11 19:29:32 -07:00
samczsun ecef2fe9db New messages/durations 2017-05-11 19:29:31 -07:00
samczsun c8a1035591 Comped accounts 2017-05-11 19:29:31 -07:00
AlexTheCoder 7ad86c435c More nitpicks 2017-05-11 21:40:06 -04:00
AlexTheCoder 3023c64c35 Jon is actually OCD 2017-05-11 21:34:41 -04:00
AlexTheCoder 1e93ad0b1e Proper resource management for leaderboard statements 2017-05-11 21:18:05 -04:00
AlexTheCoder a76572f6d7 Change table names and add date indexes based on Jon's request 2017-05-11 20:49:38 -04:00
AlexTheCoder aa898d74da Fix incorrectly named tables in fetch query 2017-05-11 15:25:22 -04:00
Sarah a07aa7abdc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-11 20:57:04 +02:00
AlexTheCoder 5d1199634d Rewrite leaderboard backend (again) 2017-05-11 14:48:35 -04:00
Sarah 16e0f38dcf Menu Improvements and more Quest Trackers 2017-05-11 18:08:55 +02:00
cnr 85c06c11cd Merge branch 'update/mayitems' into develop 2017-05-10 19:55:11 -07:00
cnr 0f98637024 Disallow players from switching between Gem Hunters via party 2017-05-10 19:54:28 -07:00
LCastr0 ac0339fc59 Fixed sync with dragon and fixed guardian not showing 2017-05-10 21:20:23 -03:00
LCastr0 5fe5c613e5 Fixed win rooms again 2017-05-10 19:25:14 -03:00
LCastr0 3dbed769c9 Fix for win rooms 2017-05-10 17:27:17 -03:00
AlexTheCoder b4c27307ba Further leaderboard repository tweaks 2017-05-10 04:40:14 -04:00
AlexTheCoder f34a2946c4 Final leaderboard repository changes for Jon 2017-05-10 03:28:55 -04:00
AlexTheCoder fa1cd00c22 Tidy up leaderboard repository class a bit 2017-05-10 02:56:00 -04:00
AlexTheCoder adf6e35a1f Update leaderboard backend based on discussion with Jon 2017-05-10 02:49:21 -04:00
LCastr0 92eaf4f8d8 Merge branch 'develop' into update/mayitems 2017-05-09 23:31:43 -03:00
LCastr0 8bb638c969 Removed unused code 2017-05-09 23:30:52 -03:00
LCastr0 9018a3cc50 Fixed kit selectors 2017-05-09 23:30:24 -03:00
LCastr0 bcd60d325b Fixed win rooms 2017-05-09 23:06:49 -03:00
AlexTheCoder d13610251f Rename Castle Siege 2.0 to Castle Assault and re-implement the old game 2017-05-08 17:05:30 -04:00
LCastr0 00981cf846 Fixed all ranks having all win effects 2017-05-08 14:56:33 -03:00
LCastr0 5c265cfd66 Lock to other ranks, unlock on join 2017-05-08 10:35:21 -03:00
AlexTheCoder 49aaaa5301 Leaderboard changes 2017-05-08 02:08:03 -04:00
AlexTheCoder 6ef7608f20 Fix incorrect repository method name 2017-05-08 01:24:52 -04:00
AlexTheCoder b9fd597370 Replace old castle siege with new castle siege 2017-05-08 01:14:17 -04:00
AlexTheCoder 68205a71a1 Implement proper stat leaderboard system 2017-05-08 00:08:36 -04:00
AlexTheCoder 941310b5aa Change kit prices 2017-05-08 00:07:42 -04:00
LCastr0 8604eb2e09 Teleport the creeper so it's visible 2017-05-06 22:54:24 -03:00
LCastr0 dc77dde98b Use correct slot 2017-05-06 21:29:41 -03:00
LCastr0 8befa61b8a Set force on creature module before spawning entities 2017-05-06 21:29:15 -03:00
LCastr0 8e58b974f3 Add line 2017-05-06 21:18:36 -03:00
LCastr0 c5b62e0ec4 Add all the win-effects to the page 2017-05-06 20:42:53 -03:00
Sam 23d924f137 Kit system 2017-05-06 20:51:49 +01:00
AlexTheCoder a47c4291c5 Update tiered achievement UI 2017-05-05 22:06:18 -04:00
Sarah f2c5268df1 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-05 23:02:30 +02:00
Sarah 20281648c2 Add Quest triggers, add a Repository, add Spreadsheet parsing, and add menus. 2017-05-05 23:02:15 +02:00
Kenny ad79245252 Merge branch 'feature/quest-manager-service' into feature/quests 2017-05-05 15:25:33 -04:00
Kenny 54858e14ee Convert questmanager to read quests from google sheets 2017-05-05 15:22:37 -04:00
AlexTheCoder 00d31ffad3 Fix item builder to properly use null item titles 2017-05-04 23:20:50 -04:00
AlexTheCoder 901fecb49a Support multi named tiers of achievements, allow rewarding of xp/gems/crowns upon increasing achievement tiers, and replace old castle siege achievements with new ones 2017-05-04 23:20:50 -04:00
AlexTheCoder 43739743bf Add new castle siege game types to Core 2017-05-04 23:20:50 -04:00
AlexTheCoder 6684e812d1 Implement xp-less and crown kit upgrading and slightly modify kit progression gui 2017-05-04 23:20:50 -04:00
AlexTheCoder 39f997faf1 Give ProgressiveKits the ability to not use xp or use crowns instead of gems for leveling 2017-05-04 23:20:50 -04:00
AlexTheCoder 6ffd10133e Implement a new crown currency 2017-05-04 23:20:50 -04:00
AlexTheCoder f9f2e362c4 Make ItemBuilder properly clone all options and implement a builder to create enchanted books 2017-05-04 23:20:50 -04:00
Sam f6cb654e12 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-04 20:20:59 +01:00
Sam 8f01015df9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-04 17:35:41 +01:00
Sam ee0971443e Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-04 17:32:16 +01:00
Sam 47c816087e MOBA base 2017-05-04 15:45:04 +01:00
LCastr0 f23016df28 Change to blaze powder 2017-05-03 23:59:16 -03:00
LCastr0 58078ae4bd Added kit selectors to chests 2017-05-03 23:42:18 -03:00
LCastr0 b3f46ad4fc Added names, icons and lores 2017-05-03 23:30:16 -03:00
LCastr0 196e0b9688 Reduce the amount of lines in the Shimmering Ring 2017-05-03 22:29:06 -03:00
LCastr0 229c888498 Reduce amount of particles spawned with the water wings 2017-05-03 22:27:38 -03:00
LCastr0 cf56dfb9cf Increase amount of smoke particles 2017-05-03 22:22:16 -03:00
LCastr0 ddd196ba0c Revert temporary folder for schematics 2017-05-03 22:08:31 -03:00
LCastr0 bbfa632106 Add all the mechanics to the win effects 2017-05-03 22:05:54 -03:00
Sam bd52e63dc3 More alien stuff 2017-05-03 20:48:19 +01:00
Sam 10258d66b8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-02 23:18:38 +01:00
Sam 3a1fb3cb86 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-05-02 23:17:09 +01:00
LCastr0 4e56d2133b Merge branch 'develop' into update/mayitems 2017-05-02 19:13:43 -03:00
Sam 82ebd28400 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-05-02 21:02:26 +01:00
Sam 034837030d Initial commit 2017-05-02 21:01:17 +01:00
Sarah 8d32c35f88 Add basic Quest system 2017-05-02 18:57:20 +02:00
LCastr0 923f991df3 Merge branch 'develop' into update/kingppc 2017-05-02 00:09:19 -03:00
LCastr0 b8d2f784c7 Fix NPE, actually call PetSpawnEvent when spawning a pet 2017-05-01 22:19:50 -03:00
LCastr0 8f117e744e More stuff in ultra effect 2017-05-01 22:14:46 -03:00
LCastr0 e7c171749c Set pitch and yaw for npc 2017-05-01 12:25:03 -03:00
Sam 6d4a68acdf Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:41:49 +01:00
Sam 8c2b8935df Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:37:13 +01:00
cnr e2b43bb995 Don't show holograms in non-lobby servers 2017-05-01 00:49:25 -07:00
cnr d62006a426 Add King item to PPC rewards 2017-05-01 00:45:24 -07:00
LCastr0 fc5c420176 Changed to update event 2017-04-30 21:19:02 -03:00
LCastr0 734aa920bf Fixed jukebox message 2017-04-30 20:00:29 -03:00
LCastr0 a37cf3b1c5 Fixed pets and mounts not having any message when they are inside castle, fixed item despawning, stopped players from placing jukeboxes inside castle 2017-04-30 19:33:38 -03:00
LCastr0 e3521c06fd This shouldn't be there... 2017-04-30 19:14:27 -03:00
LCastr0 5d3dbbb44b Checks for the correct world 2017-04-30 19:06:44 -03:00
LCastr0 9e0424ea46 Checks if it's hub before doing event related stuff 2017-04-30 19:00:53 -03:00
LCastr0 d205d5fada Fixed item being despawned, fixed holograms not being updated, fixed king never being removed on leave 2017-04-30 18:56:37 -03:00
LCastr0 8ec6ebd060 Fix particles being sent to everyone 2017-04-30 18:42:16 -03:00
LCastr0 04c0c63390 Fix positions 2017-04-30 18:26:02 -03:00
LCastr0 d88f183726 Fixed bug with gadgets and kings not being updated 2017-04-30 17:52:36 -03:00
LCastr0 d04e29a473 Tests 2017-04-30 14:46:15 -03:00
LCastr0 0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -03:00
LCastr0 49fd8d3941 Fixed item and king not resetting after disabling 2017-04-30 12:52:00 -03:00