Commit Graph

10834 Commits

Author SHA1 Message Date
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
cnr
b6a1a3a054 Only request quests once on startup 2017-06-01 17:29:42 -05:00
Kenny Goodin
cea9b00b68 Subscribe to quest request channel before requesting from daemon 2017-06-01 18:27:02 -04:00
cnr
60a696a82e Subscribe to response channel before requesting quests 2017-06-01 17:25:30 -05:00
Sarah
b823fc62c9 Fix quests not disappearing after completing 2017-06-02 00:03:34 +02:00
Sarah
aaf4be1dc2 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:59:53 +02:00
Sarah
9b64f5da66 change quest name to "Mineplex Mission" 2017-06-01 20:59:35 +02:00
Kenny Goodin
2f1f7a1e7d Debug quest supplier 2017-06-01 14:59:22 -04: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
e94201409b Finalize raid system and implement Charles Witherton Raid 2017-06-01 02:16:12 -04:00
AlexTheCoder
fdd48b51d4 Start work on raids 2017-06-01 02:16:12 -04:00
AlexTheCoder
9fcf718e65 Tweak dye boxes 2017-06-01 02:16:12 -04:00
AlexTheCoder
b1b12babf0 Slight fixes to boxes 2017-06-01 02:16:12 -04:00
AlexTheCoder
21759c35c9 Added boxes to clans and used lambda for mount gui 2017-06-01 02:16:12 -04:00
AlexTheCoder
03149fc49b Implement the iron wizard boss with tidied up code and the new world event api 2017-06-01 02:16:12 -04:00
AlexTheCoder
4e58fa1e6c Implement an arena manager for the specific bosses on the map 2017-06-01 02:16:12 -04:00
AlexTheCoder
77f13f9b4c Slightly improve boss worldevent api 2017-06-01 02:16:12 -04:00
AlexTheCoder
a17b0c95bf Update existing command and api classes to support new worldevent changes 2017-06-01 02:16:12 -04:00
AlexTheCoder
b0297e404c Deactivate events lacking implementation 2017-06-01 02:16:12 -04:00
AlexTheCoder
3ea378110c Convert nether listener to spawn boss portals with the new boss event system 2017-06-01 02:16:12 -04:00
AlexTheCoder
150f1d1de9 Add implementation for managing world events 2017-06-01 02:16:12 -04:00
AlexTheCoder
cff2ca5414 Implement a new worldevent api to better handle events in clans, and begin implementing the api in place of the old 2017-06-01 02:16:12 -04:00
AlexTheCoder
b14ecdbe4f Fix outposts to not break if the clan has blank banner pattern layers 2017-06-01 02:16:12 -04:00
AlexTheCoder
8ea90eb914 Prevent breaking banners in zones the player does not have build access in 2017-06-01 02:16:12 -04:00
AlexTheCoder
9829527688 Remove armor stands causing memory leaks 2017-06-01 02:16:12 -04:00
AlexTheCoder
c78ee51307 Add method for testing 2d squared distance 2017-06-01 02:16:12 -04:00
AlexTheCoder
2f0acc4a00 Block outposts being spawned in water causing them to break 2017-06-01 02:16:12 -04:00
AlexTheCoder
8c911426fd Slight UI improvements and made fall damage no longer count towards mount despawn hits 2017-06-01 02:16:12 -04:00
AlexTheCoder
3c4eee910f Finish implementation of Mounts, tidy up mount saving, implement mount GUIs 2017-06-01 02:16:12 -04:00
AlexTheCoder
264b7f86cf Implement mounts and remove legacy horse dismount code 2017-06-01 02:16:12 -04:00
AlexTheCoder
8c27c4349d Allow horses to be forcibly spawned but prevent them from naturally occurring 2017-06-01 02:16:12 -04:00
AlexTheCoder
c6bd00a811 Make UtilEnt#GetMetadata actually return the field assigned to that metadata key and add a method to remove metadata from an entity 2017-06-01 02:16:12 -04:00
AlexTheCoder
76d5d3e896 More appropriately name fields in the CustomDamageEvent getDamagerPlayer method in order to be more understandable 2017-06-01 02:16:12 -04:00
AlexTheCoder
570355e41b Fix error runnables not being passed through even when intended to 2017-06-01 02:16:12 -04:00
AlexTheCoder
6d67a4f9f8 Fix null pointer causing console spam (SENTRY ISSUE 223503319) 2017-06-01 02:16:12 -04:00
AlexTheCoder
03d9032f82 Add backend system for saving/loading clans mounts with varied stats and skins 2017-06-01 02:16:12 -04:00
AlexTheCoder
b7a566744c Formatting fix 2017-06-01 02:16:12 -04:00
AlexTheCoder
cc1bb3cfe9 Make outposts utilize the Clan Banner of their owner 2017-06-01 02:16:12 -04:00
AlexTheCoder
2e04490001 Change nether miniboss rewards to drop crafting materials beyond diamonds and add the ability to drop set pieces 2017-06-01 02:16:12 -04:00
AlexTheCoder
48967b4a74 Block exploit allowing clans to make a lot of allies and then add members to disrupt the equation. Additionally, lower the maximum amount of allies per member 2017-06-01 02:16:12 -04:00
AlexTheCoder
35f2d42d08 Remove height limitations on planting crops 2017-06-01 02:16:12 -04:00
AlexTheCoder
1574d93d1b Re-implement the main clans tutorial 2017-06-01 02:16:12 -04:00
AlexTheCoder
08b89fbb4b Change farming shop prices 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
Sam
c34bf77dc9 More testing feedback 2017-06-01 00:55:33 +01:00
Sarah
738090bb30 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 00:34:38 +02: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
Kenny Goodin
1cf04592da Whoops, actually add the 'fail-safe' 2017-05-31 16:00:00 -04:00
Kenny Goodin
13ad590487 Reduce QuestDaemon log spam, add failsafe for when no active quests are loaded 2017-05-31 15:58:28 -04:00
Sarah
c355015041 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-31 21:51:25 +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
Sam
0edd2c8947 Feedback from testing 2017-05-31 13:05:06 +01:00
Kenny Goodin
ff12121926 Fix QuestDaemon command that didn't actually do anything 2017-05-31 02:35:16 -04:00
Kenny Goodin
028a4ecce3 Remove author tag 2017-05-31 02:15:23 -04:00
Kenny Goodin
ffdd82c34e Ignore quests in QuestDaemon process that have a cost of -1 2017-05-31 02:02:30 -04: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
cf8109b3bd Add method for detecting bottom slabs to UtilBlock 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
Kenny Goodin
b139d0550b Periodically purge expired elements from recently seelected quests repo 2017-05-30 20:36:39 -04: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
cnr
b9af3a8dfb Sort CMA in the tab list next to Mod 2017-05-29 22:49:01 -05:00
Alexander Meech
e501982712 Update cma scoreboard id 2017-05-29 22:48:25 -05:00
Alexander Meech
f793539cc4 Allow cma to see freeze/unfreeze information 2017-05-29 22:48:25 -05:00
Alexander Meech
57f2f7b686 Give cma access to clans punishments 2017-05-29 22:48:25 -05:00
Alexander Meech
1adb4b8239 Give cma access to freeze 2017-05-29 22:48:25 -05:00
Alexander Meech
cd8e805435 Give CMA access to unfreeze 2017-05-29 22:48:25 -05:00
Alexander Meech
2895397aec Implement CMA rank 2017-05-29 22:48:25 -05:00
cnr
1a59c050d3 Disable Alien Invasion event 2017-05-29 22:45:54 -05:00
cnr
f1bad41e89 Revert "Enable double XP + gems + shards for the weekend"
This reverts commit aa271a1bd3.
2017-05-29 22:44:54 -05:00
Sam
c3a80ed0cb Fix pumpkin king's death not being logged properly 2017-05-29 12:40:18 +01:00
Sam
9e9bfe79de Pumpkin king boss 2017-05-28 16:27:54 +01:00
Sam
911fd030f3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-28 13:20:24 +01:00
cnr
e51818c15d Reduce alien shard reward to 5 per hit and make lobbies nighttime 2017-05-28 02:08:17 -05:00
Sam
18197de7be Correct operator... 2017-05-27 18:24:51 +01:00
Sam
5bdcd3474f Only give the chest once 2017-05-27 18:23:53 +01:00
Sam
b9ad85dd1e Pumpkin King boss 2017-05-27 18:19:14 +01:00
Sam
ffa2a736ec Give players an omega chest for completing the event 2017-05-27 17:03:52 +01:00
Sam
8f2c84b842 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 16:46:20 +01:00
Sam
8e87b1d3e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 13:55:36 +01:00
Sam
7705bd34a3 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/aliens 2017-05-27 01:05:04 +01:00
Sam
27d9233566 While we're at it, change the easter egg achievement requirement 2017-05-27 01:05:02 +01:00
Sam
4d4988577e Use a more sensible method of awarding shards 2017-05-27 01:01:16 +01:00
Sam
e3f678d71d Bugs 2017-05-27 00:56:38 +01:00
cnr
aa271a1bd3 Enable double XP + gems + shards for the weekend 2017-05-26 18:20:27 -05:00
cnr
4a7ca75b24 Open UFO event for the weekend 2017-05-26 18:08:24 -05: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
Sam
5c8a36b024 Sigils bug fixes 2017-05-26 18:33:06 +01:00
cnr
b46464babe Reduce UFO beam radius from 5 -> 3 blocks 2017-05-25 22:42:14 -05:00
cnr
fbd39092f8 Add delay for should-start-invasion check 2017-05-25 04:47:35 -05:00
Sam
5ae32de83c Reduce the cooldown from 6 to 3 seconds 2017-05-24 21:05:58 -05:00
cnr
fd1cd148cb Implement Alien Event service calls on Hub/Arcade 2017-05-24 20:52:24 -05: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
94e97daede Add a nice message to the alien speak 2017-05-24 18:39:16 +01:00
Sam
3701d2d950 Remove pointless messages 2017-05-24 18:30:41 +01:00
Sam
a6c1e6c892 Make minions target each other 2017-05-24 18:27:10 +01:00
Sam
6f48d0ee43 Improve the path finding ai 2017-05-23 22:57:13 +01:00
Sam
78b10e3cb8 Fix the majority of bugs for the 1 lane game 2017-05-23 20:37:31 +01:00
Sam
40543a5034 Fix gametype import 2017-05-22 23:00:22 +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
4ed3135cdf Implement improved targetting system 2017-05-22 20:53:22 +01:00
Sam
49045e3f68 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-22 20:53:05 +01:00
Sam
176253faec Remove minion command 2017-05-21 17:33:33 +01:00
Sam
cbb63ba943 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/gem-hunters-dupe 2017-05-20 17:46:07 +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
Sam
670e9db9d2 Add Region to the slack logging 2017-05-20 17:33:00 +01:00
Sam
474c2e78f2 Check to make user the player has the itemstack when cashing out 2017-05-20 17:32:44 +01:00
cnr
85993053aa Fix circular Anticheat dependency 2017-05-19 23:40:56 -05:00
Sam
f1ac67f049 Fix skeletons dropping items 2017-05-19 21:55:51 +01:00
cnr
c60d357cfe Fix AntiHack quick-logout NPE 2017-05-19 14:53:40 -05:00
cnr
f565b0a9db Add Super Smash Mobs Training to compass and NPC menus 2017-05-18 21:46:18 -05:00
Sam
3794686f58 Velocity and armour fix 2017-05-17 20:15:14 -06:00
Sam
500367b473 Premtive hotfix 2017-05-17 20:15:11 -06:00
cnr
06a6d1914d Add new words to DMT and MB 2017-05-17 20:03:54 -06:00
cnr
2a7fea5936 Fix Anticheat ban message 2017-05-17 19:38:39 -06:00
AlexTheCoder
f69203884c Only allow kills to damage king/crystals if tnt has spawned at least once 2017-05-17 19:25:37 -06:00
AlexTheCoder
eb0e9c0504 Make speed potions level 1 and drinkable 2017-05-17 19:25:37 -06:00
AlexTheCoder
672ada3f31 Add Castle Assault TDM to compass 2017-05-17 19:25:37 -06:00
AlexTheCoder
c3bd123ea1 Live op numero uno 2017-05-17 19:25:37 -06:00
cnr
eec20cc620 Merge branch 'update/ssm' into develop 2017-05-17 19:22:59 -06:00
cnr
a50587a8de Merge commit 'b446a76' into develop
This contains changes originally planned for May 11th from the
update/gem-hunters-11-5 branch. The other changes in that branch will be
pushed at a later date.
2017-05-17 19:19:00 -06:00
Sam
c042af4a5a Buying -> Buy 2017-05-18 01:52:26 +01:00
Sam
d51cc4f56e Swap buying and selling 2017-05-18 01:23:41 +01:00
Sam
95b124e2f5 Fix Millionair and Middle Class causing players to be disconnected 2017-05-18 00:30:07 +01:00
Sam
81a869c264 Implement progression titles 2017-05-18 00:28:08 +01:00
Sam
9acfa361ad Add mosted valued player to the map 2017-05-17 19:21:19 +01:00
Sam
fb50acc4cc Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5 2017-05-17 17:31:06 +01:00
Sam
5d63a19506 Minion AI Base 2017-05-16 22:33:08 +01:00
Sam
604804ff96 Fix tower explosions not working as intended 2017-05-16 18:02:50 +01:00
Sam
833ebd310e Reorganise of code 2017-05-16 18:02:34 +01:00
Sam
4148af9214 Teleport players "correctly" to their lanes 2017-05-16 12:16:50 +01:00
Sam
73ac34ec3d Enable teleporting to lanes 2017-05-16 11:58:11 +01:00
Sam
0874458754 Make the wither display its health 2017-05-16 11:58:00 +01:00
Sam
119b041ec1 Fix second towers being invincible 2017-05-16 11:57:04 +01:00
Sam
977907de61 Fix NPCs not spawning for some players 2017-05-16 11:56:50 +01:00
AlexTheCoder
3abcb441bf Properly take into account server regions 2017-05-15 18:10:06 -07:00
AlexTheCoder
b73958ec96 Fix several issues on Gem Hunters, including a duping attack vector resulting from combat logger inventory desync 2017-05-15 18:10:06 -07: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
f9cdddf1ad Towers 2017-05-15 23:16:30 +01:00
Sam
4b6b04d4eb Fix incorrect custom location 2017-05-15 19:55:58 +01:00
Sam
989c9a028c End the game when a wither is killed 2017-05-15 19:55:39 +01:00
Sam
a450b23d22 Wither and AI base 2017-05-15 19:32:25 +01:00
Sam
d510dd9f58 Increase Fountain damage range 2017-05-14 11:46:24 +01:00
Sam
f2130515f3 Add suffixes to the scoreboard 2017-05-14 11:41:26 +01:00
Sam
c3b5b9a8bd Implement shops for all roles 2017-05-14 11:41:09 +01:00
Sam
f23e778d92 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-13 17:31:00 +01:00
Sam
5edbddb3d2 Make MobaItemEffect abstract 2017-05-13 17:30:59 +01:00
Sam
d493a61d3d Polish the hub event 2017-05-13 17:13:47 +01:00
Sam
9a96ce5018 Reward title ingame 2017-05-13 17:13:34 +01:00
Sam
bc5a9a1d5e Healing particle standard 2017-05-13 15:34:49 +01:00
Sam
85a384bad7 Unneeded if statement 2017-05-13 15:34:39 +01:00
Sam
321acce3c3 Make Bob Ross an invisible kit 2017-05-13 15:34:13 +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
AlexTheCoder
37d3b47995 Rebalance tank kit and set final values for kill streak crown rewards 2017-05-13 01:05:18 -04:00
AlexTheCoder
a42e6ed9e4 Change crown calculations again 2017-05-13 01:05:18 -04:00
AlexTheCoder
ea4f9aee62 Tweak crown kill streak multipliers 2017-05-13 01:05:18 -04:00
AlexTheCoder
130d1dc05e Fix TNT being stuck on head 2017-05-13 01:05:18 -04:00
Sam
a6ec243a02 Sneak cancels CreeperExplode 2017-05-12 23:19:12 +01:00
Sam
dc2d317652 Fix merging with develop 2017-05-12 23:07:20 +01:00
Sam
ff07d38d00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-12 23:04:47 +01:00
Sam
b18aa7e840 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 22:59:03 +01:00
Sam
42ef7d0590 Lobby class 2017-05-12 22:58:58 +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
ab35e96ca1 Add more polish 2017-05-12 22:21:59 +01:00
Dan Mulloy
35ed1099f9 Avoid instantiating HologramManager twice 2017-05-12 12:32:19 -07:00
Sam
abb983ac04 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 17:34:55 +01:00
AlexTheCoder
7b7b91ed3f Fix small gameplay issues and update kit selection data points for TDM 2017-05-11 21:48:21 -07:00
cnr
b18d36b361 Merge branch 'feature/castlesiege2.0' into develop 2017-05-11 20:29:46 -07:00
Sam
5c968890d3 Just implement logging 2017-05-11 19:58:57 -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
4a05149743 Use correct data loc pool for kit locations 2017-05-11 18:29:42 -04:00
AlexTheCoder
0091cbe2a8 Change kit data loc formatting 2017-05-11 18:15:33 -04:00
Sam
b446a7640e Hours not seconds 2017-05-11 22:56:48 +01:00
Sam
d7e3c25027 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5 2017-05-11 22:55:31 +01:00