Commit Graph

1594 Commits

Author SHA1 Message Date
Sam
5dcad31240 Fix compilation 2017-09-16 23:35:31 +01:00
Sam
2b4e9e62e1 The mess that is now this 2017-09-16 23:33:42 +01:00
Sam
0458f18843 More hub stuff 2017-09-12 21:33:19 +01:00
Sam
8532f6eca1 New Parkour System 2017-09-11 23:01:29 +01:00
Sam
c208dfe103 Cleanup as much of Hub as I can, for now 2017-09-10 18:45:04 +01:00
Sam
2467b7d6ac Fixed bugs 2017-09-10 00:09:17 +01:00
Sam
218484c8d5 Fix PVP stats displaying for everyone 2017-09-09 20:36:47 +01:00
Sam
9d71cd7893 PVP Stats 2017-09-09 18:29:22 +01:00
Sam
30125038b5 UHC Duels hub game 2017-09-09 15:30:52 +01:00
Sam
8724a35269 Tron Hub Game 2017-09-06 11:22:49 +01: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
Dan Mulloy
a8a6e13fa0 Tab list sorting by rank weight 2017-09-01 14:03:47 -05: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
cd99700eda Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-01 16:12:51 +01: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
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
8e327e86b4 Huge improvement on the Cosmetic System 2017-08-26 16:14:22 +01:00
Sam
607d976f0e Change Castle Siege in the game menu 2017-08-17 23:59:38 -04:00
cnr
54919f8a6c Add 'new updates' text under Castle Siege 2017-08-09 22:53:56 -04:00
cnr
ba8f4e0d5a De-stringify permission groups 2017-08-09 22:26:55 -04:00
AlexTheCoder
87ac55de44 Unremove server/lobby switcher 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
cnr
eb566d3363 Remove debug broadcasts 2017-07-26 23:29:07 -04:00
Sam
099d2cb132 Cleanup HubVisibilityManager while slowing down the rate at which players are shown other players 2017-07-26 20:26:46 -04:00
Sam
86c733259f Allow double jumping when having hub velocity disabled 2017-07-26 20:26:46 -04:00
AlexTheCoder
06a90abc6a Properly store clans tag for sales announcement deletion 2017-07-22 22:21:12 -04:00
AlexTheCoder
8054296d0a Fix incorrect local removal of sales announcements 2017-07-22 20:31:51 -04:00
Dan Mulloy
fb28a953e6 Hide players from staff if the staff are also at the spawn point 2017-07-20 00:32:33 -04:00
AlexTheCoder
f00d9fbb54 Fix sales announcement remote updates being handled async 2017-07-17 13:57:38 -04:00
AlexTheCoder
953ad66aca Update SalesAnnouncement system to allow clans-only announcements and make cross-server updating work properly 2017-07-17 13:57:38 -04:00
Sam
968bcc0223 Add MOBA to the game menu 2017-07-14 18:03:09 +01:00
cnr
bdaea49d56 Fix Heroes of GWEN select menu 2017-07-13 23:47:56 -07:00
cnr
22676ab9e3 Add selection page for Heroes of GWEN training / normal game 2017-07-13 22:31:22 -07:00
Sam
b7c629c4c8 Make item map billboards not really work 2017-07-11 02:10:43 +01:00
Sam
c5818b1bb5 Update time! 2017-07-06 00:35:05 +01:00
cnr
5ba1630fae Merge branch 'update/july-cosmetics' into develop 2017-06-30 22:15:31 -07:00
cnr
dfe2a61b8f Revert freedom chest cosmetics 2017-06-28 23:43:30 -07:00
Graphica
7d17fa0f29 Update hubs with new CosmeticManager constructor 2017-06-28 20:38:58 -07:00
Graphica
9d1c3930b3 Update hubs with new CosmeticManager constructor 2017-06-28 01:37:33 -04:00
cnr
ed541b7a4f Disable automatic timings reports 2017-06-26 20:17:50 -07:00
cnr
d2c9173943 Add missing instanceof check 2017-06-15 17:19:19 -05:00
cnr
d226a4e710 Remove Gem Fountain and open brawl on weekends 2017-06-09 00:14:49 -05:00
Sarah
73897e407b Add fix for new game lobbies 2017-06-02 03:41:06 +02:00
Alexander Meech
01e7dc85dd Merge branch 'develop' into feature/quests 2017-05-31 22:21:24 -04: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
cnr
1a59c050d3 Disable Alien Invasion event 2017-05-29 22:45:54 -05:00
cnr
4a7ca75b24 Open UFO event for the weekend 2017-05-26 18:08:24 -05: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
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
9df9fb80da Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-22 22:59:46 +01:00
cnr
f565b0a9db Add Super Smash Mobs Training to compass and NPC menus 2017-05-18 21:46:18 -05:00
AlexTheCoder
672ada3f31 Add Castle Assault TDM to compass 2017-05-17 19:25:37 -06:00
Sam
d493a61d3d Polish the hub event 2017-05-13 17:13:47 +01:00
Sam
5454c00163 Hub integration 2017-05-13 15:15:51 +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
Dan Mulloy
35ed1099f9 Avoid instantiating HologramManager twice 2017-05-12 12:32:19 -07:00
Sarah
a07aa7abdc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-11 20:57:04 +02:00
Sarah
16e0f38dcf Menu Improvements and more Quest Trackers 2017-05-11 18:08:55 +02:00
AlexTheCoder
79560fd415 Implement Castle Assault into the selection compass and re-add old Castle Siege 2017-05-08 17:24:12 -04:00
AlexTheCoder
b9fd597370 Replace old castle siege with new castle siege 2017-05-08 01:14:17 -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
cnr
53eb499236 Use correct region when searching for Gem Hunters 2017-05-04 01:48:05 -07:00
cnr
6fdf926d51 Add temporary(!!) gem hunters server sender
In the near future, with more time, we'll abstract out the MOTD parsing
hackiness from ServerInfo and add the same mechanism to Gem Hunters, so
it gets a ServerNpcPage for free.
2017-05-03 22:02:02 -07:00
cnr
404733cd34 Disable Speed UHC 2017-05-03 18:42:31 -07:00
cnr
2a92d312b2 Merge branch 'update/kingppc' into develop 2017-05-01 22:07:46 -07:00
Sarah
4652b09f78 Change /ea message layout, make /ea not usable by muted players, make /ea not usable without content and fix hub forcefield for event mod 2017-05-01 22:06:30 -07:00
LCastr0
030157fdb5 Fix constructors 2017-05-01 23:18:03 -03:00
LCastr0
879ab605f1 Set hub as true in Hub 2017-04-30 19:50:45 -03:00
LCastr0
8c64441403 Removed CastleManager from HubManager 2017-04-30 19:41:57 -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
d33aac9fd4 Fixed args 2017-04-27 16:34:35 -03:00
LCastr0
5d5bc2d847 Reverted removal of fountain 2017-04-27 16:06:23 -03:00
LCastr0
19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
LCastr0
d36b44e32d Removed fountain in my code so I can test the castle 2017-04-25 12:12:51 -03:00
cnr
56e15ab2d9 Add Skyfall teams to game menu 2017-04-14 23:11:15 -06:00
cnr
2baaf4664e Fix UHC and Skyfall player counts 2017-04-14 22:39:06 -06:00
cnr
c7e855ee16 Merge branch 'feature/eastereggs' into develop 2017-04-13 22:56:41 -06:00
cnr
bc80b21372 Update skyfall in the game selector 2017-04-13 20:44:33 -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
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
AlexTheCoder
2d61dffaea Implement an easter egg hunt of epic proportions 2017-04-11 19:57:10 -04:00
samczsun
4553a7081f PC-697 PC-1180 2017-04-06 00:35:49 -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
4c882ae4a8 Fix chat handling elsewhere 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
samczsun
953a87b3ea PC-207 2017-03-29 23:30:49 -05:00
LCastr0
d2851b0708 Merge branch 'develop' into update/aprilchest 2017-03-24 14:01:15 -03: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
222e4267d2 Add UHC subtypes to server menu 2017-03-22 22:36:53 -05:00
LCastr0
defece04a9 Fixed some issues changing Creature to Entity 2017-03-20 16:33:20 -03:00
samczsun
e4cd809ce4 Teamspeak integration 2017-03-17 00:20:55 -05: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
cnr
06a71946a0 Publish server status earlier during startup
Servers are allowed ten seconds to publish their status on startup by
ServerMonitor. NpcManager can consume most or all of that allotted time
on EU, so we need to initialize ServerStatusManager first.
2017-03-03 08:15:56 -06:00
samczsun
b3cc9f29e2 Sentry Issue #223905084
Prevent NewsManager from updating news when none exists

