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
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
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
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
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
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
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
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
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