Commit Graph

6460 Commits

Author SHA1 Message Date
Shaun Bennett 00f7880dd2 Fix compile error 2016-02-09 21:15:15 -06:00
Shaun Bennett e3ff25526b Merge pull request #164 in MIN/mineplex from valentines/game to develop
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
  valentines final push
  bug fixes
  more valentines :)
  many valentine, such wow
  val1
2016-02-09 20:28:58 -06:00
Shaun Bennett f6e091f029 Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
* commit '57638ff68496b6f10012f8782633066b52a8a715':
  More work on valentines
  Valentines gifts
  Added love potion and hub sheep thing.
  Started on Love Potion system. Switching branches.
  Varius tweaks and changes.
  Added sheep mount to index.
  Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
Shaun Bennett 57638ff684 More work on valentines 2016-02-09 16:26:17 -06:00
NewGarbo 43cf4d38ef give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :} 2016-02-09 21:36:58 +00:00
NewGarbo e74cefeee8 increased siege weapon placement area, and made outposts handle siege weapons that are placed within them 2016-02-09 19:59:01 +00:00
NewGarbo e782097563 shouldn't be able to fire weapons whilst in siege wait time 2016-02-09 19:49:25 +00:00
NewGarbo 2b44b88ea2 not being able to fire bow without the correct class and changed arrow to actually be an arrow 2016-02-09 19:48:48 +00:00
NewGarbo 67d1bffe82 npe and clan minimum players set for siege 2016-02-09 19:47:42 +00:00
NewGarbo 9342bee371 das ist gut 2016-02-09 17:05:59 +00:00
Cheese 6800e4ef47 valentines final push 2016-02-09 20:43:24 +11:00
NewGarbo 99ece6eaea add chest with arrwos to outpost. test for clans in area 2016-02-09 05:53:37 +00:00
Shaun Bennett a868b8b2b8 Valentines gifts 2016-02-08 22:26:33 -06:00
NewGarbo dd2fe36a3d added "Borderlands" to Clan name blacklist 2016-02-08 22:23:26 +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 b8471d7a8e getter for crater size 2016-02-08 20:46:15 +00:00
NewGarbo 3ee3059bc7 against clan needs to have a getter 2016-02-08 18:38:30 +00:00
NewGarbo 9379c4190a add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious 2016-02-08 18:31:03 +00:00
Virizion 51d152d484 Perfect build all fix 2016-02-07 19:05:53 -05:00
Virizion aaf1fd42f3 Only eliminated players are guardians. Broken blocks/mobs go directly into inventory. 2016-02-07 18:16:36 -05:00
Virizion b40f018ee2 Stop mid game joiners from getting participation gems. 2016-02-07 17:20:58 -05:00
Virizion e96b4c4a7f Mob egg baby fix. Also fixed non build entities from being "broken" 2016-02-07 15:59:59 -05:00
Virizion 008fc587b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-07 15:33:37 -05:00
Virizion 7e9ff95ae3 spec command add guardian 2016-02-07 15:27:39 -05:00
Shaun Bennett a5c5a7c536 Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
  Fixed NPE
  Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
