Commit Graph

5166 Commits

Author SHA1 Message Date
AlexTheCoder
1ac59b409b Implement server-side regeneration speed management to nullify the effectiveness of regen hacks 2017-09-23 03:42:52 -04:00
AlexTheCoder
567b501dfb Fixed merge conflicts 2017-09-23 03:41:43 -04:00
AlexTheCoder
f05fb3d0e0 Fix cloaking conditions being stuck enabled after expiring naturally, fix fissure being able to duplicate blocks with physics (sand, gravel), fix Magnetic Maul pulling mounts allowing users to fly, prevent mount dismounting resulting in players going through walls, and improve visibility system 2017-09-23 03:40:38 -04:00
AlexTheCoder
eecf960613 Fixed Merge Conflicts 2017-09-23 03:40:21 -04:00
cnr
a419af7224 Temporarily disable FastBow check 2017-09-20 22:49:52 -05:00
Sam
76ae23b56f Start on profiles 2017-09-20 22:21:42 +01:00
Sam
5ec2307cc9 Cleanup CustomDataManager 2017-09-19 14:51:37 +01:00
Sam
e392b65c68 Document a portion of NPCs 2017-09-19 14:36:32 +01:00
Sam
de6ead8b2a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-19 12:38:31 +01:00
Sam
eb65a524f5 Improvements to the NPC system 2017-09-19 12:38:12 +01:00
Alexander Meech
96e3c300af Update permissions for xenforo link command (#482) 2017-09-18 23:58:32 -05:00
Sam
f7ae9ba982 Complete animations for the 3 old chests 2017-09-18 20:52:38 +01:00
Sam
efc1ffe9db Finish off Old Chests 2017-09-18 12:19:02 +01:00
Sam
fd75b53bcc Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-16 23:33:43 +01:00
Sam
2b4e9e62e1 The mess that is now this 2017-09-16 23:33:42 +01:00
Sam
61541c130f Don't get cosmetic data if cosmetics have been disabled 2017-09-13 22:59:19 -05:00
Sam
52adaf45a2 Only disable costumes 2017-09-13 22:59:19 -05:00
Sam
0458f18843 More hub stuff 2017-09-12 21:33:19 +01:00
cnr
6103c9e3da Fix Strict Mode VL displays 2017-09-11 22:49:00 -05:00
Sam
8532f6eca1 New Parkour System 2017-09-11 23:01:29 +01:00
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
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
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
39f11da634 Create flag gadget type 2017-06-28 20:38:58 -07:00
Graphica
f291d37896 Stop outfits from taking off flags 2017-06-28 18:40:24 -04: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
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
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
b7a094f472 Create flag gadget type 2017-06-28 01:30:29 -04: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
cnr
ed541b7a4f Disable automatic timings reports 2017-06-26 20:17:50 -07:00
Sam
c6a3001bae Basic battle royale game 2017-06-23 22:31:08 +01:00
cnr
dddeb69391 Change beta requirement to ULTRA 2017-06-22 23:35:10 -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
6b24c55fef Merge branch 'feature/moba' into develop 2017-06-22 23:15:16 -05: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
e99be53bb5 Add a middle class to deal with multiple modes 2017-06-22 12:07:11 +01:00
AlexTheCoder
61c57deaaa Disable these damn guardians lagging my clans servers 2017-06-19 19:01:09 -05:00
Sam
db98aa01c8 Training game base 2017-06-19 17:10:06 +01:00
Alexander Meech
7a2864a701 Merge branch 'develop' into feature/clans-season-3 2017-06-16 16:25:57 -04:00
cnr
336777f89a Add builders to the beta whitelist 2017-06-15 18:15:04 -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
cnr
05eabdbfd8 Merge branch 'feature/moba' into develop 2017-06-14 19:55:53 -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
c533b170fe Add /checkppc to CUST for detailed subscription data 2017-06-13 23:47:30 -05:00
Sam
4978f924a7 Lots of bug fixes 2017-06-13 21:49:34 +01:00
Sam
b6c5052db8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-09 13:10:14 +01:00
cnr
d226a4e710 Remove Gem Fountain and open brawl on weekends 2017-06-09 00:14:49 -05: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
Sam
206dd56d14 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 16:10:49 +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
044927252c More changes! 2017-06-08 01:55:07 +01:00
Sam
697d4a11ed Fix the Quest achievement looking for the wrong stat 2017-06-06 23:00:17 +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
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
Sarah
84cb803c66 Async db calls... 2017-06-02 13:22:12 +02: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
efdffa6272 Level reward system 2017-05-28 12:57:44 +01: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
LCastr0
91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
LCastr0
28a5a438f5 Fix item being thrown from the throne 2017-04-30 12:02:00 -03:00
LCastr0
95e4170cc1 Added creeper 2017-04-30 11:47:57 -03:00
LCastr0
08150b2c0f Added rank-based win effects 2017-04-30 11:28:40 -03:00
cnr
6ae6f7b627 Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
This reverts commit f5cba1eb1e.
2017-04-30 01:54:43 -07:00
Sarah
dda09d51e5 Fix Commit 2017-04-30 01:38:04 -07:00
Sarah
a0c00e86c4 Implement LoggedCommand into Event Commands 2017-04-30 01:38:04 -07:00
Sarah
8a33eabe3d Add a way to log commands 2017-04-30 01:38:04 -07:00
Sarah
fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
Sam
ee8f970673 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-29 23:40:16 +01:00
LCastr0
e6852d92f2 Fixed item, spawn particles even if player is moving 2017-04-29 13:24:27 -03:00
Kenny
f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
LCastr0
1879a92261 Changed to items... 2017-04-29 01:03:30 -03:00
LCastr0
146274001f Fix height (again) 2017-04-28 22:32:40 -03:00
LCastr0
25adf3fa33 Fix height 2017-04-28 22:04:00 -03:00
LCastr0
0a1a5eae7a Changed arrow to armor stand 2017-04-28 21:37:39 -03:00
LCastr0
f8566437d5 Fixed shimmering rings 2017-04-28 21:23:19 -03:00
LCastr0
df563793c5 Fixed name 2017-04-28 13:25:10 -03:00
LCastr0
adef8945a4 Disable other gadgets before enabling 2017-04-28 13:20:25 -03:00
LCastr0
c1f06595bb Fix NPE 2017-04-28 13:17:00 -03:00
LCastr0
1b686a1446 Shimmering Ring kit selector 2017-04-28 11:43:13 -03:00
LCastr0
89f47d4c6c Rain Cloud selector 2017-04-28 11:20:27 -03:00
LCastr0
42e4564a25 Rainbow Dance selector 2017-04-28 11:14:22 -03:00
LCastr0
e9d1ac85f1 Changed single-type particle to an enum, added love particles 2017-04-28 01:46:26 -03:00
LCastr0
ae8b348264 Ember Kit selector 2017-04-28 01:37:27 -03:00
LCastr0
1000c190a2 Fixed Y offset for Water Wings and added Flames of Fury and Halo effects 2017-04-28 00:32:29 -03:00
LCastr0
494fd4787c Skip disabling kit selectors between game restarts 2017-04-27 23:53:37 -03:00
LCastr0
073bc2eea7 Update hologram when player claims peasant 2017-04-27 21:18:12 -03:00
LCastr0
55f85966c1 Fixed arrow location 2017-04-27 21:17:05 -03:00
LCastr0
99363d9af5 Lore 2017-04-27 21:06:35 -03:00
LCastr0
16e9263874 Lets the player sit on the throne 2017-04-27 21:05:03 -03:00
LCastr0
d62d9a813b Javadocs 2017-04-27 20:55:21 -03:00
LCastr0
601c9e31c6 Updated hologram to display the amount of peasants in the kingdom 2017-04-27 20:54:49 -03:00
LCastr0
f1670bc550 Increase the height of the crown 2017-04-27 20:33:31 -03:00
LCastr0
e7c270847b Fixed message, and no longer updates without needing 2017-04-27 20:32:46 -03:00
LCastr0
e45e3be4e8 Added first kit selector 2017-04-27 20:01:29 -03:00
LCastr0
2615cd6add Fixed locations 2017-04-27 16:56:06 -03:00
LCastr0
246c0c1788 Added wools to the top of the castle 2017-04-27 16:28:09 -03:00
LCastr0
6a8cecad27 Javadocs 2017-04-27 15:43:55 -03:00
LCastr0
0942942f5a Changed messages 2017-04-27 15:43:31 -03:00
LCastr0
2e476226fd Javadocs for CastleManager 2017-04-27 15:16:34 -03:00
LCastr0
02785d5dfd Moved everything to CastleManager, changed to rightclick 2017-04-27 15:12:33 -03:00
LCastr0
124d22ce31 Added new class for peasants 2017-04-26 22:52:40 -03:00
LCastr0
4dfd1b3d21 Check for active gadgets while playing the particle 2017-04-26 16:22:24 -03:00
LCastr0
5764a4bce3 Added gadget class 2017-04-26 14:34:41 -03:00
LCastr0
01076ec054 Kit selector, not rank selector... 2017-04-26 14:10:49 -03:00
LCastr0
1855cfc4ed Added new gadget type 2017-04-26 13:58:30 -03:00
LCastr0
25487ad0b1 Fix message prefix 2017-04-26 11:17:03 -03:00
LCastr0
fb03e9adec Respawn holograms since setText doesn't work, and actually send the correct information to the event 2017-04-26 11:14:43 -03:00
LCastr0
56f19ec937 Null checker 2017-04-26 01:39:26 -03:00
LCastr0
6145d9f87d Lower the hologram a bit 2017-04-26 01:35:11 -03:00
LCastr0
9796b5acba Actually check if its a hub and start the hologram 2017-04-26 01:26:01 -03:00
LCastr0
19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
LCastr0
12f7659195 Added king particle 2017-04-25 00:16:32 -03:00
Sam
9d48a5f1a5 Creeper converted to Google Sheets 2017-04-23 16:08:45 +01:00
Sam
ac3c1c3ebb Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-21 17:42:46 +01:00
Sam
ca6789d92a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-21 17:35:12 +01:00
Sam
01f74a3e12 SSM Training Ground 2017-04-21 17:35:10 +01:00
cnr
ffdbebf3ee Prevent players from purchasing St Patricks Chests 2017-04-19 22:32:21 -07:00
cnr
6bf6725616 Commit missed conflict resolution 2017-04-18 01:40:09 -07:00
LCastr0
61409d0bfe Possible fix for duplicated items in some chests 2017-04-18 01:37:27 -07:00
cnr
dad00171a7 Clean up 'banwave' logic 2017-04-16 00:49:12 -06:00
LCastr0
09dc7edaad Added Spring chest to title trackers 2017-04-14 22:34:50 -06:00
cnr
c7e855ee16 Merge branch 'feature/eastereggs' into develop 2017-04-13 22:56:41 -06:00
cnr
7e7ac95ccb Change Skyfall stats icon to diamond boots 2017-04-13 20:47:19 -06:00
cnr
732d2cbeb8 Bump VL bounds for KillAura type A 2017-04-13 18:03:08 -06:00
cnr
8cbf8e8f1e Bump lower bound for Reach VL 2017-04-13 14:41:38 -06:00
cnr
ff3dbe5d93 Add missing AutoSneak ban 2017-04-13 13:30:53 -06:00
cnr
4e82233871 Make no-op thresholds a true no-op 2017-04-13 02:42:35 -06:00
cnr
5c5a368ebe Only register HeadRoll action once 2017-04-13 01:19:30 -06:00
Kenny
ac7492152a Fix average TPS reporting 2017-04-13 01:16:57 -06:00
samczsun
498df70a1f Implement basic canDamage 2017-04-13 00:02:32 -06:00
cnr
0735b415cf Implement new MineplexLink methods 2017-04-13 00:00:17 -06:00
cnr
490fe56b34 Merge branch 'update/skyfall-nolag' into develop 2017-04-12 23:39:01 -06:00
cnr
87f9fe6093 Implement anticheat VL and banwave changes 2017-04-12 23:36:55 -06:00
cnr
0dae58a0a7 Bump anticheat dependency version 2017-04-12 23:18:44 -06:00
cnr
da5df8dae2 Merge remote-tracking branch 'update/aprilchest' into develop 2017-04-12 23:03:47 -06:00
Kenny
cd7948c039 Report server TPS average to ServerMonitor rather than what it happens to be at that moment
This (should) fix instances of servermonitor flagging a server as lagging and killing it for short bursts of high CPU usage
2017-04-12 23:02:13 -06:00
AlexTheCoder
fe1cda820f Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs 2017-04-12 16:00:37 -04:00
AlexTheCoder
f3e6c44d9b Fix a bunch of bugs and switch to a block based egg hunt. Additionally, move some location constants to match the Easter Lobby. 2017-04-11 22:24:50 -04:00
LCastr0
1904990f84 Fixed merging issues 2017-04-11 23:16:42 -03:00
LCastr0
b511546b36 Removed age lock from zombie 2017-04-11 22:44:56 -03:00
AlexTheCoder
9a58cd792e Implement easter egg baskets in games which can give fantastic rewards 2017-04-11 20:18:09 -04:00
LCastr0
0a51bcd607 Easter, not eater 2017-04-11 16:10:59 -03:00
LCastr0
de46f2db70 Should have been added in the last commit 2017-04-08 23:09:10 -03:00
LCastr0
6f1c062182 Removed GameType, using GameDisplay instead 2017-04-08 23:06:55 -03:00
LCastr0
1f0a22eb94 Stops balloons from 'growing up' 2017-04-08 22:58:14 -03:00
LCastr0
e4fc53d5ce Removed flower trail from games 2017-04-07 17:46:53 -03:00
LCastr0
8bcb5bc948 Added event to be called when game stops 2017-04-07 14:13:53 -03:00
LCastr0
30215aea40 Added docs 2017-04-07 14:08:12 -03:00
LCastr0
6a668004e0 Added game start event to core, to be called inside arcade and handled inside core 2017-04-07 14:06:44 -03:00
LCastr0
45e3223962 Added effects to chets opening and changed flowers to leaves so they don't drop any items when removed 2017-04-07 14:02:30 -03:00
samczsun
daaea03be7 Strict username validation 2017-04-06 15:21:56 -04:00
Sam
5c00ca712f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-06 18:20:41 +01:00
Sam
f14bde9d30 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-06 11:56:59 +01:00
samczsun
be1e454d5c PC-696 2017-04-06 00:35:49 -05:00
samczsun
bd1d73d390 PC-1181 2017-04-06 00:35:49 -05:00
samczsun
4553a7081f PC-697 PC-1180 2017-04-06 00:35:49 -05:00
samczsun
40860ef9a2 PC-1107 2017-04-06 00:34:34 -05:00
samczsun
422bbcce2c PC-1025 2017-04-06 00:34:34 -05:00
samczsun
a97ba5d1fd PC-941 2017-04-06 00:34:34 -05:00
samczsun
4f77413523 PC-265 2017-04-06 00:34:34 -05:00