Commit Graph

6693 Commits

Author SHA1 Message Date
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
Shaun Bennett 70d41b074f Merge pull request #154 in MIN/mineplex from develop to master
* commit '86917fb1463f018a1f00f80ffd919d1a4afadbb1':
  Fix treasure stair orientation
  add a shard queue to DonationManager, use that for TreasureShardReward
  Fixed various ways of players going invisible through Spec mode.
  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 05:29:42 -06: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