Shaun Bennett c059425e9d Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
Mysticate 465f12e210 Fixed NPE 2016-02-07 13:27:38 -05:00
Shaun Bennett f502c2a693 Fix filtermessage sync calls 2016-02-07 12:15:08 -06:00
Mysticate a8ff714ee4 Added love potion and hub sheep thing. 2016-02-07 10:19:40 -05:00
md_5 f7b8dada6d Add Sentry to BungeeCord too. 2016-02-07 21:40:51 +11:00
Cheese 2ab1b51401 bug fixes 2016-02-07 14:09:02 +11:00
Cheese a35a9ea31f more valentines :) 2016-02-07 13:27:53 +11:00
Mysticate c1393697f8 Started on Love Potion system. Switching branches. 2016-02-06 14:08:17 -05:00
Shaun Bennett 4f5625d63e Clans Alpha 1.0 changes 2016-02-05 18:42:22 -05:00
phobia 27e4ef784c WP Evade 2016-02-06 08:44:37 +11:00
NewGarbo 9dc34b5a60 better damage calculation and fixed messages for siege weapon damaging 2016-02-05 19:12:12 +00:00
phobia b0888208d1 More alphs bug fixes 2016-02-05 23:55:38 +11:00
NewGarbo e448046e4f made inv get cleared on fire 2016-02-05 10:40:53 +00:00
Virizion 2ac7840d71 The infamous look direction bounce bug 2016-02-04 23:54:54 -05:00
Virizion b0b43524da Chiss' double jump mechanic 2016-02-04 22:05:46 -05:00
Mysticate b414642990 Varius tweaks and changes. 2016-02-04 21:58:55 -05:00
Virizion a76e570b8a Moar fixes 2016-02-04 21:43:17 -05:00
Cheese 690c2acce8 many valentine, such wow 2016-02-05 13:25:57 +11:00
NewGarbo bef898afc1 final fixes (? (still broken)) 2016-02-05 01:01:10 +00:00
phobia 6291decf87 Fixes to flame and broadsword 2016-02-05 11:42:39 +11:00
NewGarbo 1b92871b93 remove annoying debug messages 2016-02-04 23:50:44 +00:00
NewGarbo 62d45d5419 fix flip starngesness 2016-02-04 23:49:02 +00:00
NewGarbo f5d826a2cb two parentheses. all it took to fix it. GRRR 2016-02-04 23:42:27 +00:00
NewGarbo 8c1ae12d19 beta stuff 2016-02-04 23:29:48 +00:00
phobia 73d4ff2639 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-05 10:12:31 +11:00
phobia 6fd9cffb01 Clans alpha bug fixes 2016-02-05 10:12:18 +11:00
NewGarbo 16012285e0 rotation fix 2016-02-04 23:11:51 +00:00
NewGarbo 6c7d08a8f9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-04 22:55:53 +00:00
NewGarbo e61b36f55c Fixed /c stuck timer taking 7 seconds instead of 2 minutes 2016-02-04 22:55:37 +00:00
NewGarbo 03da4485b3 pushing to switch to clans/alpha 2016-02-04 22:54:43 +00:00
NewGarbo bc19cf01f7 hopefully that fixes the location offset =/ 2016-02-04 22:48:11 +00:00
NewGarbo fa460dbd45 catapult rotatyyyy 2016-02-04 21:50:47 +00:00
Mysticate e94222a68e Added sheep mount to index. 2016-02-04 13:13:22 -05:00
Mysticate c0d6cbbb85 Added various cosmetic items for Valentines day.
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
NewGarbo 50c2da2a95 forgot to include this; version getter thingy in Clans 2016-02-04 16:10:14 +00:00
NewGarbo 5a8fae4974 stop catapult projectile from getting stuck on bounding box 2016-02-04 16:09:32 +00:00
NewGarbo ecdd21a800 version or plugin command now shows version of clans 2016-02-04 16:09:13 +00:00
NewGarbo b13494f399 more modifications to siege weapons. 2016-02-04 16:00:41 +00:00
Cheese 5c22c841fe val1 2016-02-04 10:55:29 +11:00
Shaun Bennett 699a26f630 Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
  Fix treasure stair orientation
  add a shard queue to DonationManager, use that for TreasureShardReward
  mac fix
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Fixed various ways of players going invisible through Spec mode.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  ...
2016-02-03 16:06:59 -06:00
Mysticate af5cf309ca Made sure that a valid tool is used before dropping any items. 2016-02-03 14:43:14 -05:00
NewGarbo c17849b751 fixed some autoboxing stuff 2016-02-03 17:30:07 +00:00
NewGarbo 4e2da061bb added protection around siege weapon 2016-02-03 17:07:06 +00:00
NewGarbo 4488b73e93 change catapult bounding box to 3 2016-02-03 17:02:31 +00:00
NewGarbo 0cb557d922 moved some stuff around and slight changes 2016-02-03 17:02:06 +00:00
NewGarbo 38cae1e3a2 catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha 2016-02-03 15:28:53 +00:00
NewGarbo 6bba486385 Added message if cannon is not loaded correctly 2016-02-03 11:20:11 +00:00
NewGarbo d4388870c1 fixed inventory opening on mount 2016-02-03 11:19:33 +00:00
NewGarbo 8004d0dc3c fixed npes 2016-02-03 11:06:58 +00:00
NewGarbo 95741e3029 fixed siege weapon base 2016-02-03 10:53:53 +00:00
phobia 5fd089c768 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-03 17:43:43 +11:00
phobia f011fdad5f Fixes to TntProtection 2016-02-03 15:10:56 +11:00
phobia 0e0582a1a7 Added safe zone protection for flame 2016-02-03 10:39:21 +11: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 cfbfb1fa3b raised war points for invasion to 25 2016-02-02 20:42:20 +00:00
NewGarbo 9fa5927240 siege weapon base progress 2016-02-02 19:41:25 +00:00
phobia 59e564cdc6 Fixes to war point evasion 2016-02-02 23:18:05 +11:00
phobia f1c49fa5ee Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-02 22:13:38 +11:00
phobia 8a0f585432 Added fix to WarPoint evasion bug + 1 dmg bug 2016-02-02 22:11:52 +11:00
Shaun Bennett 86917fb146 Fix treasure stair orientation 2016-02-02 05:50:03 -05:00
Shaun Bennett a34ae8cf49 Merge remote-tracking branch 'remotes/origin/master' into develop 2016-02-02 05:37:30 -05:00
Shaun Bennett 0d02f526b6 Merge pull request #116 in MIN/mineplex from bugfix/duplicates to develop
* commit 'af27944a39129454b2963707c27799643d2440f1':
  add a shard queue to DonationManager, use that for TreasureShardReward
  Import clean up
  Changed TreasureShard rewarding, removed Queue
  Unused import removed
  Queue speed up
  Debugs removed
  Treasure not giving Shards when dupes occur, fixed.
  Queue implemented for duplicate shard reward
