JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,766 Commits 1 Branch 0 Tags 481 MiB
5a91d9a363
Commit Graph

11446 Commits

Author SHA1 Message Date
Graphica
2fd67836ad Add missing bold code 2017-07-31 22:37:49 -04:00
Graphica
8c911586dc Clean and document code 2017-07-31 22:37:49 -04:00
Graphica
04f182c745 Add old holiday items into omega chests 2017-07-31 22:37:49 -04:00
Graphica
7c77a89b48 Add ppc and flags to treasure 2017-07-31 22:37:49 -04:00
Graphica
540e450f66 Create melon head morph 2017-07-31 22:37:49 -04:00
Graphica
ab91e3cfd6 Add fruit skin data 2017-07-31 22:37:49 -04:00
Graphica
4b052e111a Add constructor that allows gadget pages to not be built immediately 2017-07-31 22:37:49 -04:00
Graphica
4a7971b843 Add new flag types 2017-07-31 22:37:49 -04:00
Graphica
fbcec02adc Add scrolling to flag cosmetics page 2017-07-31 22:37:49 -04:00
Graphica
488e8af998 Improve flag name formatting 2017-07-31 22:37:49 -04:00
Graphica
c2ab6f9dd4 Allow flags to handle article formatting 2017-07-31 22:37:49 -04:00
Graphica
d24b8a229c Alphabetize CountryFlag data 2017-07-31 22:37:49 -04:00
Graphica
200578df88 Add new flags to CountryFlag enum 2017-07-31 22:37:48 -04:00
Graphica
dadbd87f45 Correctly enable/disable chests 2017-07-31 22:37:48 -04:00
Sam
0777855d9f Community testing feedback 2017-07-31 20:48:36 +01:00
Sam
5aefca3c6c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-31 19:11:34 +01:00
Sam
7a9c5843fc Get skin data from Google Sheets 2017-07-31 19:11:00 +01:00
Sam
3f47ae6e2e Remove a rouge class 2017-07-31 16:49:08 +01:00
Sam
89e820e442 Remove all GameModifiers and replace them with GameCosmetics 2017-07-31 16:48:56 +01:00
Sam
16daa3f7d8 Add methods to check if a player owns a game cosmetic 2017-07-31 11:52:19 +01:00
Sam
67291804bf Remove old GameModifierPages 2017-07-30 17:08:46 +01:00
Sam
4f6d24dea8 Implement a mini-application inside the Google Sheets module that provides an easy way to get skin data 2017-07-30 16:11:18 +01:00
Sam
c7e4d5b00b Fix NPE 2017-07-29 22:36:25 +01:00
Sam
f198a2f66b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-07-29 22:25:34 +01:00
Sam
3f739a5f22 Finish off morphs 2017-07-29 22:25:33 +01:00
Dan Mulloy
bfee68007c Fix disguise nametags on 1.10+ 2017-07-28 21:57:07 -04:00
Dan Mulloy
c69f67b3e8 Fix skeleton disguises appearing invisible 2017-07-28 17:20:04 -04:00
Sam
a9b4519843 Fix imports and item related bugs 2017-07-28 21:06:03 +01:00
Sam
dd675b407a Add Game Cosmetics and the 4 basic hero morphs 2017-07-28 20:10:10 +01:00
Sam
ebd9986542 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/moba-training 2017-07-27 12:33:09 +01:00
Sam
94ea5c4134 Cosmetic base 2017-07-27 12:33:04 +01:00
Sam
5edfcfa40e Stop training mode from using map specific code 2017-07-27 10:47:14 +01:00
AlexTheCoder
53f28ac26b Add a sound when your king is being damaged 2017-07-26 23:34:01 -04:00
AlexTheCoder
8dcea688ed Add alchemist kit kills achievement 2017-07-26 23:34:00 -04:00
AlexTheCoder
f2e5dfffd9 Change kit description color because joe has OCD 2017-07-26 23:34:00 -04:00
AlexTheCoder
4f8a71cefc Remove bolded text from kill streak reward information 2017-07-26 23:34:00 -04:00
AlexTheCoder
5873075836 Clear potion effects on kit equip 2017-07-26 23:34:00 -04:00
AlexTheCoder
d737b41281 Make the starting Alchemist potions marked Kit Items 2017-07-26 23:34:00 -04:00
AlexTheCoder
d5f56cdb32 Remove Bow from game chests and document bow presence in Archer kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
f8f87a23bc Fix bug causing tnt to not function, increase tnt damage, remove fire resistance from loot pool, and implement Alchemist kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
b672988d31 Nerf Fighter kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
05de024606 Buff Demolitionist kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
bf86c08126 Buff Archer kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
e9c3aebf90 Complete Alchemist kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
3ffd2966b6 Nerf Tank kit 2017-07-26 23:34:00 -04:00
AlexTheCoder
3952fa2e1d Increase amplifier and duration of Castle Assault spawn regeneration and add spawn resistance 2017-07-26 23:34:00 -04:00
AlexTheCoder
9f45d3672d Add Castle Assault to Build Server 2017-07-26 23:34:00 -04:00
AlexTheCoder
66e5339eab Make UtilEnt#GetMetadata infer needed type 2017-07-26 23:34:00 -04:00
cnr
eb566d3363 Remove debug broadcasts 2017-07-26 23:29:07 -04:00
cnr
3fbad35a30 Merge branch 'update/moba-2' into develop 2017-07-26 21:48:15 -04:00
Sam
16744de296 Fix some bugs 2017-07-27 02:35:19 +01:00
Alexander Meech
52341c1550 Update BonusGui.java 2017-07-26 21:29:13 -04:00
Alexander Meech
04491493c2 Update SpecificChannelButton.java 2017-07-26 21:29:13 -04:00
Alexander Meech
2180be2055 Remove Specific creators from BonusManager 2017-07-26 21:29:13 -04:00
cnr
e599f28d34 Modify HotJoiningManager join message 2017-07-26 21:22:16 -04:00
Sam
cd3a90da08 Fix level display for real this time 2017-07-26 20:57:45 -04:00
cnr
5b7f6a94ee Merge branch 'update/moba-2' into develop 2017-07-26 20:27:37 -04:00
Sam
099d2cb132 Cleanup HubVisibilityManager while slowing down the rate at which players are shown other players 2017-07-26 20:26:46 -04:00
Sam
86c733259f Allow double jumping when having hub velocity disabled 2017-07-26 20:26:46 -04:00
Sam
d951089239 Fix the Egg Blaster, Explode disguise bug 2017-07-26 20:25:32 -04:00
cnr
cfc1a29444 Merge branch 'bugfix/disguises' into develop 2017-07-26 20:25:17 -04:00
Sam
a70be6ffd8 Fix level display for real this time 2017-07-26 23:03:48 +01:00
cnr
1fb69edc13 Add Timer ban action @ 15000 VL 2017-07-26 12:40:38 -04:00
cnr
f86664c510 Revert MOBA exp per level to 1000 2017-07-26 12:38:02 -04:00
Sam
ddf0666ba6 Fix level displays 2017-07-25 20:13:50 +01:00
Sam
4f221cabba Fix the NPE that caused MPS crashes 2017-07-25 19:22:11 +01:00
Sam
789658b2d9 Second MOBA map 2017-07-25 17:57:25 +01:00
Sam
84bf321fe5 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-2 2017-07-24 23:14:51 +01:00
Sam
ce95ac481f Bug fixes 2017-07-24 23:03:31 +01:00
Sam
abf51064b3 Implementation of achievements 2017-07-24 20:50:45 +01:00
Sam
e8eb364d99 Fix incorrect descriptions 2017-07-24 15:40:15 +01:00
Sam
23373834a2 Achievement Kits 2017-07-24 15:36:45 +01:00
Dan Mulloy
49c50b027b Attempt to get version strings with /versions 
Makes it easier for those who don't know the protocol ;)
 2017-07-23 16:26:46 -04:00
