Commit Graph

10282 Commits

Author SHA1 Message Date
cnr
da5df8dae2 Merge remote-tracking branch 'update/aprilchest' into develop 2017-04-12 23:03:47 -06:00
Alexander Meech
176107c848 Update the setup of CUST-1
Should probably make this dynamic at some point......
2017-04-12 23:02:53 -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
Sarah
4775fccb9a Improve Island rot and misc fixes 2017-04-12 22:35:33 +02:00
AlexTheCoder
5a225b9332 Properly check the spring chest rewards 2017-04-12 16:01:24 -04: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
c3ff494f94 Update Arcade and Hub to use skinned easter eggs 2017-04-12 03:06:32 -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
AlexTheCoder
2d61dffaea Implement an easter egg hunt of epic proportions 2017-04-11 19:57:10 -04:00
LCastr0
0a51bcd607 Easter, not eater 2017-04-11 16:10:59 -03:00
LCastr0
4388a7f70e Changed lenght (missed one thing) 2017-04-08 23:17:39 -03:00
LCastr0
7db5805f16 Fixed lenght 2017-04-08 23:11:41 -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
b441dc5edf Calls event when arcade game starts 2017-04-07 14:12:23 -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
08bd17afe6 Fix a chat formatting problem 2017-04-06 00:36:17 -05:00
samczsun
0cc7a078c6 Fix bad logic in TeamArmorModule 2017-04-06 00:35:49 -05:00
samczsun
36f4e6b5a1 Change more closeInventory calls 2017-04-06 00:35:49 -05:00
samczsun
8e92317b9c So that's why Tim closed inventories 2017-04-06 00:35:49 -05:00
samczsun
9c9d74f098 PC-1394 2017-04-06 00:35:49 -05:00
samczsun
be1e454d5c PC-696 2017-04-06 00:35:49 -05:00
samczsun
fceda64a5a PC-1318 2017-04-06 00:35:49 -05:00
samczsun
d69c4b3dca PC-1189 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
e0706f3627 PC-1056 2017-04-06 00:34:34 -05:00
samczsun
db59c32b5e PC-1028 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
f03df67219 PC-830 2017-04-06 00:34:34 -05:00
samczsun
873cd9c2a5 PC-802 2017-04-06 00:34:34 -05:00
samczsun
4f77413523 PC-265 2017-04-06 00:34:34 -05:00
cnr
a1fc6bd20f Merge remote-tracking branch 'bugfix/bridges' into develop 2017-04-06 00:33:47 -05:00
cnr
64d5fe3c80 Revert "Revert "Merge branch update/bridges into develop""
This reverts commit 0ad69ebefc.
2017-04-06 00:33:41 -05:00
LCastr0
888c26c12d Changed icon of bunny pet 2017-04-05 19:03:12 -03:00
Sam
cbf7985773 Colour the message 2017-04-05 22:58:06 +01:00
Sam
c1b83b1065 Braces 2017-04-05 21:46:22 +01:00
Sam
047ed81eea Add a message when a player dies pregame 2017-04-05 21:38:04 +01:00
Sam
1f1ad4c441 Change Diamond ore drops to diamonds 2017-04-05 21:35:04 +01:00
Sarah
acd588ff1a Add lucky/unlucky tracks to Skyfall 2017-04-05 04:40:52 +02:00
Sarah
e4b79a3731 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
2017-04-05 04:21:14 +02:00
Sarah
616e2dad0f Fix selection of air blocks when searching for top layer blocks
add some Supply Drop loot
dd /Boost command, fix AntiCheat
don't put duplicates in supply drop
don't crumble rings before the game begins
don't crumble middle rings
2017-04-05 04:15:48 +02:00
LCastr0
27d7226712 Fixed flowers dropping after chest is opened 2017-04-04 22:58:43 -03:00
LCastr0
cb5b0a3c83 Changed the icon of the death effect 2017-04-04 18:00:47 -03:00
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