2016-02-02 04:35:44 -06:00
Shaun Bennett af27944a39 add a shard queue to DonationManager, use that for TreasureShardReward 2016-02-02 05:34:33 -05:00
Cheese 610522bdd9 mac fix 2016-02-02 09:25:46 +11:00
Shaun Bennett ee9e26e8ca Merge pull request #149 in MIN/mineplex from bugfix/spectator-infest to develop
* commit 'ace7d1764c68f6ea679ae60b3104d1af96e1869c':
  Fixed various ways of players going invisible through Spec mode.
2016-02-01 16:18:23 -06:00
Shaun Bennett 1a9c36d0a1 Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  Prep for update
  Update CB.jar
  Prevent hearts changing colors in UHC tab.
  Fixed ForTheKing achievement.
  ...
2016-02-01 15:49:34 -06:00
Virizion 41ea96d505 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-01 16:42:55 -05:00
Virizion 989c324a37 Hopper item pickup fix. 2016-02-01 16:18:40 -05:00
NewGarbo 04ec8a6a26 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
Conflicts:
	Plugins/pom.xml
2016-02-01 20:10:51 +00:00
NewGarbo 84b887fe89 that's not needed 2016-02-01 19:53:59 +00:00
NewGarbo b4ed912f7d siege weapon modular system beginnings 2016-02-01 19:52:53 +00:00
md_5 1e57f19bd6 Commons codec is not included in BungeeCord. 2016-02-01 18:18:23 +11:00
md_5 e887bbf543 Pooling with later jedis versions doesn't work on Bungee. 2016-02-01 18:13:50 +11:00
md_5 cc1ecbe0b8 Add Eclipse magic. 2016-02-01 10:24:49 +11:00
NewGarbo 45aacd626e this isn't used anymore 2016-01-31 19:20:15 +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
NewGarbo a5439943d6 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-31 15:47:52 +00:00
Mysticate ace7d1764c Fixed various ways of players going invisible through Spec mode. 2016-01-31 10:22:59 -05:00
md_5 852f96a314 Speed up LobbyBalancer to 500ms 2016-01-31 09:45:34 +11:00
md_5 478b92db44 Add example maven settings.xml 2016-01-31 09:44:46 +11:00
Shaun Bennett b9354b7972 Remove setTestOnBorrow 2016-01-30 16:10:30 -05:00
phobia 9c83c64d01 Fixed issues with Broadsword
Added max building height of 100
2016-01-30 21:34:06 +11:00
phobia 4612550ba5 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-01-30 19:24:42 +11:00
phobia aa0cfc7710 Fixes to TnTGeneration
Fixes to Broadsword giving Generation and slowness 42 instead of 4
2016-01-30 19:23:59 +11:00
Shaun Bennett 52b6779a4f Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
  Fixed explosions dropping right items.
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
2016-01-30 01:45:00 -06:00
Shaun Bennett c23855bd65 Merge with develop 2016-01-30 02:44:24 -05:00
md_5 1f2fc65f99 Tone down lobby balancer too. 2016-01-30 13:55:58 +11:00
md_5 7ed0ab442f Emergency patch to slow down redis player count updates. 2016-01-30 12:36:20 +11:00
Mysticate b45e00796d Fixed explosions dropping right items. 2016-01-29 15:58:49 -05:00
NewGarbo fe01c9b8d5 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-29 20:57:10 +00:00
NewGarbo d10266c4d1 sapling fix 2016-01-29 20:56:38 +00:00
NewGarbo 7d28bc69c9 collision boxes on siege weapons and other stuff 2016-01-29 20:55:56 +00:00
NewGarbo 76dba421b4 sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA] 2016-01-29 20:54:31 +00:00
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Mysticate 1e29bd6936 Made block define its own drops. 2016-01-29 11:44:40 -05:00
Mysticate 447583aa2a Removed an nunnecesarry method 2016-01-29 09:41:45 -05:00
Mysticate 075a1141f1 Fixed items not dropping their regular counterpart. 2016-01-29 09:36: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 a1f9f41910 Merge remote-tracking branch 'origin/develop' into develop 2016-01-29 03:37:03 -05:00
Shaun Bennett 863be023d9 Prep for update 2016-01-29 03:36:52 -05:00
Shaun Bennett 2e2a08bea8 Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop
* commit 'd1d3382ec065bb7c508044d53124266fda142c00':
  Prevented Coal particles from showing during the game
