JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,504 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

6504 Commits

Author SHA1 Message Date
Thanos paravantis 1e08e1a5db Update player death handling, add aggressive chicken behavior, minor changes and refactoring. 2016-02-26 18:17:03 +02:00
Thanos paravantis 0e697e279b Player death handling and chicken attack changes. 2016-02-25 23:35:38 +02:00
Thanos paravantis 1dbf7581d2 Add missing game class. 2016-02-24 21:45:38 +02:00
Thanos paravantis 27daace524 Rename game type to Bawk Bawk Battles, change item display to Egg. 2016-02-24 21:43:10 +02:00
Thanos paravantis f2d58bd55c Player death handling and chicken attack update, working version. 2016-02-24 20:13:23 +02:00
Thanos paravantis a7fb1df539 Experimenting with player death and chicken attack. 2016-02-24 18:10:57 +02:00
Thanos paravantis 6a234aa50f Chicken attack and death handling progress. 2016-02-23 18:56:49 +02:00
Thanos paravantis f1cb8378ac Test commit 2016-02-23 14:54:12 +02:00
Thanos paravantis 6d05c54a7a Commit before pulling from master. 2016-02-18 21:30:12 +02:00
Thanos paravantis 854ebf70c4 Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
	Plugins/Nautilus.Game.Arcade/.classpath
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
 2016-02-02 17:11:22 +02:00
Thanos paravantis 96cc73fcb7 Change challenge death handling, refatoring. 2016-02-02 17:07:04 +02: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
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
Shaun Bennett 3a945f190d Merge pull request #152 in MIN/mineplex from develop to master 
* commit '1e57f19bd605871c2f803741c7dc6f3e7b325647': (229 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:13:19 -06: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 509e0609c1 Gitignore redundant Eclipse files. 2016-02-01 10:34:11 +11:00
md_5 cc1ecbe0b8 Add Eclipse magic. 2016-02-01 10:24:49 +11:00
Thanos paravantis de1ee4f6cb Spectator and chicken attack changes. 2016-01-31 23:50:23 +02:00
Mysticate ace7d1764c Fixed various ways of players going invisible through Spec mode. 2016-01-31 10:22:59 -05:00
Thanos paravantis 1f22883c13 Refactoring challenge selection and updating. 2016-01-31 16:57:54 +02: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
Thanos paravantis 0e1a14a0c3 Countdown modifications, refactoring, dogs vs cats challenge changes. 2016-01-30 21:52:18 +02:00
Thanos paravantis 69dc888657 Refactoring. 2016-01-30 21:07:00 +02:00
Thanos paravantis 215fe68575 Start code refactoring. 2016-01-30 17:19:33 +02:00
Thanos paravantis e3a9f4f2f7 Chicken attack changes, refactoring, update map crumble variable access. 2016-01-30 14:14:55 +02: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 90603b3548 Merge pull request #140 in MIN/mineplex from clans/alpha to develop 
* commit 'c23855bd65c6aa4bc7adabae4a238c3717fff479': (35 commits)
  sapling fix
  disallow all staff from using /we
  disallow sapling in dispensers (grrr working in two different branches is really strange)
  fixed chatslow not working + filter not working for players not in clan
  no tnt from dispensers
  stop dispensers being used for flint-andsteal, bonemeal etc etc
  finally fixed that windblade dupe
  this is just really slowing down startup time by A LOT
  allow clans moderators to use /cb
  increased sapling cooldown to 20 minutes from one second.
  bumped version up to 0.19
  put cmod above support so that support can't bypass clans home block
  allow C.Mods to join all server regardless of home servers
  fix dupe bug and safelog
  sapling stuff messed up oops
  npe fix
  more control over saplings
  fixed wind blade dupe bug
  goes with the commit below VVVV
  outposts work (grr git is weird trying to switch over to clans/beta)
  ...
 2016-01-30 01:44:17 -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
Thanos paravantis c5a9f0c42c Chicken attack bug fixes, death effect improvements. 2016-01-30 00:13:41 +02: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
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Thanos paravantis 0530ea28e7 Improve chicken attack, fix mini oitq arrow damage. 2016-01-29 19:15:37 +02: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