Commit Graph

1448 Commits

Author SHA1 Message Date
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