2016-01-29 02:33:57 -06:00
Shaun Bennett ba0dd3da44 Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
  Added proper ore pickup delay.
2016-01-29 02:33:23 -06:00
Shaun Bennett a0e9a82327 Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop
* commit '7d33e76055eb160e58d63443a72117e654df9468':
  Fixed ForTheKing achievement.
  Made sure Sniper achievement in Bridges is always fulfilled.
  Fixed + Tidied Gladiators Precision achievement.
2016-01-29 02:32:50 -06:00
Shaun Bennett 63fa942789 Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
  Prevent hearts changing colors in UHC tab.
2016-01-29 02:27:20 -06:00
libraryaddict dc469b9562 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2016-01-29 17:02:07 +13:00
libraryaddict 8aac172c4a Update CB.jar 2016-01-29 17:01:48 +13:00
Mysticate caa5d922b5 Prevent hearts changing colors in UHC tab. 2016-01-28 22:54:20 -05:00
Mysticate 7d33e76055 Fixed ForTheKing achievement. 2016-01-28 22:51:19 -05:00
Mysticate 733ba067fe Made sure Sniper achievement in Bridges is always fulfilled. 2016-01-28 22:49:51 -05:00
Mysticate fffa1d5926 Fixed + Tidied Gladiators Precision achievement. 2016-01-28 22:48:52 -05:00
Mysticate d1d3382ec0 Prevented Coal particles from showing during the game 2016-01-28 22:44:33 -05:00
Mysticate b92ddc7575 Added proper ore pickup delay. 2016-01-28 22:39:48 -05:00
Shaun Bennett 60ee5d1da0 Move disable custom inside of IsActive check 2016-01-28 22:33:48 -05:00
Shaun Bennett eb29c6b367 Fix constructor 2016-01-28 22:28:18 -05:00
Shaun Bennett 0177cf91bb Merge with develop 2016-01-28 22:23:17 -05:00
Shaun Bennett 40f6969413 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
Shaun Bennett 051d70771b Facebook Command 2016-01-28 22:15:35 -05:00
Shaun Bennett 251fb53f29 Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
  Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
Shaun Bennett bf273708f9 Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
  the L
  Updateting spectator Menu layout.
  fixing spec item in menu
  Removing right clicking.
  removing switching players until spigot patch is on.
  adding spectator rotation.
  adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
Shaun Bennett 015cca57b6 Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
* commit '75629055d851265e91eb7d0679a40a1357552e17':
  Un-register HotbarEditor MiniPlugin and fix /spec bug.
  Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06: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 7860ca24c8 disallow all staff from using /we 2016-01-28 23:33:06 +00:00
