Commit Graph

10277 Commits

Author SHA1 Message Date
LCastr0
2c09bb584a Fixed Spring Set lore 2017-04-04 17:33:02 -03:00
LCastr0
424e0fe0a4 Fixed spring chests being purchasable even if locked or if player had all the items 2017-04-04 17:29:45 -03:00
LCastr0
957004f97a Added 'Found in X' lore 2017-04-04 17:28:11 -03:00
LCastr0
83d141eddc Changed price of Spring Halo particle 2017-04-04 17:25:16 -03:00
LCastr0
a7be020c9d Locked rabbit as adult 2017-04-04 17:23:43 -03:00
LCastr0
3bc4125b76 Removed custom pet from this update 2017-04-04 15:47:02 -03:00
cnr
6534561893 Disable April Fools manager 2017-04-01 23:59:47 -05:00
samczsun
ef21106da0 Fix memory leak in CompassModule 2017-04-01 16:20:59 -05:00
Sam
b88f9fc642 Change the skin to Topplemop 2017-04-01 02:11:11 -05:00
Sam
6adc1b265d Missed a file... 2017-04-01 02:11:11 -05:00
Sam
5bba8d2a5b Show how many they have found when clicking on a head 2017-04-01 02:11:11 -05:00
Sam
80eb8db8e2 Remove unused global variable 2017-04-01 02:11:11 -05:00
Sam
e71bab8cea Use a better DB schema 2017-04-01 02:11:11 -05:00
Sam
da29654807 April Fools Treasure Hunt 2017-04-01 02:11:11 -05:00
Sam
bd841762d1 Run skin getting on the main thread 2017-04-01 02:11:11 -05:00
Sam
016860b615 Replace NPCs with Pirates 2017-04-01 02:11:11 -05:00
Sam
4053e43964 Add a manual toggle 2017-04-01 02:11:11 -05:00
Sam
4b22355348 Add more fun stuff 2017-04-01 02:11:11 -05:00
Sam
52323f6119 Add more replacement words 2017-04-01 02:11:11 -05:00
Sam
e74486c1bc Add even more priate speak 2017-04-01 02:11:11 -05:00
Sam
4c882ae4a8 Fix chat handling elsewhere 2017-04-01 02:11:11 -05:00
Sam
66cea341a5 Use regex and remove "g" 2017-04-01 02:11:11 -05:00
Sam
03d781ca70 It be April fools matey, walk yee plank 2017-04-01 02:11:11 -05:00
cnr
850b7b1aad Merge remote-tracking branch 'update/aprilppc' into develop 2017-03-31 00:50:55 -05:00
Alexander Meech
10a1f71558 Add RustyDawgT to featured creators 2017-03-31 00:50:14 -05:00
LCastr0
ed39d5daa7 Reverted rename 2017-03-31 01:16:30 -03:00
LCastr0
911d5d20d2 Reverted rename 2017-03-31 01:07:00 -03:00
LCastr0
e8d6c321cd Merge branch 'develop' into update/aprilppc 2017-03-31 00:40:38 -03:00
samczsun
4d32efe779 Not even disguises are safe from the NSA 2017-03-29 23:31:12 -05:00
samczsun
c8eab2596f Move package because intellij is complaining 2017-03-29 23:31:12 -05:00
samczsun
c82697a4e3 PC-1396 2017-03-29 23:30:49 -05:00
samczsun
affb2cb91f PC-1395
Don't disable self otherwise a message is shown
2017-03-29 23:30:49 -05:00
samczsun
017d737e59 PC-1248 PC-1249 2017-03-29 23:30:49 -05:00
samczsun
53e8fa9c47 PC-1235 2017-03-29 23:30:49 -05:00
samczsun
52f09655e8 PC-1231 2017-03-29 23:30:49 -05:00
samczsun
53d9a5f977 PC-1222 2017-03-29 23:30:49 -05:00
samczsun
63eed1abcd PC-1210 2017-03-29 23:30:49 -05:00
samczsun
cb33bc7bed PC-1187 2017-03-29 23:30:49 -05:00
samczsun
fc686ea497 PC-1182 2017-03-29 23:30:49 -05:00
samczsun
40648cf715 PC-1178 2017-03-29 23:30:49 -05:00
samczsun
ca452463db PC-1106 2017-03-29 23:30:49 -05:00
samczsun
3ef8c6f532 PC-1101 2017-03-29 23:30:49 -05:00
samczsun
8226592caa PC-1026 2017-03-29 23:30:49 -05:00
samczsun
8a78f1ce34 PC-1026 2017-03-29 23:30:49 -05:00
samczsun
858b08e3c3 PC-825 2017-03-29 23:30:49 -05:00
samczsun
8521691cfb PC-817 2017-03-29 23:30:49 -05:00
samczsun
c95fea066c PC-778 2017-03-29 23:30:49 -05:00
samczsun
4ad5cede14 PC-740 2017-03-29 23:30:49 -05:00
samczsun
23c52eed2c PC-729 2017-03-29 23:30:49 -05:00
samczsun
3b8bda9dbd PC-728 2017-03-29 23:30:49 -05:00
samczsun
e45e27ba34 PC-629 2017-03-29 23:30:49 -05:00
samczsun
99534e19c5 PC-599 2017-03-29 23:30:49 -05:00
samczsun
66e3a7ad5c PC-587 2017-03-29 23:30:49 -05:00
samczsun
9256fe9903 PC-401 2017-03-29 23:30:49 -05:00
samczsun
1ecd46f7ee PC-372 2017-03-29 23:30:49 -05:00
samczsun
26d3a77748 PC-368 2017-03-29 23:30:49 -05:00
samczsun
953a87b3ea PC-207 2017-03-29 23:30:49 -05:00
samczsun
4f3cfaba43 PC-163 PC-200
Reset a player's spectator target when they switch servers
2017-03-29 23:30:49 -05:00
LCastr0
fec8a42fd7 Merge branch 'update/aprilchest' of https://github.com/Mineplex-LLC/Minecraft-PC into update/aprilchest 2017-03-28 17:29:05 -03:00
LCastr0
88db9c2913 Added Bugs Bunny to spring chest 2017-03-28 17:26:50 -03:00
Lucas de Castro Queiroz
60a688b5ac Merge branch 'develop' into update/aprilchest 2017-03-28 11:55:14 -03:00
cnr
a22467bc74 Add Skyfall map type to MapParser 2017-03-27 23:53:06 -05:00
cnr
9fcfab1a23 Fix GameType for Speed Builders in MapParser 2017-03-27 23:50:49 -05:00
cnr
ebb596cdf4 Re-enable whitelist for Gem Hunters 2017-03-27 23:47:25 -05:00
cnr
e3eac8b3ec Enable 2FA for support 2017-03-27 23:37:45 -05:00
LCastr0
ae2768d354 Changed name, lore, icon and cooldown 2017-03-27 23:58:01 -03:00
LCastr0
8da2431415 Added bugs bunny quotes 2017-03-27 22:39:50 -03:00
LCastr0
cb5a63974e Changed name of the item in PPC rewards 2017-03-27 20:21:46 -03:00
LCastr0
4f0110b942 Updated offset of the wings 2017-03-27 20:19:54 -03:00
LCastr0
235288af56 Changed wing shape again 2017-03-27 17:35:05 -03:00
LCastr0
3c241c48bc Changed rabbit morph to spawn holograms 2017-03-27 17:26:18 -03:00
Sam
fff18ef2a0 Revert "Make appler ignore damage rate"
This reverts commit e0819bfd7d.
2017-03-27 19:19:45 +01:00
Sam
e0819bfd7d Make appler ignore damage rate 2017-03-27 19:14:07 +01:00
Sam
421d76b7f3 More changes! 2017-03-27 19:08:31 +01:00
Sam
28fa092b20 Additional kit changes 2017-03-26 13:39:12 +01:00
LCastr0
1c1af8b81e Changed shape of bee wings 2017-03-26 08:09:58 -03:00
LCastr0
32bb2515f7 Changed height of skeleton 2017-03-26 01:26:43 -03:00
LCastr0
9ee6960038 Added bee wings 2017-03-26 01:25:08 -03:00
LCastr0
3837d9fbda This should have been added in the last commit... 2017-03-25 18:38:43 -03:00
LCastr0
bff837ca9b Fixed morph and possible fix for balloons, added lore and icon for particle effect 2017-03-25 18:36:12 -03:00
Sam
60231c817f Missed a class 2017-03-25 16:05:58 +00:00
Sam
02a6f34bd3 Destructor changes 2017-03-25 16:05:16 +00:00
Sam
5564dc7daf Fix even more bugs 2017-03-25 13:57:20 +00:00
LCastr0
6875287b6d Changed pets to Entities instead of Creatures 2017-03-24 16:52:37 -03:00
LCastr0
8a7f221bc6 Added spring chest to cust server 2017-03-24 14:20:10 -03:00
LCastr0
5464a74d2c Added spring chest 2017-03-24 14:17:15 -03:00
Sarah
b389041392 Change some more loot, not weapon doubles, 25% more boost from booster rings, fixed decay times for rings, let the complete surface of islands rot at once, specific items come with another item and a dynamic rot rate 2017-03-24 18:04:44 +01:00
LCastr0
d2851b0708 Merge branch 'develop' into update/aprilchest 2017-03-24 14:01:15 -03:00
Sam
8bddad44da Bridges hotfix 2017-03-24 16:46:14 +00:00
LCastr0
64ed3e2e1b Still trying with armor stands... 2017-03-24 13:45:36 -03:00
cnr
0ad69ebefc Revert "Merge branch update/bridges into develop"
This reverts commit 7e8f5b4939, reversing
changes made to 222e4267d2.
2017-03-23 23:24:00 -05:00
cnr
d95ed8d749 Disable /link and /unlink help messages 2017-03-23 23:22:33 -05:00
AlexTheCoder
3b2c50efa3 Remove magic values for PPC tag id and linked tag id 2017-03-23 23:18:29 -05:00
AlexTheCoder
1ff033de43 Refactor website link to use consumers instead of callbacks 2017-03-23 23:18:29 -05:00
AlexTheCoder
f6fdc1f817 Implement a method for administrators to remove the link between an in-game minecraft account and a forum account, and rewrite synchronization of tags to more effectively handle the intricacies of the API being utilized 2017-03-23 23:18:29 -05:00
AlexTheCoder
3ebfb453c5 Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag 2017-03-23 23:18:29 -05:00
cnr
e3c4d89d9a Disable 'Light em up' quest 2017-03-23 23:17:01 -05:00
cnr
5fa583109f Revert BungeeRotator US/EU merge
This reverts commits e59d744074 and
b8ac877fa3
2017-03-23 15:04:04 -05:00
cnr
9c504064c1 Force all players to reappear after win room 2017-03-22 22:41:08 -05:00
cnr
7e8f5b4939 Merge remote-tracking branch 'update/bridges' into develop 2017-03-22 22:37:43 -05:00
cnr
222e4267d2 Add UHC subtypes to server menu 2017-03-22 22:36:53 -05:00
Sam
401276d705 Missing isLive check 2017-03-22 23:04:50 +00:00
LCastr0
3b48a7caaf Update armorstand to make it never fall 2017-03-22 16:55:49 -03:00
LCastr0
49bc6b8663 Removed gravity 2017-03-22 14:42:11 -03:00
LCastr0
47b88b7734 Added Spring set, added awkward bunny morph, added items to menus 2017-03-22 14:37:42 -03:00
LCastr0
788326fe54 Tried with armorstands, still not working :( 2017-03-22 13:11:14 -03:00
Sam
1c620048ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-22 14:14:30 +00:00
LCastr0
9afa829f89 Created new gadget item for PPC 2017-03-21 15:56:05 -03:00
LCastr0
4cd25ad921 Merge branch 'update/aprilppc' into update/aprilchest 2017-03-20 19:23:33 -03:00
LCastr0
d55690f904 Changed colors 2017-03-20 19:22:50 -03:00
Sam
c4c7ebe1e6 Check for blocks already registering 2017-03-20 22:10:20 +00:00
LCastr0
8f7f52e222 Added lore and icon for Funeral Bouquet and corrected the price for spring items 2017-03-20 16:52:27 -03:00
LCastr0
33b933f465 Added lore and icon for Flower Power 2017-03-20 16:50:44 -03:00
LCastr0
540a0189b4 Added lore and icon for Flower Arrow 2017-03-20 16:49:20 -03:00
LCastr0
16f02d5bd4 Added killer bunny pet 2017-03-20 16:38:31 -03:00
LCastr0
5ad0bdcab1 Added Spring Arrow Trail, added Spring Death Effect, moved each gadget to it's own package, added Spring Double Jump 2017-03-20 16:33:21 -03:00
LCastr0
5d2681ec97 Fixed some issues with menus! 2017-03-20 16:33:20 -03:00
LCastr0
defece04a9 Fixed some issues changing Creature to Entity 2017-03-20 16:33:20 -03:00
LCastr0
df4d0b117b Possible fix for pet names not showing 2017-03-20 16:33:19 -03:00
LCastr0
f5a85f2a54 Spawns pet 2017-03-20 16:33:18 -03:00
LCastr0
13238eb4ad Added equipment pages 2017-03-20 16:32:34 -03:00
LCastr0
e297f844e6 Renamed classes 2017-03-20 16:32:34 -03:00
LCastr0
137220d58f Custom pets 2017-03-20 16:32:33 -03:00
Sarah
f8f7c04f58 Improve Performance, add dynamic rot rate, change some loot and islands only rot on the top 2017-03-20 19:18:33 +01:00
LCastr0
afad64bec3 Fixed CME 2017-03-20 08:49:20 -03:00
LCastr0
75ad5b9d51 Flowers where player walks 2017-03-20 08:23:32 -03:00
cnr
441e2ab30f Disable 2x XP 2017-03-20 01:19:21 -05:00
Sam
95d919a654 Removed was werid disjointed code 2017-03-19 00:07:23 +00:00
Sam
05bd93cbdf Fixed Death Bomber achievement exploit 2017-03-19 00:01:11 +00:00
Sam
18538d918c And 2FA wow, this is why you skim read PRs 2017-03-18 23:51:13 +00:00
Sam
df8ed90138 Ops, forgot to enable reports. Eclipse is bad 2017-03-18 23:44:42 +00:00
Sam
2ca0d0ce14 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-18 23:36:11 +00:00
LCastr0
e1d9a568c9 Added flower as a hat 2017-03-18 00:49:12 -03:00
LCastr0
d8b68e4716 Multi colored circle 2017-03-17 20:01:48 -03:00
LCastr0
92f5214c91 Added spring halo particle 2017-03-17 19:39:41 -03:00
Sam
b1a1faacb1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-17 17:03:55 +00:00
Sam
8e5a5695d5 Fix early game revive 2017-03-17 17:03:53 +00:00
cnr
b464cab213 Add former St Patricks cosmetic names as alternatives 2017-03-17 00:52:41 -05:00
samczsun
5349f53bfe Fix St Patricks Chest info 2017-03-17 00:50:14 -05:00
cnr
a0764443a8 Merge branch 'update/stpatrickscosmetics' into develop 2017-03-17 00:49:51 -05:00
samczsun
f6884fccd8 Change update protocol 2017-03-17 00:20:56 -05:00
samczsun
866b7bf63b Better help message 2017-03-17 00:20:56 -05:00
samczsun
a1bad6d07e QoL improvements 2017-03-17 00:20:55 -05:00
samczsun
e4cd809ce4 Teamspeak integration 2017-03-17 00:20:55 -05:00
LCastr0
561d4108c2 Merge branch 'develop' into update/stpatrickscosmetics 2017-03-16 22:52:07 -03:00
LCastr0
2070f7b347 Fixed lore for taunts 2017-03-16 20:09:51 -03:00
LCastr0
3303f89c02 Added St Patrick's Chest to titles trackers 2017-03-16 20:07:10 -03:00
LCastr0
e3974b9228 Fixed lores 2017-03-16 19:56:52 -03:00
cnr
d64f50b98e Don't combine require() and a method accessor 2017-03-16 01:13:54 -05:00
cnr
78b6846cf6 Add Titles to chests 2017-03-16 00:58:53 -05:00
samczsun
94009cd652 Final changes 2017-03-15 23:16:09 -05:00
samczsun
035f4637ba Tracks in chests! 2017-03-15 23:16:08 -05:00
samczsun
d1993465a6 Add to online player if they're online 2017-03-15 23:16:08 -05:00
samczsun
ca5b4386f3 Nevermind, make a new command 2017-03-15 23:16:08 -05:00
samczsun
1cb118d3e5 Allow force giving items 2017-03-15 23:16:08 -05:00
samczsun
db2feeac42 Reorganize tracks, add BotB track 2017-03-15 23:16:07 -05:00
cnr
e5d2ad34eb Merge branch 'update/stpatrickscosmetics' into develop 2017-03-15 23:15:10 -05:00
AlexTheCoder
572e461eb2 Remove stray debug text 2017-03-15 23:14:19 -05:00
AlexTheCoder
2dce455f93 Update Carl animation to use shards instead of coins 2017-03-15 23:14:19 -05:00
AlexTheCoder
2881071c74 Patch Carl reward animation not cleaning up and update the votifier server to use uuid as the key for the status repository 2017-03-15 23:14:18 -05:00
samczsun
4778d28be4 Allow overriding enabled team armor 2017-03-15 23:13:42 -05:00
Sarah
4f9cf987bd Change block rates and add Rate command 2017-03-15 21:30:48 +01:00
Sarah
1a061f6e2f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/compass/CompassAddon.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java

Rot starts at 2 minutes, Rings take 3 Minutes to rot, Top Island rots now, rings rot now
2017-03-15 17:38:07 +01:00
Sam
15d691370d Configuration for bridges 2017-03-14 21:05:52 +00:00
Sam
b35a9582df Optimise PlayParticle 2017-03-14 17:07:36 +00:00
LCastr0
a3861d43c4 Fixes costume throwing items without complete set 2017-03-14 13:32:49 -03:00
Sam
dae2eea01a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-14 16:08:57 +00:00
Sam
c8a9cffcdf Edit the documentation for per player world borders 2017-03-14 16:08:31 +00:00
Sam
a49b19ee0c Removal of kit progression from bridges 2017-03-14 16:08:16 +00:00
Sam
1e43398875 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-14 15:53:27 +00:00
cnr
96a471fa4e Disable mounts 2017-03-14 01:30:06 -05:00
cnr
eeee0bb893 Temporarily disable Gem Hunters tutorial 2017-03-14 01:26:39 -05:00
cnr
78a8e53d2e Re-enable 2FA for Gem Hunters 2017-03-14 00:41:11 -05:00
LCastr0
2b988a02d8 Fixed horse 2017-03-13 19:39:14 -03:00
Sam
654dddbf1b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-13 22:02:07 +00:00
Sam
a231c0b031 Wooo finally! 2017-03-13 22:01:06 +00:00
LCastr0
c54cd066ef Merge branch 'develop' into update/stpatrickscosmetics 2017-03-12 20:54:48 -03:00
LCastr0
401738f19a Removed horse cooldown 2017-03-12 20:53:43 -03:00
Sam
7ab201f206 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-10 18:10:12 +00:00
cnr
3dc36449b5 Add 2x XP and open Gem Hunters beta
This is for spring break, and ends 3/19
2017-03-10 00:29:11 -06:00
Sam
97cb5fe3ce Enable moderation module 2017-03-09 14:01:56 +00:00
Sam
105ab35bb6 Reset exp on death 2017-03-09 14:00:54 +00:00
AlexTheCoder
7ed485c7ca Lets turn up the heat on this chess match... 2017-03-09 01:07:30 -06:00
AlexTheCoder
9fdcce525b Make extreme prejudice a bit more sneaky 2017-03-09 01:07:30 -06:00
AlexTheCoder
b78ce421b5 Notify via redis when an extreme prejudice ban occurs 2017-03-09 01:07:30 -06:00
AlexTheCoder
1148283dff Implement targeted GWEN-based discrimination against certain ip addresses 2017-03-09 01:07:30 -06:00
samczsun
888761d15e Somehow missed Team Super Smash 2017-03-09 01:06:53 -06:00
samczsun
b5f026d4c0 Removem misleading comment 2017-03-09 01:06:53 -06:00
samczsun
a99cb6579d PC-814 2017-03-09 01:06:53 -06:00
samczsun
4be4fcb434 Fix Team Armor Addon (also PC-201) 2017-03-09 01:06:53 -06:00
AlexTheCoder
a069d7ab59 Remove unnecessary INNER JOIN in sql to load a home server id 2017-03-09 01:04:50 -06:00
AlexTheCoder
721dd5a29a Update SQL to follow table name standards, color channel names in Carl GUI, and fix item positions in GUI 2017-03-09 01:04:50 -06:00
AlexTheCoder
f2394da7dc Give RewardManager access to StatsManager 2017-03-09 01:04:50 -06:00
AlexTheCoder
a691d58840 Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper! 2017-03-09 01:04:50 -06:00
AlexTheCoder
7e70d02751 Properly award all values in BonusAmount wherever it is used for rewarding 2017-03-09 01:04:50 -06:00
AlexTheCoder
a4c875b4bd Refactor Clans gold to be set from Core 2017-03-09 01:04:50 -06:00
AlexTheCoder
9591485bb6 Re-implement voting with Gem rewards and start refactoring Carl gold rewards 2017-03-09 01:04:50 -06:00
Sam
b0b437ab4e Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-08 18:24:37 +00:00
Sam
a9b53c8608 Gem Hunters Phase 2 2017-03-08 12:51:16 +00:00
LCastr0
3469b890d4 Rainbow taunt now uses sides of player as locations 2017-03-07 21:51:06 -03:00