JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,949 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

1061 Commits

Author SHA1 Message Date
William Burns f2d450d26b PC-30 - Claim land objective should use clan GUI 2016-03-29 00:07:50 +01:00
William Burns fc473275b0 PC-37 - Move Identify shops objective before go to shops 2016-03-29 00:02:07 +01:00
William Burns f8211f26cc PC-18 - Remove PVP Safety Message in Tutorial 2016-03-28 13:36:43 +01:00
William Burns 3d0d7f9d71 PC-43 - Remove join/quit messages while in tutorial 2016-03-28 12:38:57 +01:00
phobia fd3a04e794 Fixes for tutorial 
PC-39    "about energy"
PC-32    Tutorial set home bed
PC-27    Change /c GUI for creating clan
PC-41    Disband via gui not command in tutorial
 2016-03-28 22:13:28 +11:00
Shaun Bennett fa0594b5db PC-24 - Update Spawn Island Hologram 2016-03-28 13:55:37 +11:00
Shaun Bennett 9ff7e2da82 PC-21 - Combine Tutorial 1 and 2 2016-03-28 11:52:18 +11:00
Shaun Bennett f7c57a7699 PC-22 - Update Scoreboard Text 2016-03-28 11:47:16 +11:00
Shaun Bennett 8c1b91cbf5 PC-23 - Hotbar Flashing Text 2016-03-28 11:37:35 +11:00
Shaun Bennett 2d30983711 Adjust visuals 2016-03-28 11:29:15 +11:00
Ben 1aa4b4a47d remove player from tutorial on kick 2016-03-27 15:36:54 +01:00
Ben e4e40baf52 final stuff 2016-03-27 06:48:23 +01:00
Ben b4d340a655 cb fixed 2016-03-27 06:21:32 +01:00
Ben a175ead44a finished tutorial! 2016-03-27 05:43:31 +01:00
Ben a30a591b58 disable certain clans commands whilst in tutorial 2016-03-27 02:04:33 +01:00
Ben a8bd0e4406 add current Clan Outpost to travel shop 2016-03-26 23:20:03 +00:00
Ben 2070f0925d teleport to spawn after tutorial ends 2016-03-26 22:49:06 +00:00
Ben 0559ad9567 remove "you have not set a home" message and added a set home message 2016-03-26 22:45:20 +00:00
Ben 23cfa8ec25 mine diamonds fix (have to mine 11 instead of 10) 2016-03-26 22:36:27 +00:00
Ben f201898420 mine diamond fix 2016-03-26 22:35:06 +00:00
Shaun Bennett 970d5a307c Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-27 09:17:39 +11:00
Shaun Bennett bace0b2557 Add Mining shop Location 2016-03-27 09:14:12 +11:00
Ben 9e0ba029b4 uhhh what 2016-03-26 22:10:19 +00:00
Shaun Bennett caf8170a32 Tutorial Changes 2016-03-27 08:47:34 +11:00
Ben a35bbeefdd attack enemy goals 2016-03-25 12:38:01 +00:00
Ben dade54e5fe Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-25 04:02:16 +00:00
Ben 195c990e29 further tutorial progress 2016-03-25 04:01:57 +00:00
Shaun Bennett 8c7d653cca Store location for teleport home 2016-03-25 13:13:15 +11:00
Shaun Bennett 8afed30c5a basic classes objectives 2016-03-25 13:07:53 +11:00
Ben d23804be70 fixes for shaun 2016-03-25 01:33:55 +00:00
Ben 87b1bf7dd0 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
 2016-03-25 01:30:46 +00:00
Ben 3cd7a5f12a NPE fix for cannons and more 2016-03-25 01:29:55 +00:00
Shaun Bennett c221e0e24f Fix potatoes 2016-03-25 12:26:13 +11:00
Ben 17c214c282 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java
 2016-03-25 00:08:28 +00:00