NewGarbo f86262dc0e catapult and cannon progress 2016-01-28 23:32:23 +00:00
Virizion b6db99806a Remove debug message. 2016-01-28 18:28:43 -05:00
teddy 96ea001291 Clean up 2016-01-28 23:05:27 +00:00
teddy da8a55f99c Final edits 2016-01-28 22:57:54 +00:00
William Burns 75629055d8 Un-register HotbarEditor MiniPlugin and fix /spec bug. 2016-01-28 20:43:58 +00:00
Virizion 04544c2b8d Fix flickering judge laser. 2016-01-28 14:28:47 -05:00
William Burns d44d4c2278 Un-register the hotbar page listener on disable. 2016-01-28 19:21:42 +00:00
teddy 63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
NewGarbo 37fb656279 dispenser 2016-01-28 13:31:45 +00:00
NewGarbo f645c4d6f8 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-28 13:30:50 +00:00
NewGarbo 88c1391ba2 disallow sapling in dispensers (grrr working in two different branches is really strange) 2016-01-28 13:30:16 +00:00
NewGarbo 8cb5591218 merge conflicts 2016-01-28 13:28:39 +00:00
NewGarbo a0cc0b7ec9 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/gameplay/Gameplay.java
2016-01-28 13:28:00 +00:00
NewGarbo b5f04011e5 fixed chatslow not working + filter not working for players not in clan 2016-01-28 13:24:30 +00:00
NewGarbo ceeeb3bc45 no tnt from dispensers 2016-01-28 10:58:46 +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
Teddy 70be135a40 Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
Shaun Bennett 3d4cd9ee27 Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager 2016-01-26 17:47:01 -06:00
Virizion 40113f99d3 Borders for spec are fixed. 2016-01-26 17:14:21 -05:00
NewGarbo 7f7e73a101 more catapults! 2016-01-26 21:10:58 +00:00
NewGarbo 3d7a371d1d catapults 2016-01-26 20:18:53 +00:00
Shaun Bennett 155d8bff1b Fix cannon angles 2016-01-26 13:36:30 -06:00
NewGarbo 9215d0d3ff NegativeArraySizeException fix 2016-01-26 18:40:55 +00:00
NewGarbo 63f9622876 cannon correctly loadded title + fixed rotation being all wrong 2016-01-26 17:51:29 +00:00
NewGarbo 7c85fe62ca charred blocks updates 2016-01-26 17:36:12 +00:00
NewGarbo 2445e73623 better cannon crater particles 2016-01-26 13:06:47 +00:00
NewGarbo 3b18b93286 fixed top right slot in cannon not counting as an empty slot. 2016-01-26 09:26:51 +00:00
NewGarbo 467af4b835 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-26 09:24:53 +00:00
Virizion 2f4146c243 Leaves fix. 2016-01-25 21:12:28 -05:00
Virizion c5dfddd710 Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket. 2016-01-25 20:54:01 -05:00
Virizion a1eec79b3b Make dependable require 50 perfect builds instead of 10. 2016-01-25 16:43:43 -05:00
NewGarbo e68dea65e1 stop dispensers being used for flint-andsteal, bonemeal etc etc 2016-01-25 17:46:39 +00:00
NewGarbo 18e892c4ec finally fixed that windblade dupe 2016-01-25 17:41:07 +00:00
NewGarbo 71bb1ed3d6 this is just really slowing down startup time by A LOT 2016-01-25 17:22:56 +00:00
NewGarbo 9d77632fcc allow clans moderators to use /cb 2016-01-25 17:18:00 +00:00
NewGarbo 2bf2050844 increased sapling cooldown to 20 minutes from one second. 2016-01-25 17:13:53 +00:00
NewGarbo 7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
NewGarbo 2b70daf8df allowed clans mods to use /cban 2016-01-25 17:02:49 +00:00
NewGarbo 5a5dc9925e set spawning rate of charred blocks a 10% lower 2016-01-25 17:02:26 +00:00
NewGarbo 208df93739 fixed fire particles not showing up in craters 2016-01-25 17:02:02 +00:00
NewGarbo ce36cf79bf added a tnt limit, set to 1 as it makes gameplay better 2016-01-25 17:01:46 +00:00
NewGarbo 9b88683fdc fix cannon tnt exploding prematurely, added cooldown rather than using Recharge. 2016-01-25 17:00:38 +00:00
Sarah 53132a248f the L 2016-01-25 12:28:21 +01:00
Sarah c7733bb068 Updateting spectator Menu layout. 2016-01-25 12:27:19 +01:00
Sarah 91b6ae8b09 fixing spec item in menu 2016-01-25 12:14:56 +01:00
Shaun Bennett 4314f35f80 Multiply by less 2016-01-25 04:46:47 -06:00