Commit Graph

8826 Commits

Author SHA1 Message Date
cnr
374142e63f Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:42:51 -05:00
TadahTech
e2f974e1e6 Add sounds and messages to basketball. 2016-09-02 00:40:23 -05:00
cnr
ae0d30558c Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:12:12 -05:00
AlexTheCoder
9abbe1bfb9 Update support whitelist and op list 2016-09-02 00:10:36 -05:00
cnr
f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
cnr
71b880793f Implement power play logging and initial rewards 2016-09-02 00:01:49 -05:00
TadahTech
9e0bb6ff96 Tweak invite starting index.
Disable NextBestGame in an MPS
2016-09-01 20:59:28 -05:00
TadahTech
d8486abbfd Fix minor best game issues. 2016-09-01 20:05:53 -05:00
TadahTech
a6360249b7 Use party if a player has it. 2016-09-01 08:47:43 -05:00
TadahTech
6f3d7dcd29 Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have 2016-09-01 08:45:43 -05:00
TadahTech
41936e0efc Remove users from the map. 2016-09-01 08:31:16 -05:00
TadahTech
fdc54e1dd1 Fix BestGame not cancelling for parties. 2016-09-01 08:29:51 -05:00
cnr
05f640266f Fix basketball scoring infinite loop 2016-09-01 06:36:47 -05:00
TadahTech
107a296239 Fuck you intellij 2016-09-01 05:49:59 -05:00
TadahTech
53846acbf6 Dont let Minestrike use NextBestGame 2016-09-01 05:39:47 -05:00
TadahTech
9fcee07427 Fix people getting stuck in chests. 2016-09-01 05:34:37 -05:00
TadahTech
68743cf73c Mavs changes. 2016-09-01 03:24:38 -05:00
TadahTech
46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
TadahTech
c0c75ea375 Allow team selecting to work on the mavs hub. 2016-08-31 23:46:29 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
cnr
55086efd91 Merge branch 'feature/shadowmute' into develop 2016-08-31 23:16:57 -05:00
LCastr0
8e8719070c Changes Omega Chest to not be craftable
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
2016-08-31 23:26:41 -03:00
AlexTheCoder
8397f53d39 Remove unneeded teleportation in clans hubs 2016-08-30 03:27:11 -04:00
AlexTheCoder
ba02dea404 Fix me being dumb 2016-08-30 03:22:55 -04:00
TadahTech
90ce21db3d Update preferences 2016-08-30 00:51:51 -05:00
AlexTheCoder
8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
TadahTech
a68f7395e4 Use proper server group / remove testing. 2016-08-30 00:10:38 -05:00
AlexTheCoder
5108a6f08d Convert to npc for entering mavericks lobby 2016-08-30 01:02:26 -04:00
AlexTheCoder
d7d8ef021e Disable using cosmetics inside mavericks hub 2016-08-30 00:47:48 -04:00
TadahTech
94bfc9aa15 Use proper server group / remove testing. 2016-08-29 22:33:01 -05:00
TadahTech
dfced7186f Finish tweaks for the hub 2016-08-29 22:32:07 -05:00
AlexTheCoder
463c03e9d1 Add pitch and yaw to npcs 2016-08-29 22:11:53 -04:00
Shaun Bennett
f72647e1d4 Merge with develop 2016-08-29 21:56:03 -04:00
Shaun Bennett
e7d876e865 Fix string.format param order 2016-08-29 21:33:00 -04:00
TadahTech
39ea280098 NextBestGame code and new hub releases 2016-08-29 20:21:36 -05:00
Alexander Meech
464c9fcdc3 Update steal chance 2016-08-29 20:37:02 -04:00
LCastr0
3687c7ad98 PowerPlayClub update 2016-08-29 21:32:11 -03:00
Shaun Bennett
f3e38031ab Add shadowmuting 2016-08-29 18:57:07 -04:00
LCastr0
3e38eb5990 Fixes to the merging conflicts 2016-08-25 20:13:59 -03:00
LCastr0
25d64c6dee Changes to lock command 2016-08-25 20:12:00 -03:00
LCastr0
e9ea832089 Merge pull request #186 from Mineplex-LLC/develop
New map merging
2016-08-25 20:05:53 -03:00
Sam
c2344a0494 Magnet not giving the kill 2016-08-25 20:26:18 +01:00
Sam
265ab620e4 Fix Magnet affecting teams members 2016-08-25 20:10:13 +01:00
Sam
9c5ab7c67e Remove Fire Aspect 2 2016-08-25 20:09:50 +01:00
TadahTech
2a861460c6 Remove unused variables 2016-08-25 05:12:29 -05:00
TadahTech
b3b8f44b3a Fix perks not being registered. 2016-08-25 05:11:52 -05:00
TadahTech
f976f56fb7 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 2016-08-25 04:26:21 -05:00
TadahTech
ebfd00ebc3 Fix centering of the Preference Menu 2016-08-25 04:04:53 -05:00
TadahTech
f9cc505908 Minor tweaks to soccer fields 2016-08-25 04:02:17 -05:00
TadahTech
19cfcc414b Fix stacking minecarts 2016-08-25 03:58:39 -05:00