Ben 88b0ea1b72 tutorial progressss es 2016-03-25 00:06:51 +00:00
Shaun Bennett d5a89dc7fe Push for ben again 2016-03-25 11:05:05 +11:00
Shaun Bennett 7c06186a4f Fix cleanup and setup 2016-03-25 09:42:41 +11:00
Shaun Bennett 628604c353 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-25 08:44:08 +11:00
Shaun Bennett 051539dbf6 Add cleanup and setup 2016-03-25 08:43:37 +11:00
Ben af87dc9384 unsynchronized siege weapon support 2016-03-24 21:26:40 +00:00
Ben c381cc8fd7 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-24 21:14:34 +00:00
Ben cfb84dd545 fixes for shaun 2016-03-24 21:14:13 +00:00
Shaun Bennett 85511b4c26 Fixes for ben 2016-03-25 08:13:30 +11:00
Ben f000360565 missing a few files 2016-03-24 19:29:45 +00:00
Ben 2ef604aeaf attack enemy goal 2016-03-24 19:11:05 +00:00
Ben 7920f2729b Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-24 08:59:09 +00:00
Ben 2eb4d89875 i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages. 2016-03-24 08:58:48 +00:00
Shaun Bennett 4e26d2c7f1 Push code for ben 2016-03-24 19:37:56 +11:00
Shaun Bennett 2a89896084 Tutorial 2016-03-24 17:32:44 +11:00
Shaun Bennett dbd9567abb Tutorial work 2016-03-24 15:22:07 +11:00
Ben 2e41f906d0 moved completely to database managed clan blacklist, instead of the old hard-coded way 2016-03-21 22:37:35 +00:00
Ben 264e5d34b2 missing some files 2016-03-21 05:52:02 +00:00
Ben 723f62b8f9 incognito fixes and loads of other fixes 2016-03-20 01:06:46 +00:00
Ben ef1d6ede24 many fixes 2016-03-19 06:31:37 +00:00
Ben a21d43e58f fix NPE 2016-03-19 06:13:39 +00:00
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
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
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 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
Ben 422df69335 incognito async stuff and updated alpha holograms 2016-03-11 21:50:48 +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 0e276474c5 fixerroooniissssss 2016-03-11 02:20:18 +00:00
Ben 57c65cf5ff some changes and vanish fixes maybe? 2016-03-11 01:47:14 +00:00
Ben 8ce32fcdfa little tweakers 2016-03-11 00:58:47 +00:00
Ben bcfe4a42c0 changerooonis 2016-03-11 00:41:28 +00:00
Ben 33d978c6d6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-10 22:12:41 +00:00
Ben 20ade492a8 tnt generator changes 2016-03-10 22:09:45 +00:00
Shaun Bennett 76782fd420 Fix issues 2016-03-10 15:07:22 -06:00
Ben c2f6217d9f allowed sr. mods to use /we (TEMP) 2016-03-10 17:38:16 +00:00
Ben 0fd0a7fb44 mak esupply drop beacons more specific 2016-03-10 17:38:03 +00:00
Ben 2d2e88e069 some fixes and updates 2016-03-10 02:47:48 +00:00
Ben 9b40496a1e siege weapon picking up 2016-03-09 23:56:25 +00:00
Ben 1532abcc62 disable nether and legendary fixes 2016-03-09 21:12:02 +00:00
Ben 70aa5d63fd touched up on some messages 2016-03-09 13:10:39 +00:00
Ben 51e5552e2d Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-09 11:56:25 +00:00
Ben cf6645cec7 Legendaries and other preparation for beta 2016-03-09 11:55:40 +00:00
phobia e3fb40805c all siege items shouldn't be able to be placed or used while on PvP timer. 
Fixes to Jagged prefix
 2016-03-09 22:46:45 +11:00
Ben 5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Ben befb27d3db Finalized Vanish system 2016-03-09 01:45:17 +00:00
Joseph Prezioso Jr ac91ba690c Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-08 16:08:14 -05:00
Joseph Prezioso Jr b8f06374cd Made changes to accommodate for Clan ELO's 2016-03-08 16:07:52 -05:00
Shaun Bennett 99c2fefed2 Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-08 12:27:45 -06:00
Shaun Bennett 3283b873e7 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-08 12:19:28 -06:00
Ben 26b7ea2d59 fixes 2016-03-08 18:19:12 +00:00
Shaun Bennett 876a568bd0 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
 2016-03-08 12:17:07 -06:00
Shaun Bennett ffd9d98d2e Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-08 12:15:47 -06:00
Shaun Bennett e39b3de237 Fix errors 2016-03-08 12:12:44 -06:00
Shaun Bennett 890a3f4bc9 Merge develop into clans/beta 2016-03-08 12:09:04 -06:00
Ben d86ef81056 weaps oops 2016-03-08 01:11:16 +00:00
Ben 9953388b92 iunvseeeeeeeeeeee 2016-03-08 00:32:36 +00:00
Ben 48cfe4d91c fixed & inv see? 2016-03-08 00:27:06 +00:00
NewGarbo ae42aaaab1 Sammy changes + cleanup 2016-03-07 03:25:22 +00:00
NewGarbo 7e2086df1c flash fix, rares update, and outpost fixes 2016-03-06 19:55:58 +00:00
NewGarbo ae2da31544 Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-05 23:14:32 +00:00
NewGarbo 8cfbe20a08 re-added delay to /spawn 2016-03-05 23:09:57 +00:00
NewGarbo d92f817efc fixed some teleportation bugs and a bit of cleanup 2016-03-05 22:50:06 +00:00
NewGarbo e88736c1aa changes to scepter, NPE fix 2016-03-05 20:46:24 +00:00
NewGarbo d79107eaaa new legendary weapons and nether finzlizations 2016-03-05 03:07:25 +00:00
NewGarbo 7b9ff288f3 nether progresssisiannsnsssss 2016-03-03 23:23:20 +00:00
NewGarbo 73d8870daf nether work (forgot to commit days ago oops) 2016-03-02 19:42:53 +00:00
NewGarbo d524645ddd placed the clan name hologram thingy correctly because it's inside the outpost!!! 2016-02-23 19:11:29 +00:00
NewGarbo d65bf965c4 fix only some blocks of outpost being reset and explosion particles not showing up 2016-02-23 18:51:34 +00:00
NewGarbo 2956b18821 some hologram work 2016-02-23 18:45:04 +00:00
NewGarbo 879a211a41 change siege weapon damage indicator display length 2016-02-23 17:00:14 +00:00
NewGarbo deb22fd4e7 add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors 2016-02-23 16:54:07 +00:00
NewGarbo 205e3885b8 disallow players on pvp timer to use bows 2016-02-23 16:14:56 +00:00
NewGarbo 41e140d5ca stop players from placing water in outposts 2016-02-23 16:07:12 +00:00
NewGarbo bcd4480f23 stop recruits from opening trapped chests 2016-02-23 15:57:12 +00:00
NewGarbo 306e56980c remove weapon teleport fix 2016-02-23 14:44:07 +00:00
NewGarbo de4568d448 accurate-ish weapon damage tracking 2016-02-23 13:03:50 +00:00
NewGarbo f0fc2fd519 progress [testing github] 2016-02-22 20:44:00 +00:00
NewGarbo 76cf65c267 siege system changes 2016-02-22 09:34:04 +00:00
NewGarbo db7382d01e testing github? 2016-02-21 01:34:13 +00:00
NewGarbo 67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00