Steps to reproduce:
1) Join the server while the server is starting up
2017-03-01 23:54:02 -06:00
cnr
699845d6d7 Merge branch 'feature/gem-hunters' into develop 2017-02-25 00:40:05 -06:00
cnr
7de556e3d8 Allow plugins to choose a hub type when restarting
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
2017-02-25 00:35:46 -06:00
Sam
2657a98e70 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-17 18:16:36 +00:00
samczsun
ecb42d91fe Fix bugs 2017-02-16 02:04:34 -06:00
Sam
7452712107 Fix Constants 2017-02-07 00:12:51 +00:00
Sam
c6bb850bc3 Lots of stuff 2017-01-30 23:28:55 +00:00
Sam
3557fd8acc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:21:03 +00:00
samczsun
343167245e Fix party chat 2017-01-19 18:16:43 -05:00
Sam
8a9a3cb2ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-19 21:16:12 +00:00
LCastr0
704c787008 Fixed lava and void issues again, prevents CME 2017-01-19 00:50:42 -06:00
samczsun
6692432c42 Smart™ Tab Completion©® 2017-01-18 23:30:39 -06:00
samczsun
8e5483e42b PC-190
Ignoring listened on too high of a priority and chat managers didn't
respect the recipients list. Those two issues have been fixed in this
commit
2017-01-18 23:20:24 -06:00
Sam
1a580251e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-17 09:51:17 +00:00
cnr
5ba3fac58c Check twofactor status instead of interact events 2017-01-14 01:29:37 -06:00
cnr
89ccaf4323 Disable hotbar items when authenticating with 2FA 2017-01-13 01:14:31 -06:00
cnr
cdfc19f566 Ignore canceled player interact events 2017-01-12 23:05:34 -06:00
cnr
8d33a49397 Use a more explicit title for classic MineStrike 2017-01-12 15:59:57 -06:00
Sam
d5be0f5061 Remove args to match new parameters 2017-01-12 18:04:59 +00:00
Sam
8d47e80066 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-12 18:03:07 +00:00
cnr
ac32fbb15e Add StrikeGames to MineStrike NPC's server page 2017-01-12 00:54:59 -06:00
samczsun
132036bd17 Move Constants to common 2017-01-11 20:42:46 -06:00
samczsun
39ba03d1b4 Convert to UtilServer.isTestServer 2017-01-11 20:29:36 -06:00
samczsun
19ac8f0c3b Create framework for proper test network 2017-01-11 20:29:36 -06:00
samczsun
56d4ed9e11 Parties rewrite
Basically everything got changed. Also Portal has a slightly better API
now
2017-01-11 19:50:26 -06:00
cnr
cea08cae67 Merge branch 'update/cosmetics-balloons' into develop 2017-01-11 15:32:41 -06:00
samczsun
cbe238c83d Don't give book on join 2017-01-11 15:11:57 -06:00
LCastr0
21473a7d82 Fixed merge conflict 2017-01-10 21:27:47 -02:00
Sam
64026f81ff Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-08 21:12:28 +00:00
Sam
0218965bee Villager trading and loot upgrades 2017-01-08 15:44:04 +00:00
cnr
fa6a60981c Return to normal hub type 2017-01-04 20:36:16 -07:00
cnr
3af401ee8f Implement two-factor authentication 2017-01-04 20:33:09 -07:00
LCastr0
6478656501 Fixed armorstand balloon types 2016-12-29 16:25:20 -02:00
cnr
ca19840b19 Revert "Disable communities temporarily."
This reverts commit 6d5d2b551b.
2016-12-22 16:50:35 -07:00
William Burns
6d5d2b551b Disable communities temporarily. 2016-12-22 17:07:36 +00:00
AlexTheCoder
2611ba7a7a Bugfixes from iteration, & new features requested by sampson sigils and relyh 2016-12-21 19:30:53 -07:00
samczsun
6970c3205e AntiHack Logging 2016-12-20 15:05:01 -05:00