Commit Graph

603 Commits

Author SHA1 Message Date
NewGarbo 2be917e623 give enemy info about time before siege and after outpost is built, the health of the outpost 2016-02-10 13:01:31 +00:00
NewGarbo 35f0162882 make catapults rideableeeeeee 2016-02-10 11:09:17 +00:00
NewGarbo 99ece6eaea add chest with arrwos to outpost. test for clans in area 2016-02-09 05:53:37 +00:00
NewGarbo 052d3c3380 siege system updates 2016-02-08 21:33:12 +00:00
NewGarbo 2c13824f9b possesive method in UtilText 2016-02-08 20:46:45 +00:00
NewGarbo fa460dbd45 catapult rotatyyyy 2016-02-04 21:50:47 +00:00
NewGarbo b13494f399 more modifications to siege weapons. 2016-02-04 16:00:41 +00:00
NewGarbo 9086188280 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-02 22:02:06 +00:00
NewGarbo 6fea76a8e4 finalized alpha patches 2016-02-02 21:38:38 +00:00
NewGarbo 23883148dd alpha fixes 2016-02-02 20:55:23 +00:00
NewGarbo 9fa5927240 siege weapon base progress 2016-02-02 19:41:25 +00:00
NewGarbo b4ed912f7d siege weapon modular system beginnings 2016-02-01 19:52:53 +00:00
NewGarbo cc857da88e Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
2016-01-31 16:27:14 +00:00
NewGarbo 002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
Shaun Bennett c23855bd65 Merge with develop 2016-01-30 02:44:24 -05:00
NewGarbo 7d28bc69c9 collision boxes on siege weapons and other stuff 2016-01-29 20:55:56 +00:00
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Shaun Bennett c1f91cbfb0 Final changes 2016-01-29 03:56:49 -05:00
Shaun Bennett 50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
Shaun Bennett d30fb8d8ef Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-29 03:40:28 -05:00
Shaun Bennett 0177cf91bb Merge with develop 2016-01-28 22:23:17 -05:00
Shaun Bennett f72ee95759 Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
  Remove debug message.
  Fix flickering judge laser.
  Borders for spec are fixed.
  Leaves fix.
  Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
  Make dependable require 50 perfect builds instead of 10.
  Multiply by less
  negative!
  Trying different hologram location
  Fix messages, fix /stats
  Center hologram
  Make achievement category classics
  hologram changes
  Holograms maybe?
  Chiss' checklist.
  Remove unnecessary tabs. Make the judge guardian use it's own laser again.
  Fixed builds with only mobs not loading.
  Fixed mobs.
  TICK TICK TICK TICK.
  all players equal, no one loses
  ...
2016-01-28 21:02:23 -06:00
NewGarbo f86262dc0e catapult and cannon progress 2016-01-28 23:32:23 +00:00
teddy 63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
teddy eed55b48ac Descriptions changed 2016-01-28 09:55:48 +00:00
NewGarbo 682a243c31 fixed catapult state being mapped to incorrect blocks 2016-01-28 09:18:58 +00:00
NewGarbo 7f7e73a101 more catapults! 2016-01-26 21:10:58 +00:00
NewGarbo 9215d0d3ff NegativeArraySizeException fix 2016-01-26 18:40:55 +00:00
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
Virizion 219b86ae55 Chiss' checklist. 2016-01-25 03:01:54 -05: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
Shaun Bennett 311d42db30 Use Garbo's description changes 2016-01-22 19:48:06 -05:00
NewGarbo cc48d98208 pushing to beta to change to alpha 2016-01-22 11:06:19 +00:00
Shaun Bennett 4bbd956e14 Don't use the same build twice (untested!) 2016-01-22 01:37:47 -05:00
Virizion 6ab6307f74 Pushing all my stuff for Shaunpai. 2016-01-21 19:08:38 -05:00
Teddy 1e72ebcbe6 Merge branch 'master' into rankdescriptions
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
md_5 447583624e Fix ascii.png duplication. 2016-01-21 17:47:21 +11:00
Shaun Bennett 037a2f8353 Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command 2016-01-20 13:04:31 -05:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11: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 6c055c31a0 Fix flashing through doors, Update to 0.18c 2016-01-10 20:39:56 -05: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