Commit Graph

6415 Commits

Author SHA1 Message Date
Cheese c1ff7f4fc2 all players equal, no one loses 2016-01-23 19:32:23 +11:00
Virizion a75770b0a6 Change build to load from top instead of bottom. 2016-01-23 03:15:41 -05:00
Shaun Bennett 650d586e0f Add perfect build count to stats 2016-01-23 02:49:08 -05:00
Shaun Bennett f82a408f30 Build time modifiers 2016-01-23 02:43:41 -05:00
Virizion 5dc773032b Add joining players to guardians team instead of spectator. 2016-01-23 02:10:11 -05:00
Virizion 245cc1ed93 Limit Perfectionist achievement to 1. 2016-01-22 22:18:29 -05:00
Shaun Bennett 311d42db30 Use Garbo's description changes 2016-01-22 19:48:06 -05:00
Shaun Bennett 231b8cb19a Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
* commit '376f719c261bd2152a6646a152472a2485e1b689':
  fixes important bug, fixed a scary typo!
  Lots of typo fixes and such
  i before e!
  fixed cosmetic menu item dropping bug
  more grammatical errors hast been fixed
  Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
Shaun Bennett b2e4dff9e5 Add time to perfect build message 2016-01-22 19:18:23 -05:00
Shaun Bennett 02b45bd302 Forgot to register stat tracker 2016-01-22 19:14:25 -05:00
Shaun Bennett ddc86f0897 Add Speediest Builderizer achievement 2016-01-22 19:13:23 -05:00
Shaun Bennett d0e5be9c93 Guardian is impressed (untested!) 2016-01-22 18:35:18 -05:00
NewGarbo bf6f1a1701 sapling stuff messed up oops 2016-01-22 15:28:12 +00:00
NewGarbo 090b6e496a sapling stuff messed up oops 2016-01-22 15:27:44 +00:00
NewGarbo c524247777 supplies command for sieges 2016-01-22 15:27:10 +00:00
NewGarbo 6638562866 npe fix 2016-01-22 15:21:20 +00:00
NewGarbo f25c7b0277 don't need that + npe fix 2016-01-22 15:19:32 +00:00
NewGarbo b869d4a7a8 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-22 15:16:20 +00:00
NewGarbo c4bbeb2535 more control over saplings 2016-01-22 14:55:50 +00:00
NewGarbo a377a09925 fixed wind blade dupe bug 2016-01-22 11:22:20 +00:00
NewGarbo cc48d98208 pushing to beta to change to alpha 2016-01-22 11:06:19 +00:00
Virizion 3f715ab4dd Enable inventory click. 2016-01-22 02:23:58 -05:00
Shaun Bennett 4bbd956e14 Don't use the same build twice (untested!) 2016-01-22 01:37:47 -05:00
Shaun Bennett 49e439af55 Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-22 01:28:09 -05:00
Shaun Bennett 6bb60ddebd Ignore empty builds (untested!) 2016-01-22 01:27:29 -05:00
Virizion c66f37817e Fixed invis bug. 2016-01-22 01:22:31 -05:00
Virizion 5c83f5c1e5 Renamed to Speed Builders from Speed Builder. 2016-01-22 00:20:58 -05:00
Virizion 0da921f3d2 Removed debug thing. 2016-01-21 23:52:59 -05:00
Virizion a38319147a Stopped physics which fixed the torch bug. 2016-01-21 23:49:49 -05:00
Shaun Bennett 582fa4c915 Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-21 22:42:33 -05:00
Shaun Bennett c38596a09f Name the guardian, 10 seconds to view builds 2016-01-21 22:42:25 -05:00
Virizion 24e97176cc Call clear build area method on eliminate. 2016-01-21 22:05:30 -05:00
Virizion d37b8b40fc Disable item merge to (hopefully) fix phantom rails. 2016-01-21 20:41:28 -05:00
Virizion 50c9b33701 Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder 2016-01-21 20:13:53 -05:00
Virizion 636da8f4fa Mob destroying. Removed a debug change that only selected builds with mobs in them. 2016-01-21 20:13:32 -05:00
Cheese 5675aed698 velocity the drops to the player 2016-01-22 11:56:52 +11:00
Virizion 69825893c9 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-01-21 19:11:36 -05:00
Virizion 6ab6307f74 Pushing all my stuff for Shaunpai. 2016-01-21 19:08:38 -05:00
Shaun Bennett 877ec4710e Removing duplicate NCP hooks 2016-01-21 17:22:10 -05:00
Shaun Bennett 3803a3d82e Add player heads back to friends lsit 2016-01-21 17:19:51 -05:00
Shaun Bennett 0fd5540de6 Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
  Give item fix for offline players
2016-01-21 15:44:34 -06:00
Shaun Bennett a41816ca22 Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00
Shaun Bennett a0f39bf36e Merge remote-tracking branch 'origin/develop' into develop 2016-01-21 16:31:52 -05:00
Shaun Bennett 64ec092d09 Rename coin command to shard command 2016-01-21 09:10:39 -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 5af8d747b3 Merge remote-tracking branch 'origin/develop' into develop 2016-01-20 15:07:48 -05:00
Shaun Bennett 269cd710fc Fix wrong group id for spigot excludes 2016-01-20 15:07:39 -05:00
Shaun Bennett c0d4fa1bea Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
  Store winner UUID instead of Player object to avoid leaking excess data
  Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
Shaun Bennett 4924d652f5 Store winner UUID instead of Player object to avoid leaking excess data 2016-01-20 13:33:40 -05:00