Commit Graph

4416 Commits

Author SHA1 Message Date
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
LCastr0
888c26c12d Changed icon of bunny pet 2017-04-05 19:03:12 -03: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
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
Sam
b86ad77e0b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:53:40 +01:00
Sam
bc1050e387 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:48:35 +01: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
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
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
52f09655e8 PC-1231 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
23c52eed2c PC-729 2017-03-29 23:30:49 -05:00
samczsun
3b8bda9dbd PC-728 2017-03-29 23:30:49 -05:00
samczsun
99534e19c5 PC-599 2017-03-29 23:30:49 -05:00
samczsun
9256fe9903 PC-401 2017-03-29 23:30:49 -05:00
samczsun
26d3a77748 PC-368 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
Sam
61147c1e38 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-28 20:43:22 +01:00
Lucas de Castro Queiroz
60a688b5ac Merge branch 'develop' into update/aprilchest 2017-03-28 11:55:14 -03:00
cnr
e3eac8b3ec Enable 2FA for support 2017-03-27 23:37:45 -05:00