Commit Graph

513 Commits

Author SHA1 Message Date
AlexTheCoder
fea8822780 Bye bye halloween 2017-11-02 02:22:06 -04:00
AlexTheCoder
f7650afb88 Remove in-game facebook rewards 2017-10-22 22:29:16 -04:00
Sam
cde4e9dac8 Make sure that the new system can support the old lobby 2017-10-13 15:42:17 +01:00
Sam
4a9689bd17 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-10-01 14:41:38 +01:00
AlexTheCoder
0a5dae5857 Fixed merge conflicts 2017-09-23 03:58:40 -04:00
Sam
fd75b53bcc Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-16 23:33:43 +01:00
Sam
2b4e9e62e1 The mess that is now this 2017-09-16 23:33:42 +01:00
Sam
52adaf45a2 Only disable costumes 2017-09-13 22:59:19 -05:00
Sam
134039bf79 Revert "Revert "Disable gadgets if the game is in progress""
This reverts commit d3ae579317cc8db79e65468c0a5f85979d82ba37.
2017-09-13 22:59:19 -05:00
Sam
fba7997549 Revert "Disable gadgets if the game is in progress"
This reverts commit c03a0c859bbeaedb2640c2d6d927d40e42374f85.
2017-09-13 22:59:19 -05:00
Sam
f72c2d4ec0 Disable gadgets if the game is in progress 2017-09-13 22:59:19 -05:00
cnr
b860a69d46 Allow event hosts to use /game 2017-09-01 23:14:26 -05:00
cnr
919141f2a7 Merge branch 'develop' into feature/rank-rewrite 2017-08-30 17:42:16 -05:00
cnr
994f957bc3 Eliminate GroupPermission 2017-08-28 13:06:59 -05:00
Alexander Meech
d4071e6de5 Provide access to specific tournament controllers to stop active games 2017-08-09 22:37:38 -04:00
cnr
ba8f4e0d5a De-stringify permission groups 2017-08-09 22:26:55 -04:00
AlexTheCoder
482a02fee1 Small fixes 2017-08-09 16:26:55 -04:00
AlexTheCoder
aa79e9338d Implement permission requests from admin team 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
Sam
b7c629c4c8 Make item map billboards not really work 2017-07-11 02:10:43 +01:00
Sam
dbde734e76 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-03 14:54:43 +01: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
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
1db7454e81 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:19 +01:00
cnr
eec20cc620 Merge branch 'update/ssm' into develop 2017-05-17 19:22:59 -06:00
cnr
cc98f4fdd5 Disable banner service calls 2017-05-15 17:59:56 -07:00
Sam
f23e778d92 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-13 17:31:00 +01:00
Sam
dc2d317652 Fix merging with develop 2017-05-12 23:07:20 +01:00
cnr
b18d36b361 Merge branch 'feature/castlesiege2.0' into develop 2017-05-11 20:29:46 -07:00
samczsun
1390ea1579 Implement triggers 2017-05-11 19:29:32 -07:00
Sarah
16e0f38dcf Menu Improvements and more Quest Trackers 2017-05-11 18:08:55 +02:00
Sam
dcb676c57b Item upgrade effects 2017-05-10 19:25:56 +01:00
Sam
eec8e5143d Per player scoreboards 2017-05-09 23:16:34 +01: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
AlexTheCoder
7b70695e12 Update arcade games with new crown/gem toggle and flint and steel permission flag 2017-05-04 23:20:50 -04:00
Sam
8c2b8935df Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:37:13 +01: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
e350c62f54 Iron Golem and Skeleton converted to Google Sheets 2017-04-22 23:07:44 +01:00
cnr
87b829b411 Disable easter egg baskets in games 2017-04-19 22:33:32 -07:00
AlexTheCoder
9a58cd792e Implement easter egg baskets in games which can give fantastic rewards 2017-04-11 20:18:09 -04:00
samczsun
4be4fcb434 Fix Team Armor Addon (also PC-201) 2017-03-09 01:06:53 -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
Sam
3a4e973551 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-12 13:12:53 +00:00
Alexander Meech
1736b198f2 Fix Twitch+ Mps not properly showing information via MOTD 2017-02-09 22:44:18 -06:00
Sam
6cc5a14073 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-03 20:33:54 +00:00
samczsun
8a3b531a06 Bawk Bawk Battles rewrite 2017-02-02 00:31:58 -06:00
Sam
c6bb850bc3 Lots of stuff 2017-01-30 23:28:55 +00:00