Commit Graph

11028 Commits

Author SHA1 Message Date
Sam
fd660f95a0 Fix players getting stuck in pregame lobbies 2017-07-05 21:38:53 -07:00
cnr
c341671ffc Move GH quit NPCs to redis; use region when saving GH data 2017-07-05 21:33:55 -07:00
Sam
ed3455db68 No need to update primary key 2017-07-06 00:59:43 +01:00
Sam
c5818b1bb5 Update time! 2017-07-06 00:35:05 +01:00
Sarah
1d046ff119 Add "all" to the GetMineplexMission Command, dont let specs get chest quest progress 2017-07-05 23:38:24 +02:00
Sam
dca43b6c57 Separate Gem Hunters inventories by region 2017-07-03 00:36:54 +01:00
Sam
85c90ff791 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/staff-titles 2017-07-03 00:17:16 +01:00
cnr
5a4fab5fc0 Separate out Haunted Chest purchase condition 2017-07-01 04:11:03 -07:00
cnr
cd110ddef9 Add purchase condition for freedom chests 2017-07-01 03:48:49 -07:00
cnr
832c766290 Merge branch 'update/july-cosmetics' into develop 2017-07-01 02:57:48 -07:00
Graphica
b36c5da721 Fix bug which stopped more than 1 use of ability 2017-07-01 05:56:53 -04:00
cnr
0ac3e227fd Merge branch 'feature/battle-royale' into develop 2017-06-30 22:15:53 -07:00
cnr
5ba1630fae Merge branch 'update/july-cosmetics' into develop 2017-06-30 22:15:31 -07:00
AlexTheCoder
43b1a118d3 Final tweaks and bugfixes for Sigils 2017-07-01 01:11:17 -04:00
Graphica
acaf3b2dd9 Change freedom treasure from 35k to 30k shards 2017-07-01 01:09:05 -04:00
Graphica
5957b96a4f Add freedom fighter morph 2017-07-01 01:07:32 -04:00
Graphica
5a86141e8f Fix costume count displaying incorrectly 2017-07-01 01:05:58 -04:00
Graphica
55a1afbb71 Expose banner data in CountryFlag 2017-07-01 01:05:44 -04:00
Graphica
b01cb0c2e9 Add Revolutionary SkinData 2017-07-01 01:05:05 -04:00
Sam
81ae3e0049 Give players rewards and remove debug messages 2017-06-30 19:32:08 +01:00
Sam
041d0020bd Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/staff-titles 2017-06-30 14:22:52 +01:00
Sam
f719e0db8d Clean up player data 2017-06-30 14:22:43 +01:00
Sam
811463e586 Attempt to somewhat fix the lag whenever the game starts 2017-06-30 13:56:20 +01:00
Sam
67d792e9d7 More progress 2017-06-30 12:57:20 +01:00
Sam
a8e1799617 Fix Deathbomber achievement tracker 2017-06-30 00:27:12 +01:00
Sam
5a7c7b8fa3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/battle-royale 2017-06-29 11:27:45 +01:00
cnr
dfe2a61b8f Revert freedom chest cosmetics 2017-06-28 23:43:30 -07:00
cnr
ed67a44fef Merge branch 'feature/moba' into develop 2017-06-28 20:39:27 -07:00
Graphica
13f4211739 Stop outfits from taking off flags 2017-06-28 20:38:59 -07:00
Graphica
6639d6eaed Update disabled games for eternal taunt 2017-06-28 20:38:59 -07:00
Graphica
eeb8fabafe Change niceness aura to use red and white tulips 2017-06-28 20:38:59 -07:00
Graphica
c97506fe0e Align flowers correctly in spring leap 2017-06-28 20:38:59 -07:00
Graphica
732c996e94 Spawn trail particles behind player model 2017-06-28 20:38:59 -07:00
Graphica
c33c8998f8 Change Legend Aura to green 2017-06-28 20:38:59 -07:00
Graphica
2021a7e321 Correctly handle taunt cooldowns 2017-06-28 20:38:59 -07:00
Graphica
c2b025e883 Distribute heart particles using a gaussian curve 2017-06-28 20:38:59 -07:00
Graphica
a9311e7457 Reduce coal fume particles 2017-06-28 20:38:59 -07:00
Graphica
816f1467aa Remove green from candy cane cosmetics 2017-06-28 20:38:59 -07:00
Graphica
5a3e79a63f Add white to maple leaf death effect 2017-06-28 20:38:59 -07:00
Graphica
0495b2d1ec Add cosmetics unlock command for all players 2017-06-28 20:38:59 -07:00
Graphica
36ec3014bf Swap cosmetic menu positions of items 2017-06-28 20:38:58 -07:00
Graphica
1e289271c6 Clean up and add comments 2017-06-28 20:38:58 -07:00
Graphica
aba684ad95 Remove unnecessary packages 2017-06-28 20:38:58 -07:00
Graphica
7d17fa0f29 Update hubs with new CosmeticManager constructor 2017-06-28 20:38:58 -07:00
Graphica
f7ac799476 Overhaul legend particle 2017-06-28 20:38:58 -07:00
Graphica
ea8c7be5f0 Disallow eternal taunt disguising an already disguised player 2017-06-28 20:38:58 -07:00
Graphica
5387d3b580 Add cosmetics to chests 2017-06-28 20:38:58 -07:00
Graphica
4cc1068055 Allow Flags to interact with costumes and hats correctly 2017-06-28 20:38:58 -07:00
Graphica
e04d467830 Add new cosmetic items 2017-06-28 20:38:58 -07:00
Graphica
b214d43eec Update hat and flag type enums 2017-06-28 20:38:58 -07:00
Graphica
2eff6ae34b Reorganize packages 2017-06-28 20:38:58 -07:00
Graphica
4ef477159c Fix gadget pages 2017-06-28 20:38:58 -07:00
Graphica
53d29fc9c9 Reduce lag on Molten Snake 2017-06-28 20:38:58 -07:00
Graphica
c15e8f8f90 Allow UtilParticle to accept java awt colors 2017-06-28 20:38:58 -07:00
Graphica
39f11da634 Create flag gadget type 2017-06-28 20:38:58 -07:00
Graphica
93015151db Add Hat skin data 2017-06-28 20:38:58 -07:00
Graphica
7459a458cd Add gaussian methods to UtilMath 2017-06-28 20:38:58 -07:00
Sam
7bd5d65823 Reduce the amount of gems given for gold earned 2017-06-29 00:37:42 +01:00
Sam
b8bb25b04d Only reset player health upon actual respawn 2017-06-29 00:35:18 +01:00
Sam
67d8e0863d Fix overtime being at 1 minute 2017-06-29 00:13:06 +01:00
Graphica
f291d37896 Stop outfits from taking off flags 2017-06-28 18:40:24 -04:00
Sam
85007820d2 Add a go-back button to kit selection 2017-06-28 23:38:50 +01:00
Graphica
2ef463c859 Update disabled games for eternal taunt 2017-06-28 18:36:59 -04:00
Graphica
2e23aae024 Change niceness aura to use red and white tulips 2017-06-28 18:33:49 -04:00
Graphica
6abeadf0ea Align flowers correctly in spring leap 2017-06-28 18:33:28 -04:00
Graphica
61b8ed971d Spawn trail particles behind player model 2017-06-28 18:33:18 -04:00
Graphica
ca8041e5b7 Change Legend Aura to green 2017-06-28 18:33:00 -04:00
Graphica
cfc223f52a Correctly handle taunt cooldowns 2017-06-28 18:32:52 -04:00
Graphica
901d62c8e0 Distribute heart particles using a gaussian curve 2017-06-28 18:32:39 -04:00
Graphica
1899272a10 Reduce coal fume particles 2017-06-28 18:32:19 -04:00
Graphica
37996e6901 Remove green from candy cane cosmetics 2017-06-28 18:32:12 -04:00
Graphica
ea7475b950 Add white to maple leaf death effect 2017-06-28 18:32:00 -04:00
Graphica
7f729ca586 Add cosmetics unlock command for all players 2017-06-28 18:31:48 -04:00
Graphica
60f4511a79 Swap cosmetic menu positions of items 2017-06-28 18:31:39 -04:00
Sam
968fec5d77 Fix the cages not being removed correctly 2017-06-28 16:41:46 +01:00
Sam
82182c5d50 Balance changes 2017-06-28 15:34:56 +01:00
Graphica
c7e4f4bd4d Clean up and add comments 2017-06-28 02:02:57 -04:00
Graphica
fbd347ff41 Remove unnecessary packages 2017-06-28 01:40:46 -04:00
Graphica
9d1c3930b3 Update hubs with new CosmeticManager constructor 2017-06-28 01:37:33 -04:00
Graphica
082a197e8b Overhaul legend particle 2017-06-28 01:37:20 -04:00
Graphica
bfca6603c1 Disallow eternal taunt disguising an already disguised player 2017-06-28 01:37:06 -04:00
Graphica
3d4fc5fa9c Add cosmetics to chests 2017-06-28 01:36:49 -04:00
Graphica
e599f1653c Allow Flags to interact with costumes and hats correctly 2017-06-28 01:36:21 -04:00
Graphica
3d430dedf6 Add new cosmetic items 2017-06-28 01:35:57 -04:00
Graphica
3c929a4b00 Update hat and flag type enums 2017-06-28 01:35:22 -04:00
Graphica
19ddfb5c09 Reorganize packages 2017-06-28 01:34:51 -04:00
Graphica
1b39a54043 Fix gadget pages 2017-06-28 01:33:03 -04:00
Graphica
78445551a1 Reduce lag on Molten Snake 2017-06-28 01:31:54 -04:00
Graphica
c1765aaf20 Allow UtilParticle to accept java awt colors 2017-06-28 01:30:56 -04:00
Graphica
b7a094f472 Create flag gadget type 2017-06-28 01:30:29 -04:00
Graphica
845e96109b Add Hat skin data 2017-06-28 01:29:02 -04:00
Graphica
e9fea23382 Add gaussian methods to UtilMath 2017-06-28 01:28:39 -04:00
Sam
b9a72312a8 Add a go back button on kit selection 2017-06-28 00:21:47 +01:00
Sarah
333f1eda76 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-27 23:15:43 +02:00
Sarah
8541b984c6 Implement new Quests and fix older Quests 2017-06-27 23:15:25 +02:00
Sam
a79c79bc99 Add wither overtime 2017-06-27 12:38:43 +01:00
cnr
ed541b7a4f Disable automatic timings reports 2017-06-26 20:17:50 -07:00
Sam
31533f29b7 Add Guns into Battle Royale 2017-06-24 18:19:56 +01:00
Sam
3c031c70a1 Fix training lobby bugs 2017-06-24 10:09:52 +01:00
Sam
c6a3001bae Basic battle royale game 2017-06-23 22:31:08 +01:00
Sam
4c6dfe6657 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-23 14:16:32 +01:00
Sam
98f9a58849 Fix light arrows being able to damage yourself 2017-06-23 14:12:36 +01:00
cnr
dddeb69391 Change beta requirement to ULTRA 2017-06-22 23:35:10 -05:00
cnr
b43203f831 Revert "Disable beta whitelist for MOBA"
This reverts commit 0374506879.
2017-06-22 23:32:55 -05:00
md_5
a6493ed18a Update MapParser to 1.12, refactor out some common base utilities. 2017-06-22 23:25:20 -05:00
cnr
0374506879 Disable beta whitelist for MOBA 2017-06-22 23:20:07 -05:00
cnr
6b24c55fef Merge branch 'feature/moba' into develop 2017-06-22 23:15:16 -05:00
Sam
b1c3b2c937 Balance changes and QOL changes 2017-06-23 02:11:17 +01:00
Sam
2912968295 Fix movable NPCs 2017-06-23 01:51:16 +01:00
Sam
21c7b082b0 Add a method to clear purchases 2017-06-23 01:43:38 +01:00
Sam
65ebf41d4f Finish the training game for now 2017-06-23 01:43:11 +01:00
Sam
8fb2c81c7f Shorten SR.MOD title 2017-06-22 21:45:09 +01:00
Sam
b064542c4e Staff and Clans Title 2017-06-22 21:39:37 +01:00
Sam
f22a091fa0 More training game stuff 2017-06-22 20:21:19 +01:00
Sam
e99be53bb5 Add a middle class to deal with multiple modes 2017-06-22 12:07:11 +01:00
Sam
0fe2c52500 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-21 13:57:12 +01:00
AlexTheCoder
61c57deaaa Disable these damn guardians lagging my clans servers 2017-06-19 19:01:09 -05:00
cnr
31605b02b0 Use polygon geometry for MOBA Boss AI boundaries 2017-06-19 18:38:31 -05:00
AlexTheCoder
7868287ace Temporarily disable clans maps 2017-06-19 18:32:57 -05:00
Sam
db98aa01c8 Training game base 2017-06-19 17:10:06 +01:00
cnr
185ac9fc05 Allow youtubers into full clans servers 2017-06-18 11:23:16 -05:00
Sam
17bfe9ee0a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-18 10:55:46 +01:00
cnr
afdf1a1ad6 Fix missed string -> ClaimLocation migration 2017-06-17 15:45:39 -05:00
cnr
739cb83deb Revert "Re-implement the main clans tutorial"
This reverts commit 1574d93d1b.
2017-06-17 14:50:58 -05:00
cnr
1658afefca Don't key Maps by strings; use simple data type instead 2017-06-17 14:36:38 -05:00
Sam
51460475de Change the Shop Item description 2017-06-17 12:47:28 +01:00
Sam
dda27cb7fe Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-17 12:45:16 +01:00
Sam
9c5565ac3b Remove recalling as it is unused 2017-06-17 12:45:15 +01:00
Sam
04fafea3ed Fixed a number of error causes 2017-06-17 12:40:08 +01:00
cnr
599f391001 Fix build (typo) 2017-06-16 22:36:33 -05:00
Sam
b8d160388f Removed dropped exp from entity kills and fishing 2017-06-16 22:27:11 -05:00
cnr
c4d5ed4cbd Merge branch 'feature/clans-season-3' into develop 2017-06-16 22:26:36 -05:00
cnr
04d9e7326d Fix NPE in OP Skywars startup 2017-06-16 19:22:53 -05:00
Alexander Meech
10df654e42 Track enjin/support-given clans boxes in CUST-1 2017-06-16 18:36:38 -04:00
Alexander Meech
4e8838d99e Add Clans Dye Box and Clans Builder Box to CUST-1 2017-06-16 18:23:11 -04:00
Alexander Meech
93a316e5e3 Add clans box sales package 2017-06-16 18:20:21 -04:00
Alexander Meech
7a2864a701 Merge branch 'develop' into feature/clans-season-3 2017-06-16 16:25:57 -04:00
AlexTheCoder
d8bdda2c52 Update clans world border size for new map 2017-06-16 16:21:21 -04:00
Sam
b758254f4c Don't reset the player when an item is purchased 2017-06-16 18:54:23 +01:00
AlexTheCoder
2b4aecd882 Fix bosses 2017-06-16 00:01:43 -04:00
AlexTheCoder
f6c7eaf28b Formatting fix 2017-06-15 23:47:12 -04:00
AlexTheCoder
fcce06fea9 Update item system for new legendary 2017-06-15 23:11:07 -04:00
AlexTheCoder
c64c0866fb Update Spawn locations for new map 2017-06-15 23:10:55 -04:00
AlexTheCoder
add639070a Fix cannons not firing 2017-06-15 23:10:28 -04:00
AlexTheCoder
1cdf9d2bba Final season 3 world event tweaks (adds skeleton king) 2017-06-15 23:10:16 -04:00
cnr
87e1ebb2af Merge branch 'feature/moba' into develop 2017-06-15 22:10:15 -05:00
AlexTheCoder
5829b720a8 Update spawn and shop locations for new map 2017-06-15 23:09:34 -04:00
AlexTheCoder
21d05b383b Fix skull and string place exploits 2017-06-15 23:09:16 -04:00
AlexTheCoder
394ebf9ad0 Tweak nether minibosses 2017-06-15 23:09:01 -04:00
AlexTheCoder
f4397d0b0b Tweak boss nether portals 2017-06-15 23:08:50 -04:00