Commit Graph

8524 Commits

Author SHA1 Message Date
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
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
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
Shaun Bennett f3e38031ab Add shadowmuting 2016-08-29 18:57:07 -04: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
TadahTech 41b40fa12c Fix painting breaking. 2016-08-25 03:54:10 -05:00
cnr 8617572980 Fix preferences menu interaction in Clans{,Hub} 2016-08-25 02:26:42 -05:00
TadahTech 77e0090531 Tweak preferences 2016-08-25 00:17:31 -05:00
TadahTech f518185518 Tweak parkour 2016-08-24 22:55:39 -05:00
TadahTech 1654850e8c Final Changes 2016-08-24 22:26:38 -05:00
TadahTech ba2bee4f25 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:29:01 -05:00
TadahTech bca19788db Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:28:36 -05:00
cnr 352e1e0eb2 Merge branch 'update/skywars-finalised' into develop 2016-08-24 17:22:01 -05:00
cnr df1fc60d3d Merge branch 'update/skywars-finalised' into develop 2016-08-24 17:12:58 -05:00
Sam 4088d2a311 Air teleportation fix
Makes it less likey that a player would die of fall damage when using
the eye of ender
2016-08-24 19:50:38 +01:00
TadahTech c9d14dc522 Update clans to new preferences. Remove debug messages. 2016-08-23 03:12:36 -05:00
TadahTech bbe44e7d75 Remove debug. 2016-08-23 02:04:07 -05:00
TadahTech 02f703e68e Remove debug. 2016-08-23 01:57:39 -05:00
TadahTech 42c228773c Fix entity directions 2016-08-23 01:52:19 -05:00
TadahTech 3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05:00
Sam 2c37d17db3 Slight code change 2016-08-22 19:42:30 +01:00