Dan Mulloy
99ca371204 Treat magma cubes as slimes and slimes as creatures for disguises 
Fixes crashes in 1.12
 2017-07-23 16:14:29 -04:00
AlexTheCoder
06a90abc6a Properly store clans tag for sales announcement deletion 2017-07-22 22:21:12 -04:00
AlexTheCoder
8054296d0a Fix incorrect local removal of sales announcements 2017-07-22 20:31:51 -04:00
Sam
115b4487ea Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-22 21:27:24 +01:00
Sam
66fdd9be9f Skeleton mode 2017-07-22 14:24:29 +01:00
AlexTheCoder
5ccc599ef1 Clean up anticheat clans blacklist reason 2017-07-21 22:34:35 -04:00
AlexTheCoder
d8d1ee7832 Fix anticheat banning in clans 2017-07-21 22:31:23 -04:00
AlexTheCoder
a29cff2db1 Properly block Scythe healing when hitting teammates 2017-07-20 16:52:49 -04:00
cnr
e5e0fd8eda Halve exp requirements for leveling in MOBA 2017-07-20 01:03:03 -04:00
cnr
d5d21a3fab Disable anticheat checks in event servers 2017-07-20 01:00:37 -04:00
cnr
2c0d460357 Add Timer check (no bans enabled) 2017-07-20 00:55:14 -04:00
Sam
8b6f79a5ee Delay persistence data get 2017-07-20 00:32:50 -04:00
Sam
8516a98087 Lots of bug fixes 2017-07-20 00:32:42 -04:00
Dan Mulloy
fb28a953e6 Hide players from staff if the staff are also at the spawn point 2017-07-20 00:32:33 -04:00
Dan Mulloy
2c997935c9 Rewrite spawn meta for all living entities on 1.10 and up 2017-07-20 00:32:14 -04:00
Dan Mulloy
7836e0aaaa Fix guardian disguises 
This commit fixes guardian disguises (esp. elder guardians) and also provides for disguises to modify packets before they're sent if necessary
 2017-07-20 00:32:14 -04:00
