Commit Graph

110 Commits

Author SHA1 Message Date
Ben
a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
Ben
7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Ben
7de23216f6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 20:41:10 +01:00
Ben
b3b72f1ca0 commenting out clans bans 2016-04-04 20:40:58 +01:00
Jonathan Williams
e2baf2b56c Updated Clans to use the new ResourcePackManager.setResourcePack method. 2016-04-04 13:46:00 -05:00
Ben
14207c2073 clansbans 2016-04-04 14:56:20 +01:00
Shaun Bennett
e11a9379b9 More tutorial tweaking 2016-04-04 12:32:22 +10:00
Ben
40361acc9b fixed cannon becoming off-center 2016-04-03 17:51:56 +01:00
Ben
ccdd1f901f cannon 1.9 fixes 2016-04-03 17:23:55 +01:00
Ben
66a18dcc87 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
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-03 13:55:17 +01:00
Ben
c1b659e738 npcs on enemy base 2016-04-03 13:50:11 +01:00
Jonathan Williams
ff41ad248a Removed PvpTimer
Fixed issue where StatManager and FriendManager were created twice.
2016-04-02 02:47:17 -05:00
Shaun Bennett
d161d83d12 Maps and other various fixes 2016-04-02 15:43:03 +11:00
Ben
b4d340a655 cb fixed 2016-03-27 06:21:32 +01:00
Ben
2ef604aeaf attack enemy goal 2016-03-24 19:11:05 +00:00
Ben
2cf59ced8b new pvp timer management, fixed build house task, fixed incognito 2016-03-18 01:18:35 +00:00
Ben
b164ff0729 Update res pack 2016-03-16 23:56:39 +00:00
Ben
4638ba909d siege weapon finalizations & analytics (wip) 2016-03-15 22:52:13 +00:00
Ben
e08ba29ac1 Final fixing of cannon saving/loading 2016-03-14 22:48:31 +00:00
Shaun Bennett
1228ca227e Add support for 1.9 resource packs, Text Tutorials 2016-03-11 11:50:08 -06: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
9b40496a1e siege weapon picking up 2016-03-09 23:56:25 +00: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
NewGarbo
8c1ae12d19 beta stuff 2016-02-04 23:29:48 +00:00
NewGarbo
50c2da2a95 forgot to include this; version getter thingy in Clans 2016-02-04 16:10:14 +00:00
NewGarbo
7f7e73a101 more catapults! 2016-01-26 21:10:58 +00:00
NewGarbo
7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
NewGarbo
d4ccb82791 didn't push this earlier 2016-01-10 23:03:16 +00:00
NewGarbo
025615d080 Clans Alpha 0.18b fixes 2016-01-08 11:24:36 +00:00
NewGarbo
fff6d8e03f added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. 2016-01-07 19:36:52 +00:00
NewGarbo
d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
NewGarbo
ef929b39b3 updated clans version 2016-01-06 22:38:45 +00:00
NewGarbo
b47665e115 lots of work on outposts,
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
2016-01-02 14:02:50 +00:00
libraryaddict
1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
libraryaddict
67bdc6832f Tentative beginnings for clans resource packs 2015-12-24 07:40:49 +13:00
NewGarbo
ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
NewGarbo
1840572c49 Lots of changes, specifics:
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
2015-12-18 11:13:38 +00:00
NewGarbo
1da04b84b5 test push (change version to 0.17d) 2015-12-15 11:57:33 +00:00
Shaun Bennett
d5a9a92913 Forgot to push these changes last update! 2015-12-05 21:36:07 -05:00
Shaun Bennett
5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
Shaun Bennett
58d7e8562b update clans version for next release 2015-11-29 17:58:29 -05:00
Cheese
ab3d2ba098 updated tutorials.
added worldmanager to cull entities.
2015-11-28 00:23:18 +11:00
Shaun Bennett
a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Shaun Bennett
0b0710458f Hub updates/try to fix chiss stuff 2015-11-27 03:22:17 -05:00
Shaun Bennett
c150ea6175 Potatoes and Tornadoes 2015-11-25 19:08:13 -05:00
Shaun Bennett
cc75bafb4c Bugs and thugs 2015-11-25 16:45:04 -05:00
NewGarbo
2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
NewGarbo
3cb22c8cb7 uuid bug fixed finally! 2015-11-25 00:47:35 +00:00