Commit Graph

7629 Commits

Author SHA1 Message Date
Ben c4fbae4bd1 added clan name blacklist and changed clans ban GUI 2016-03-19 06:11:32 +00:00
Ben 6172be5d76 few changes 2016-03-19 00:13:31 +00:00
Ben 2e9562fc50 fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map 2016-03-18 22:31:36 +00:00
Ben 8c7da5e98a some goals didn't commit 2016-03-18 03:01:42 +00:00
Ben 3ba138a8d7 some more objectives. 2016-03-18 03:01:11 +00:00
Ben 995d454f87 tutorial additions. 2016-03-18 02:47:51 +00:00
Ben 3b764920e1 duplicate messages 2016-03-18 01:22:15 +00:00
Ben a4cbe54c78 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-18 01:21:25 +00:00
Ben 2cf59ced8b new pvp timer management, fixed build house task, fixed incognito 2016-03-18 01:18:35 +00:00
Ben a3db70ad9c clear player inventory on tutorial start (and give map) 2016-03-17 09:44:03 +00:00
md_5 4899d56c09 Implement local gem boosters that can be activated on a joined arcade server. 2016-03-17 19:49:05 +11:00
Ben e6f4375041 build house goal [still broken] 2016-03-17 02:23:05 +00:00
Ben 929981419e disable item dropping & block breaking 2016-03-17 01:52:36 +00:00
Ben add651780b priority chat filters, fixed siege weapon clicking listeners being incorrect 2016-03-17 01:06:07 +00:00
Ben b164ff0729 Update res pack 2016-03-16 23:56:39 +00:00
Ben 1c1ed1613a allow kill command while in void/after other damage methods 2016-03-16 23:56:30 +00:00
Ben d625b20ea8 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-16 22:48:04 +00:00
Ben 93767b7a90 tutorial changes, chat filter system, commented out all web stuff for analytics. 2016-03-16 22:46:18 +00:00
Ben 2c9021fb81 some chat formatting 2016-03-16 22:31:35 +00:00
Joseph Prezioso Jr 7cf49dbe3b Refactored code to correct errors from previous commit 2016-03-15 20:46:30 -04:00
Joseph Prezioso Jr 5fdd3e0872 Updated North, South, East, and West Spawns and Centers 2016-03-15 20:12:09 -04:00
Ben 0d237370e1 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-15 23:33:09 +00:00
Ben 7589c63904 analytics progress 2016-03-15 23:32:56 +00:00
Ben 8897f2e86e fixed NPE 2016-03-15 23:11:08 +00:00
Ben 4638ba909d siege weapon finalizations & analytics (wip) 2016-03-15 22:52:13 +00:00
Keir Nellyer 25075597f2 Only allow Ultra+ players to use /report whilst it's in beta testing. 2016-03-15 17:43:16 +00:00
Shaun Bennett 4e85a315f9 Objectives! 2016-03-15 11:50:35 -05:00
Shaun Bennett e53b8616d1 A ton of tutorial work 2016-03-15 10:29:43 -05:00
Ben d7de4381a3 add 200ms damage delay to cannon damages. and add temporary damage holograms 2016-03-15 00:49:37 +00:00
Ben 813a3833ae implement temporary holograms 2016-03-15 00:48:50 +00:00
Ben 13bbcc51dc remove cannon pickup feature 2016-03-15 00:23:59 +00:00
Ben 3ae89e12a8 improve cannon UI 2016-03-15 00:21:37 +00:00
Ben c556d7b3c3 fix ConcurrentModificationException 2016-03-15 00:21:15 +00:00
Ben 864b12adbf make cannons explode chest items 2016-03-15 00:20:40 +00:00
Ben e08ba29ac1 Final fixing of cannon saving/loading 2016-03-14 22:48:31 +00:00
AlexTheCoder 3212b75e4e - Finally finished all of chiss' changes 2016-03-12 09:35:44 -05:00
Ben 422df69335 incognito async stuff and updated alpha holograms 2016-03-11 21:50:48 +00:00
Ben bdfb55d4e1 nevermind [revert leap change] 2016-03-11 21:22:01 +00:00
Ben bfdb7add2e run siege weapon queries async 2016-03-11 21:04:22 +00:00
Ben 1008c58e91 removed catapult code as it's very out of date at this point (and it's not being used hehe) 2016-03-11 19:33:02 +00:00
Ben eb0da6552c add C.cBlue to name of Outposts & Cannons. 2016-03-11 19:31:24 +00:00
Ben 523c194c56 Fix data values not being correct in shop page. 2016-03-11 19:31:05 +00:00
Ben d1c7879224 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-11 19:08:40 +00:00
Ben 45a0853564 remove test classes 2016-03-11 19:07:11 +00:00
Ben 86c50cc3cd updates 2016-03-11 19:03:32 +00:00
Shaun Bennett 1228ca227e Add support for 1.9 resource packs, Text Tutorials 2016-03-11 11:50:08 -06:00
Ben 2aa68d3e16 final stuff and map 2016-03-11 04:14:16 +00:00
Ben a27fb90c2a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 02:21:03 +00:00
Ben 0e276474c5 fixerroooniissssss 2016-03-11 02:20:18 +00:00
Ben 01ba099d74 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 01:52:38 +00:00