Dan Mulloy
8b39fa4e24 Perform disguise validation before doing any of the disguise work 
If a disguise is invalid, we won't notify redis or prevent players from joining
 2017-07-20 00:32:14 -04:00
AlexTheCoder
ac2df004f0 Fix players being combat tagged after respawn 2017-07-17 19:00:03 -04:00
AlexTheCoder
4f04d879ab I'm a dumbo, and remove the ability to add runes to the Scythe of the Fallen Lord 2017-07-17 18:36:59 -04:00
AlexTheCoder
9daa46bb4a Unify combat tag checking 2017-07-17 13:57:38 -04:00
AlexTheCoder
d5355ab757 Despawn mounts on chunk unload and clean up some formatting 2017-07-17 13:57:38 -04:00
AlexTheCoder
5e70ff8471 Block sleeping in beds 2017-07-17 13:57:38 -04:00
AlexTheCoder
8379c6235b Lower freeze walk buffer 2017-07-17 13:57:38 -04:00
AlexTheCoder
46768c60ec Disable all other magmus abilities while heat room is active, and make the heat room safezone despawn after damage stops occurring 2017-07-17 13:57:38 -04:00
AlexTheCoder
99c2522e92 Clean up the Clans blacklist GUI 2017-07-17 13:57:38 -04:00
AlexTheCoder
f00d9fbb54 Fix sales announcement remote updates being handled async 2017-07-17 13:57:38 -04:00
AlexTheCoder
7354c4dc1c Allow access to clans blacklisting from core, make GWEN issue 90-day clans blacklists for instabans and banwaves 2017-07-17 13:57:38 -04:00
AlexTheCoder
c2a46c14ed Allow weapon runes to be added to the Scythe of the Fallen Lord 2017-07-17 13:57:38 -04:00
AlexTheCoder
0b902e3f6f Fix the Scythe of the Fallen Lord healing the user when hitting allies and clan-mates 2017-07-17 13:57:38 -04:00
AlexTheCoder
5e540ea995 Increase legendary drop rate from raids and world bosses 2017-07-17 13:57:38 -04:00
AlexTheCoder
fdaa267f3e Remove the bow from clans custom item durabilities 2017-07-17 13:57:38 -04:00
AlexTheCoder
7054706b0f Begin work on clans capture point event 2017-07-17 13:57:38 -04:00
AlexTheCoder
82679aae8a Kill players who log out during raids and force respawn players who die in raids 2017-07-17 13:57:38 -04:00
AlexTheCoder
460cc29c04 Fix clan-mates and allies being able to force despawn mounts 2017-07-17 13:57:38 -04:00
AlexTheCoder
953ad66aca Update SalesAnnouncement system to allow clans-only announcements and make cross-server updating work properly 2017-07-17 13:57:38 -04:00
Sam
0fa8a80f2e Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-17 12:56:41 +01:00
cnr
f202085eeb Remove Heroes of GWEN from MPS 2017-07-15 13:21:29 -07:00
Sam
968bcc0223 Add MOBA to the game menu 2017-07-14 18:03:09 +01:00
Sam
4a5913bb3a Don't have the second towers be Elder Guardians 2017-07-14 17:40:22 +01:00
Sam
d9e1d211ac Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-14 13:33:06 +01:00
cnr
2fd3c9cc2f Send players into the training arena only if the game has started 2017-07-14 03:39:41 -07:00
cnr
6418a6006f Manually construct WatchableObjects for custom item frames 2017-07-14 03:00:59 -07:00
cnr
bdaea49d56 Fix Heroes of GWEN select menu 2017-07-13 23:47:56 -07:00
cnr
22676ab9e3 Add selection page for Heroes of GWEN training / normal game 2017-07-13 22:31:22 -07:00
cnr
1c75ec3f89 Merge branch 'feature/moba' into develop 2017-07-13 21:18:25 -07:00
cnr
690854d067 Add tps and ping to each GWEN metadata frame 2017-07-13 21:17:26 -07:00
cnr
7535200c35 Fix out of bounds exception in legendary particle 2017-07-13 18:17:30 -07:00
Sam
aa69b75be0 Final push 2017-07-14 02:04:29 +01:00
cnr
da08868206 Fix ClassCastException in HitQuestTracker 2017-07-13 18:02:39 -07:00
Sam
17ba7ffe8a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-07-13 15:50:05 +01:00
Sam
e777293866 Add achievements 2017-07-13 15:38:56 +01:00
Dan Mulloy
5cac083941 Add command to get versions, spawn wither skeletons with /mob 2017-07-12 22:54:38 -07:00
Sam
035c5e9011 Fix a typo 2017-07-12 22:50:17 -07:00
Sam
d15063a065 Fix "serverName" is restarting 2017-07-12 22:50:17 -07:00
Sam
8a18be0c5c Shorten and fix a typo in the senior moderator title 2017-07-12 22:50:17 -07:00
AlexTheCoder
c695bb570e Fix several thread-related issues in the leaderboard system 2017-07-12 22:49:44 -07:00
cnr
f77cc39f0c Merge branch 'feature/quests' into develop 2017-07-12 22:49:15 -07:00
Sam
59af31c6f8 Fix spectators being able to interact with hero selection 2017-07-13 00:18:45 +01:00
Sam
bfba119f3f Really hackily fix item maps 2017-07-13 00:16:50 +01:00
Sam
c4508b653a Remove rank requirement for HOG 2017-07-13 00:16:40 +01:00
Sam
25d3c09329 Complete implementation of game stats 2017-07-12 23:33:45 +01:00
Sam
c7c8a848b1 More fixes 2017-07-12 19:18:14 +01:00
Sam
0d7079eae7 Fix silver fish just not doing anything 2017-07-12 18:05:47 +01:00
Sam
f437ada4b9 Progress on game statistics 2017-07-12 16:49:50 +01:00
cnr
cecc3614b8 Set the correct key in QuitNPCRepository 2017-07-11 23:17:58 -07:00
Sam
06a8c191ac Complete the implementation for map boards 2017-07-12 00:38:54 +01:00
Sam
b7c629c4c8 Make item map billboards not really work 2017-07-11 02:10:43 +01:00
Sam
c18c6cfc6a More changes 2017-07-10 21:59:34 +01:00
cnr
c0cc3789b1 Fix server tps metadata key 2017-07-09 16:31:17 -07:00
Sam
7544ff98ae Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-09 00:22:30 +01:00
Sam
84752f0b17 Item maps 2017-07-08 01:34:19 +01:00
AlexTheCoder
dd12824402 Fix NPE in LootModule 2017-07-07 07:13:31 -04:00
AlexTheCoder
f73c78809a Whoops, forgot to change a line 2017-07-07 06:47:15 -04:00
AlexTheCoder
ce6ee670ed Use a try-with-resources for gem hunters redis calls 2017-07-07 06:44:19 -04:00
Sam
994517b3a4 Finish up training mode 2017-07-07 02:22:05 +01:00
Sarah
8e0bb18076 Fixes of current and new missions 2017-07-06 22:55:34 +02:00
Sam
590c3d804b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-07-06 17:15:51 +01:00
AlexTheCoder
b314744b6d Fix incorrect event argument in UpdateRank 2017-07-05 21:41:00 -07:00
AlexTheCoder
f92eae067f Add player ping and server tps to ban metadata 2017-07-05 21:41:00 -07:00
AlexTheCoder
a8c41f8904 Lowercase messages with >30 capital letters 2017-07-05 21:41:00 -07:00
md_5
4ccf9e39ad Remove pling sound from /msg for version compat 2017-07-05 21:39:39 -07:00
cnr
e1a5e1d111 Merge branch 'feature/staff-titles' into develop 2017-07-05 21:39:14 -07:00
AlexTheCoder
79644e706c Update CUST-1 menu for support staff request 2017-07-05 21:38:53 -07:00
AlexTheCoder
d61e067b86 Allow customer support to track freedom chests and improve error information to prevent forging/confusion 2017-07-05 21:38:53 -07:00
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
Sam
558eeb528f Kit progression complete 2017-07-03 00:17:09 +01:00
Sam
e2ff415e4d Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-01 15:36:10 +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
6dcdc57707 Adjust exp required 2017-06-30 15:13:21 +01:00
Sam
85342801a4 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-06-30 14:23:28 +01:00
Sam
29488a4ab8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-06-30 14:23:10 +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
61dd8e088e More CS Progress 2017-06-27 17:52:20 +01: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
9cdc698999 Make it compile 2017-06-26 22:17:36 +01:00
Sam
76e13df32b More castle siege 2017-06-26 20:42:10 +01:00
Sam
9f182d123f Castle Siege partial re-code 2017-06-25 18:29:34 +01: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
AlexTheCoder
70212f9596 Tweak jump star values to final levels 2017-06-15 23:08:15 -04:00
AlexTheCoder
4485b4bc67 Add mount tokens to the rare loot pool 2017-06-15 23:07:53 -04:00
AlexTheCoder
01df9b7e44 Prevent claiming via gui in nether or raid worlds 2017-06-15 23:07:21 -04:00
AlexTheCoder
802cde9280 Update clans gui icons to reflect resource pack changes 2017-06-15 23:07:03 -04:00
AlexTheCoder
1ea0b4d33a Final polish on builder box 2017-06-15 23:06:38 -04:00
AlexTheCoder
e8a4e23f05 Fix mute bypasses via clans chat commands 2017-06-15 23:05:41 -04:00
AlexTheCoder
fc3a4bdbfe Fix purchase item goal in tutorial 2017-06-15 23:05:16 -04:00
AlexTheCoder
724604c76a Fix bug preventing TNT generators from working if purchaser leaves the clan 2017-06-15 23:03:30 -04:00
cnr
336777f89a Add builders to the beta whitelist 2017-06-15 18:15:04 -05:00
Sam
5b985c33ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-15 23:26:57 +01:00
Sam
07779cdf55 Reduce the damage from TNT Infusion 2017-06-15 23:26:56 +01:00
Sam
a12564c8a9 Fix consumables 2017-06-15 23:26:29 +01:00
cnr
d2c9173943 Add missing instanceof check 2017-06-15 17:19:19 -05:00
Sam
fe17a42724 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-15 21:22:39 +01:00
Sam
c2cbcfc62f Fix spamming bombardment 2017-06-15 21:22:26 +01:00
Alexander Meech
d4f27ef768 Update xenforo forum id for mapper rank 2017-06-14 22:28:28 -05:00
cnr
ba506f9c7b Fix beta whitelist duplicate-enable 2017-06-14 22:26:29 -05:00
cnr
27f5da06f4 Merge branch 'feature/moba' into develop 2017-06-14 20:02:25 -05:00
Sam
a5fd9bef79 Turns out Achievements are case sensitive 2017-06-15 02:01:26 +01:00
Sam
cfe8840d7a Fix some really silly things 2017-06-15 01:59:00 +01:00
cnr
8e9c5c43e4 Remove unused agentCacheMap in CUST 2017-06-14 19:57:58 -05:00
cnr
05eabdbfd8 Merge branch 'feature/moba' into develop 2017-06-14 19:55:53 -05:00
cnr
2a0796472b Add beta whitelist to MOBA 2017-06-14 19:54:23 -05:00
Sam
29d5a80a67 Final changes 2017-06-15 01:33:20 +01:00
cnr
6c093cc458 Reduce beta participation rank constraint to TITAN 2017-06-14 17:23:20 -05:00
cnr
8d1aa176d3 Remove unused agentCacheMap in CUST 2017-06-13 23:49:14 -05:00
cnr
c533b170fe Add /checkppc to CUST for detailed subscription data 2017-06-13 23:47:30 -05:00
AlexTheCoder
bc61bdff5e Update territory display to show raid world and prevent autoclaiming in nether or raid worlds 2017-06-13 23:17:28 -04:00
AlexTheCoder
6ef6abcd72 Initial implementation of raid legendary 2017-06-13 23:16:51 -04:00
AlexTheCoder
3b4bad7bba Further change builder box UI 2017-06-13 23:16:24 -04:00
AlexTheCoder
64c084ecb3 Handle Hardcore and Casual modes in clans mechanics 2017-06-13 23:16:00 -04:00
AlexTheCoder
d168e03f80 Check for Hardcore mode in Clans Server Selector 2017-06-13 23:13:18 -04:00
Sam
4978f924a7 Lots of bug fixes 2017-06-13 21:49:34 +01:00
Sam
3efeb38a01 Working through JIRA 2017-06-13 00:29:05 +01:00
Sam
6df8330b3f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-12 23:03:20 +01:00
cnr
3d8998ee13 Change missed BETA_HUB -> HUB in GH server-sending 2017-06-12 15:43:29 -05:00
AlexTheCoder
9da5b367fd Further improve raids 2017-06-12 01:06:33 -04:00
AlexTheCoder
97efeca225 Increase outpost costs and add mounts to pvp shop 2017-06-12 01:05:02 -04:00
AlexTheCoder
97c8dc7cf4 Make safelog holograms follow their loggers 2017-06-12 01:04:26 -04:00
AlexTheCoder
a952ee31cd Remove Repair functionality from Gameplay class 2017-06-12 01:04:05 -04:00
AlexTheCoder
5045bad684 Unify item durabilities in clans 2017-06-12 01:03:39 -04:00
AlexTheCoder
d2d3b88651 Improve siege weapons 2017-06-12 01:03:15 -04:00
AlexTheCoder
3d88c2c9a5 Block territory claiming and setting clan homes in the nether 2017-06-12 01:02:38 -04:00
AlexTheCoder
c265b235be Tidy up ClansAdmin Commands 2017-06-12 01:02:04 -04:00
AlexTheCoder
f1b9a99576 Make mounts disable when server does 2017-06-12 01:01:48 -04:00
AlexTheCoder
ece1461384 Tidy up mounts and implement the mount skins 2017-06-12 01:01:24 -04:00
AlexTheCoder
8ee5faf4d9 Change boxes more 2017-06-12 01:00:09 -04:00
AlexTheCoder
a268b0dfff Fix freeze broadcasting to entire server unintentionally 2017-06-12 00:59:31 -04:00
Sam
c8340730ad Improve Bardolfs wolves 2017-06-11 00:00:28 +01:00
Sam
b6c5052db8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-09 13:10:14 +01:00
Sam
ac52903b7d QOL changes 2017-06-09 13:10:11 +01:00
cnr
68084c5cf0 Insert linebreaks in mapper + mapdev descriptions 2017-06-09 02:43:34 -05:00
cnr
d226a4e710 Remove Gem Fountain and open brawl on weekends 2017-06-09 00:14:49 -05:00
AlexTheCoder
87966ddedd Season 3 2017-06-08 20:20:10 -04:00
AlexTheCoder
e7174a0e4e Add an item unbreakable checker to UtilItem 2017-06-08 20:19:12 -04:00
AlexTheCoder
986d4f3dcc Properly restrict moderation staff testrank access 2017-06-08 20:15:41 -04:00
AlexTheCoder
ecd9812f0c Properly return empty value in ItemStackFactory 2017-06-08 20:12:44 -04:00
cnr
3c3cffb001 Add MAPPER rank and modify BUILDER description 2017-06-08 18:53:37 -05:00
Sam
79b983536d While Withered, prevent regeneration 2017-06-08 22:55:17 +01:00
Sam
e94ab9598a New Heroes 2017-06-08 22:43:50 +01:00
Sam
4fb4c2c865 Fix merge imports 2017-06-08 16:11:25 +01:00
Sam
206dd56d14 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 16:10:49 +01:00
Sam
9844ca338a Complete Biff 2017-06-08 16:09:32 +01:00
Sam
a767135ce0 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 13:08:54 +01:00
Graphica
8138b5d241 Fix Bob Ross morph carpets not disappearing 2017-06-08 00:49:40 -05:00
Graphica
4628af6e81 Call treasure start event after teleporting the player 2017-06-08 00:49:33 -05:00
Sam
1d64bb63c4 Add a check to prevent a possible duplication bug 2017-06-08 02:18:57 +01:00
Sam
b59e57dfb6 Fixed Players not being given their Gem Hunters rewards for the final time! 2017-06-08 02:10:24 +01:00
Sam
8c821af9de Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-08 02:09:24 +01:00
Sam
044927252c More changes! 2017-06-08 01:55:07 +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
a800fee08c Testing session changes 2017-06-06 22:59:40 +01:00
Sam
16f9364772 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-06 19:31:20 +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
Sam
a3fd81f763 Fix Biff's skills not cleaning up 2017-06-04 10:52:43 +01:00
cnr
347cddccc0 Use UUID in enjin commands instead of name 2017-06-03 14:22:04 -05:00
Sam
e094446be4 Add biff to the hero list 2017-06-03 15:33:26 +01: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