Commit Graph

564 Commits

Author SHA1 Message Date
NewGarbo fde5a5af28 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-25 08:47:08 +00:00
NewGarbo 0b7cec60ae put cmod above support so that support can't bypass clans home block 2016-01-25 08:44:17 +00:00
NewGarbo 0252436990 cannons updates 2016-01-24 20:56:47 +00:00
NewGarbo 24011c4af4 cannons work 2016-01-23 12:46:52 +00:00
NewGarbo cc48d98208 pushing to beta to change to alpha 2016-01-22 11:06:19 +00:00
NewGarbo 1042edb134 CANNONZ! 2016-01-16 08:18:06 +00:00
NewGarbo 70444ff508 cannon + siege work with outposts, also moved outposts to the clans.siege package 2016-01-15 06:53:58 +00:00
Shaun Bennett d361ce948e Merge branch 'develop' into william-gladiators
# Conflicts:
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
Shaun Bennett b6b455c1c0 Merge pull request #117 in MIN/mineplex from clans/alpha to develop
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
  Added C.Mod rank, and started on rank info.
  changed outpost forcefields to be a bit larger to surround the outpost more.
  made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
  added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
  fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
  fixed outpost being built instantly on output block place.
  holograms above outpost block should be centered in the block and made them despawn on outpost death
  legendary pickkup message fix (FINALLY FIXED NOW )
  quick modification to outposts, and fixed the legendary announcements being weird
  updated clans version
  quikc change
  outpost changes, and some other things
  lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
  fixes (?)
  lots of changes that i can't remember at this point
  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.
  player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
  a couple more prettificatons to pvp timer messages.
  one more quick message change/fix
  qa changes to pvp safety
  ...
2016-01-08 00:35:15 -06:00
NewGarbo 15d2118bc1 Added C.Mod rank, and started on rank info. 2016-01-07 23:32:51 +00:00
NewGarbo e1e8c2bb97 changed outpost forcefields to be a bit larger to surround the outpost more. 2016-01-07 21:02:55 +00:00
NewGarbo 43f075014a made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request. 2016-01-07 20:05:33 +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 b685a207bc quick modification to outposts, and fixed the legendary announcements being weird 2016-01-07 09:34:16 +00:00
NewGarbo 52c4a55180 outpost changes, and some other things 2016-01-06 22:32:36 +00:00
libraryaddict c920d4efa1 Modify MapText to actually work, modify UtilText to save the images of characters 2016-01-07 04:48:44 +13: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
Shaun Bennett d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
NewGarbo 369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
NewGarbo ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
William Burns f57304764c Added a hotbar layout editor 2015-12-18 15:16:00 +00:00
Cheese 52394c89dd fixed skins beign wrong way around 2015-12-14 21:34:27 +11:00
Shaun Bennett e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Shaun Bennett 5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Shaun Bennett fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
xGamingDudex 64fb2b11d8 Added fake skin data
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
2015-12-13 23:09:25 +01:00
libraryaddict e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
xGamingDudex 6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
Shaun Bennett ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese 98e91d29f6 more cosmetic stuff :) 2015-12-11 17:21:54 +11:00
Cheese 05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +11:00
Cheese 3447de9a92 Merge branch 'master' into project-cosmetics
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
2015-12-11 15:20:50 +11:00
Cheese a5b28422cd cosmetics 2015-12-11 15:19:20 +11:00
libraryaddict 3cd187ff04 Move LineFormat.java 2015-12-11 16:57:21 +13:00
Shaun Bennett bc46518a05 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 22:54:53 -05:00
libraryaddict 4cfa7c436b Add missing file 2015-12-11 16:48:40 +13:00
Shaun Bennett 557f3e97a5 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:32:35 -05:00
William Burns 563a0f0ec7 remove tutorial and no flicker 2015-12-11 02:30:44 +00:00
libraryaddict 1661c056c1 Added line stuff 2015-12-11 15:21:05 +13:00
Shaun Bennett 2694787590 Reverting 2015-12-10 20:59:57 -05:00
Shaun Bennett 16f39c1e71 Pushing changes to go help william 2015-12-10 20:51:34 -05:00
William Burns 626a812844 Many changes 2015-12-11 00:40:54 +00:00
Shaun Bennett 72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:18:49 -05:00
Cheese fabf3dab59 updated blocksearch 2015-12-10 13:12:01 +11:00
Cheese 09d8367b4b fixed method 2015-12-09 07:32:36 +11:00
Christopher Jozsa 0b8e0409b6 Merge pull request #92 in MIN/mineplex from update-SSM to master
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
  SSM kit description change, grammar mistake
  SSM Pig bomb bug fix
2015-12-08 14:29:32 -06:00
Teddy 2bf1012fa4 SSM Pig bomb bug fix 2015-12-08 16:34:07 +00:00
Shaun Bennett a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
Cheese fe1f763374 changed order blocks will be added to the list 2015-12-08 15:26:32 +11:00