Commit Graph

2853 Commits

Author SHA1 Message Date
Sarah
9e63c9000a adding spectator rotation. 2016-01-25 04:30:42 +01:00
Virizion
bfe9aa7a59 Remove unnecessary tabs. Make the judge guardian use it's own laser again. 2016-01-24 21:55:57 -05:00
Virizion
0eda813d41 Fixed builds with only mobs not loading. 2016-01-24 19:14:34 -05:00
Sarah
00f01e09af adding entity spectating by right clicking and right clicking head in compass menu. 2016-01-24 20:00:05 +01:00
Virizion
a747426fa0 Fixed mobs. 2016-01-23 05:00:14 -05:00
Virizion
a359c4f8b6 Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder 2016-01-23 03:42:50 -05:00
Virizion
1e732b08e7 TICK TICK TICK TICK. 2016-01-23 03:42:36 -05:00
Cheese
790e2e8f73 Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder 2016-01-23 19:32:37 +11:00
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
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
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
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
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
Teddy
573d0dd67d Stats added for all other games 2016-01-19 23:10:45 +00:00
Shaun Bennett
951c27123a Remove /disguise for YOUTUBE_SMALL in arcade 2016-01-18 22:10:01 -05:00
Teddy
c52bc8024c Halloween, added kit to stats 2016-01-18 11:41:30 +00:00
Teddy
740eeae9bd Halloween, added stats 2016-01-18 11:40:46 +00:00
Teddy
3fc25359be Gravity, added stats 2016-01-18 11:38:43 +00:00
Teddy
b22f452b1f Gladiators, added stats 2016-01-18 11:36:16 +00:00
Teddy
297e9baf41 Evolution, added stats 2016-01-18 11:34:43 +00:00
Teddy
f3d27c9d93 Draw my thing, added stats 2016-01-18 11:32:40 +00:00
Teddy
3d88f5aaae Dragons, added stats 2016-01-18 11:11:32 +00:00
Teddy
ba50b5fdb1 Dragon Riders, added default registery 2016-01-18 11:09:19 +00:00
Teddy
c3d9be2123 Dragon Escape Teams, added stats 2016-01-18 11:05:09 +00:00
Teddy
85f4ee50f0 Dragon Escape, added stats + implemented kit display for stats 2016-01-18 11:04:12 +00:00
Teddy
66f484760e Death Tag, added stats 2016-01-18 10:53:56 +00:00
Teddy
96d16932dd Christmas Chaos, added stats 2016-01-18 10:50:04 +00:00
Teddy
dc44207d7a Champ TDM, added stats 2016-01-18 10:48:10 +00:00
Teddy
4e09aa4c34 Champ Dominate,added stats 2016-01-18 10:45:48 +00:00
Teddy
f79acaaa2a Champ CTF,added stats 2016-01-18 10:43:46 +00:00
Teddy
508c4e99d2 Castle Siege,added stats 2016-01-18 10:41:10 +00:00
Teddy
b0eb5a6d4e Cards Against Humanity, skipped/left blank 2016-01-18 10:34:43 +00:00
Teddy
56b3e482f2 Master Builders, added stats 2016-01-18 10:32:38 +00:00
Shaun Bennett
2b6074a210 Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command' 2016-01-17 22:46:56 -05:00
Sarah
5ed9295944 updating Hub command as well 2016-01-17 18:10:16 +01:00
Sarah
52bda30f85 Mysts OCD again...... 2016-01-17 03:03:00 +01:00
Sarah
4a5d6b5f2a Mysticates OCD.... 2016-01-17 02:48:15 +01:00
Sarah
410bc1c74b not being able to disguise as banned/muted players 2016-01-15 19:12:50 +01:00
Teddy
c16a719be1 Bridges, added stats 2016-01-15 13:37:55 +00:00
Teddy
9cd7240b61 BouncyBalls, giving errors when Loading, skipping chat stats 2016-01-15 13:28:42 +00:00
Teddy
ec75169b70 BossBattles, giving errors when Loading, removed chat stats. 2016-01-15 13:07:21 +00:00
Teddy
3315a510dc Barbarians stats added + Block break stat tracker added 2016-01-15 13:01:26 +00:00
Teddy
6a3e9ac19f BaconBrawl stats added 2016-01-15 12:10:53 +00:00
Mysticate
cf7f5af9ca Fixed who the winner is in MB Games. 2016-01-14 07:41:36 -05:00
Mysticate
2e433d8b06 Made sure that the active morph gets disabled on clear 2016-01-14 07:17:40 -05:00
Teddy
d33d682ebb Implementing stats for every game, got all stat names ready 2016-01-13 18:40:29 +00:00
Virizion
ee6425bbaf Removed extra blank lines. 2016-01-12 23:31:35 -05:00
Virizion
dfd5a63b78 More changes and fixes. 2016-01-12 23:29:08 -05:00
fooify
63897b9b54 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-12 20:05:34 -08:00
Virizion
528a7435e7 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2016-01-12 20:25:08 -05:00
Virizion
b27d5849d8 General fixes. 2016-01-12 20:23:25 -05:00
Teddy
f1314d5c26 JSON now handled by JsonMessage Builder 2016-01-12 13:25:47 +00:00
Shaun Bennett
4e9a4c87d4 Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
  fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
Teddy
88c53bf464 Added default ChatStat for all games to prevent my server from dying when testing 2016-01-11 19:35:00 +00:00
Teddy
02ff8bdbdb Custom stats working, escaping bug fix and List reset bug 2016-01-11 12:59:57 +00:00
Teddy
40d913beaf Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour 2016-01-11 12:35:44 +00:00
Teddy
b9d44d9a24 not updating properly, fixed 2016-01-11 12:14:29 +00:00
Teddy
78eaee98df Typo mistake 2016-01-11 12:09:08 +00:00
Teddy
ec6e916c7b more stable, progress for making 'easier-to-use' 2016-01-11 12:06:30 +00:00
Teddy
5caeb8bee0 even nicer visual 2016-01-10 17:34:15 +00:00
Teddy
c814132b24 ratio's and nicer visuals 2016-01-10 17:33:18 +00:00
Teddy
83375a6883 stats not updating 2016-01-10 16:01:40 +00:00
Teddy
1bce624ab3 Finally got rid of MalformedJSON 2016-01-10 15:13:11 +00:00
fooify
942460b471 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-09 13:05:44 -08:00
Teddy
263e1326cd JSON progress 2016-01-09 20:22:29 +00:00
Sarah
0f587ba5d9 fixing "Kicked for flying again" again... 2016-01-09 12:07:57 +01:00
Shaun Bennett
2df626b35e Fix CustomDataManager crash 2016-01-08 18:06:33 -05:00
Shaun Bennett
511b39caa7 Merge branch 'master' into develop 2016-01-08 17:05:54 -05:00
Sarah
5482d1dc40 Fixing "kicked for Flying" 2016-01-08 12:17:28 +01:00
Shaun Bennett
6096fcad42 Fix hotbar issues 2016-01-08 04:06:11 -05:00
Shaun Bennett
504d9d508c Slightly reduce Squid's Ink Blast damage in SSM 2016-01-08 03:15:30 -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
19bb44cb9a Disable HolidayManager and HolidayGiftManager 2016-01-08 01:41:02 -05:00
Shaun Bennett
003af1b87c Disable Holiday Words in DMT and Build 2016-01-08 01:38:49 -05:00