Commit Graph

4796 Commits

Author SHA1 Message Date
Sam
2467b7d6ac Fixed bugs 2017-09-10 00:09:17 +01:00
Sam
b3c216b7a8 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-09 09:20:08 +01:00
Sam
c729857a00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-09 09:19:46 +01:00
cnr
df1c72624c Merge update/moba-cosmetics into develop 2017-09-08 20:50:15 -05:00
Sam
17b986fb6f Ru roh 2017-09-09 02:48:03 +01:00
Sam
b698cfe7b4 Fix Rainbow Sheep mount not changing colours 2017-09-09 02:47:35 +01:00
cnr
aac173c105 Merge branch 'update/moba-cosmetics' into develop 2017-09-08 20:31:39 -05:00
Sam
c0cda476e4 Complete chest 2017-09-09 02:29:19 +01:00
Sam
554aeb6af5 Bug fixes 2017-09-08 16:51:13 +01:00
Sam
81f5f002f0 Typo 2017-09-08 11:24:55 +01:00
Sam
7b1245077f Finish everything 2017-09-08 11:10:24 +01:00
cnr
a16442e32c Reduce ban threshold for Killaura type A 2017-09-07 21:32:12 -05:00
cnr
4c3de65734 Enable Anticheat strict mode 2017-09-07 21:21:28 -05:00
Sam
330ed28992 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-06 11:31:53 +01:00
Sam
8724a35269 Tron Hub Game 2017-09-06 11:22:49 +01:00
AlexTheCoder
871f178419 Update ranks sql system to block a race condition and improve performance 2017-09-02 17:08:29 -04:00
Sam
6542f67d9b Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-02 00:50:24 +01:00
Sam
9b04361c6b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-02 00:45:51 +01:00
Sam
64065f432c Fix loading NPCs from database 2017-09-02 00:43:14 +01:00
AlexTheCoder
f5ae4a7ca5 Fix Rank Location not working due to incorrect UUIDs utilized 2017-09-01 14:03:47 -05:00
Alexander Meech
6f04292b2a Update ResetPlayerCommand.java 2017-09-01 14:03:47 -05:00
Dan Mulloy
a8a6e13fa0 Tab list sorting by rank weight 2017-09-01 14:03:47 -05:00
cnr
81110ea4a3 Fix additional rank issues 2017-09-01 14:02:31 -05:00
Sam
87b977706d Fix compilation errors 2017-09-01 17:00:49 +01:00
Sam
69f7078534 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:44:58 +01:00
Sam
90d4f9c1f7 Make mounts use permissions 2017-09-01 16:43:43 +01:00
Sam
2b1af7804f Use permissions for NewNPC 2017-09-01 16:41:28 +01:00
Sam
8fa9eec4ce Merge remote-tracking branch 'refs/remotes/origin/feature/leveling' into update/hub-makeover 2017-09-01 16:33:22 +01:00
Sam
39792675dc Hub merges 2017-09-01 16:27:29 +01:00
Sam
07cc9c3646 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:27:18 +01:00
Sam
c520d605bf Forgot Achievement Manager 2017-09-01 16:21:46 +01:00
Sam
7e3e2b9ece Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-09-01 16:21:30 +01:00
Sam
cd99700eda Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-01 16:12:51 +01:00
cnr
d4e6860fb0 Accommodate relocatin of guava in spigot 2017-09-01 00:10:51 -05:00
Sam
df01074451 Increase animation speed and reduce armourstand amount 2017-08-31 23:21:28 -05:00
cnr
a1cca83394 Add FastBow thresholds 2017-08-31 23:21:14 -05:00
Sam
bf98437ca3 September PPC Cosmetic 2017-08-31 23:21:04 -05:00
cnr
9faeb955cb Fix rank issues found in testing 2017-08-31 23:15:30 -05:00
Sam
316ad132b4 Bug fixes 2017-08-31 16:08:53 +01:00
cnr
919141f2a7 Merge branch 'develop' into feature/rank-rewrite 2017-08-30 17:42:16 -05:00
Sam
9f24a0ecb9 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-08-30 13:46:07 +01:00
Sam
5bf0159718 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-08-30 13:42:13 +01:00
Sam
8e65a68999 Brand new shiny NPC Manager 2017-08-30 13:38:50 +01:00
cnr
994f957bc3 Eliminate GroupPermission 2017-08-28 13:06:59 -05:00
Sam
9e7e583164 Clearup some cost constants 2017-08-28 16:23:44 +01:00
Sam
4a3e259c8a Minecart collisions 2017-08-26 21:10:58 +01:00
Sam
8e327e86b4 Huge improvement on the Cosmetic System 2017-08-26 16:14:22 +01:00
Sam
2d8bfbf31c Cleanup 2017-08-24 16:19:28 +01:00
Sam
19c65560c5 Remove rotaton on emblems 2017-08-24 11:52:04 +01:00
Sam
9a4995d212 Improve the Level Rewards system 2017-08-23 01:32:27 +01:00
Sam
5b77b099b2 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-22 22:43:33 +01:00
Sam
a3afa48549 Remove unused imports 2017-08-22 22:22:48 +01:00
Sam
2b44feb815 Use removeIf instead of an iterator 2017-08-22 22:22:31 +01:00
Sam
6c9b8420b4 September PPC Cosmetic (Win Room) 2017-08-22 20:12:27 +01:00
Sam
930f90fdf3 GH Mount fixes 2017-08-22 20:12:15 +01:00
Sam
e412c2cc05 Gem Hunter Mount Skins 2017-08-21 21:11:13 +01:00
Sam
fd090a5644 Fix a lot of bugs 2017-08-20 23:04:28 +01:00
Sam
1c86cff6d7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-18 16:51:51 +01:00
Sam
c0ed39d9f9 Get emblems to spawn 2017-08-18 16:51:50 +01:00
AlexTheCoder
0d7e404da8 Add mute awareness message feature for t3
Tested by t3hero
2017-08-17 23:59:22 -04:00
cnr
4a08c3f1d7 Implement requested Anticheat changes
- Reduce speed + glide ban VL to 7500
- Re-enable bans for Killaura type D and Killaura type F
- Re-enable auto-sneak detection and bans
- Disable Killaura type D in MOBA and CS
2017-08-17 00:58:39 -04:00
Sam
7667bf47c4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-14 16:58:16 +01:00
Sam
9300af8370 Added the Hero Ivy 2017-08-14 16:57:44 +01:00
Sam
456f959a8d Implement Emblems 2017-08-13 15:25:41 +01:00
cnr
ab5ee84cb8 Disable KillAura type D 2017-08-12 23:31:35 -04:00
cnr
36bd6af902 Disable movement checks in MOBA and lower Timer threshold 2017-08-12 23:31:09 -04:00
cnr
bcf66dc574 Re-enable KillAura type D; disable type F 2017-08-12 23:14:12 -04:00
Sam
4c3a8e267f Titles base 2017-08-12 19:23:07 +01:00
cnr
987de21b3e Bake permissions ahead of time and prepare GroupPermission refactor 2017-08-10 14:40:26 -04:00
Sam
0e5fa827fa Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-10 13:51:13 +01:00
Sam
edbcb20a80 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-10 13:47:40 +01:00
cnr
ba8f4e0d5a De-stringify permission groups 2017-08-09 22:26:55 -04:00
AlexTheCoder
482a02fee1 Small fixes 2017-08-09 16:26:55 -04:00
AlexTheCoder
aa79e9338d Implement permission requests from admin team 2017-08-09 15:19:48 -04:00
AlexTheCoder
9c5e5457f5 Remove hashcode dependence 2017-08-09 15:19:48 -04:00
AlexTheCoder
d390a9a492 Fixes from testing 2017-08-09 15:19:48 -04:00
AlexTheCoder
ef4aeaaf64 Initial rank rewrite and quest database fixes 2017-08-09 15:19:48 -04:00
Sam
137a7565f1 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-09 01:44:28 +01:00
Sam
0b38b1b6b6 Testing fixes 2017-08-08 21:50:19 +01:00
Sam
bb59a03040 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-08 19:30:37 +01:00
Kenny Goodin
2d9da9bc3a Merge branch 'bugfix/anticheat' into develop 2017-08-07 15:35:02 -04:00
Kenny Goodin
7995707300 Revert "Update glide and speed violation thresholds to requested values"
This reverts commit 7b6badf87a.
2017-08-07 15:29:58 -04:00
Sam
a71c0ecf87 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-07 18:10:05 +01:00
Kenny Goodin
682b5a8624 Merge branch 'bugfix/anticheat' into develop 2017-08-07 01:54:40 -04:00
Kenny Goodin
7b6badf87a Update glide and speed violation thresholds to requested values 2017-08-07 01:51:57 -04:00
Kenny Goodin
ead8377c4f Temporarily disable killaura type D banwave 2017-08-07 01:50:40 -04:00
Sam
18e7143d5a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-05 22:32:34 +01:00
Sam
43260c88f5 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-05 22:13:30 +01:00
Sam
ebc198f88a More bug fixes 2017-08-05 22:10:25 +01:00
Sam
d5fc1f32c3 Add the tester's UUIDs 2017-08-05 00:06:57 +01:00
Sam
1a671e8356 Add a castle seige title for the testers 2017-08-04 23:41:52 +01:00
Sam
eadfc55ae3 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-04 15:52:59 +01:00
Sam
193d3092df Remove unused categories 2017-08-03 11:18:53 +01:00
Graphica
0840153394 Add legacy sales package to flags 2017-08-02 22:38:59 -04:00
Sam
b692bf1e75 Make morphs display the current cost 2017-08-03 01:41:52 +01:00
Sam
eb9d13bf15 Fix a bunch of bugs 2017-08-03 01:41:30 +01:00
Sam
c88d609780 New Chest 2017-08-03 00:34:22 +01:00
Sam
3b637ca600 Implement client side shop morphs 2017-08-02 19:56:48 +01:00
Sam
b1bab85934 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-08-01 17:31:36 +01:00
Sam
c78eb933b3 Add skins into the UI 2017-08-01 17:00:40 +01:00
Sam
bf940177f9 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-01 13:07:01 +01:00
Graphica
8310849f04 Hide new flags for now 2017-07-31 22:37:49 -04:00
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
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
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
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
94ea5c4134 Cosmetic base 2017-07-27 12:33:04 +01:00
AlexTheCoder
8dcea688ed Add alchemist kit kills achievement 2017-07-26 23:34:00 -04: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
cfc1a29444 Merge branch 'bugfix/disguises' into develop 2017-07-26 20:25:17 -04:00
cnr
1fb69edc13 Add Timer ban action @ 15000 VL 2017-07-26 12:40:38 -04: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
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
8054296d0a Fix incorrect local removal of sales announcements 2017-07-22 20:31:51 -04: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
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
8516a98087 Lots of bug fixes 2017-07-20 00:32:42 -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
99c2522e92 Clean up the Clans blacklist GUI 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
cnr
6418a6006f Manually construct WatchableObjects for custom item frames 2017-07-14 03:00:59 -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
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
bfba119f3f Really hackily fix item maps 2017-07-13 00:16:50 +01:00
Sam
25d3c09329 Complete implementation of game stats 2017-07-12 23:33:45 +01:00
Sam
f437ada4b9 Progress on game statistics 2017-07-12 16:49:50 +01: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
cnr
c0cc3789b1 Fix server tps metadata key 2017-07-09 16:31:17 -07:00
Sam
84752f0b17 Item maps 2017-07-08 01:34:19 +01: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
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
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
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
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
041d0020bd Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/staff-titles 2017-06-30 14:22:52 +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
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