4488b73e93
change catapult bounding box to 3
2016-02-03 17:02:31 +00:00
0cb557d922
moved some stuff around and slight changes
2016-02-03 17:02:06 +00:00
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
6bba486385
Added message if cannon is not loaded correctly
2016-02-03 11:20:11 +00:00
d4388870c1
fixed inventory opening on mount
2016-02-03 11:19:33 +00:00
8004d0dc3c
fixed npes
2016-02-03 11:06:58 +00:00
95741e3029
fixed siege weapon base
2016-02-03 10:53:53 +00:00
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
6fea76a8e4
finalized alpha patches
2016-02-02 21:38:38 +00:00
23883148dd
alpha fixes
2016-02-02 20:55:23 +00:00
cfbfb1fa3b
raised war points for invasion to 25
2016-02-02 20:42:20 +00:00
9fa5927240
siege weapon base progress
2016-02-02 19:41:25 +00:00
59e564cdc6
Fixes to war point evasion
2016-02-02 23:18:05 +11:00
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
8a0f585432
Added fix to WarPoint evasion bug + 1 dmg bug
2016-02-02 22:11:52 +11:00
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
84b887fe89
that's not needed
2016-02-01 19:53:59 +00:00
b4ed912f7d
siege weapon modular system beginnings
2016-02-01 19:52:53 +00:00
1e57f19bd6
Commons codec is not included in BungeeCord.
2016-02-01 18:18:23 +11:00
e887bbf543
Pooling with later jedis versions doesn't work on Bungee.
2016-02-01 18:13:50 +11:00
509e0609c1
Gitignore redundant Eclipse files.
2016-02-01 10:34:11 +11:00
cc1ecbe0b8
Add Eclipse magic.
2016-02-01 10:24:49 +11:00
45aacd626e
this isn't used anymore
2016-01-31 19:20:15 +00:00
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
002be01ef1
MAVEN TEST COMMIT
2016-01-31 16:21:04 +00:00
a5439943d6
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-31 15:47:52 +00:00
852f96a314
Speed up LobbyBalancer to 500ms
2016-01-31 09:45:34 +11:00
478b92db44
Add example maven settings.xml
2016-01-31 09:44:46 +11:00
b9354b7972
Remove setTestOnBorrow
2016-01-30 16:10:30 -05:00
9c83c64d01
Fixed issues with Broadsword
...
Added max building height of 100
2016-01-30 21:34:06 +11:00
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
aa0cfc7710
Fixes to TnTGeneration
...
Fixes to Broadsword giving Generation and slowness 42 instead of 4
2016-01-30 19:23:59 +11:00
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
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
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
1f2fc65f99
Tone down lobby balancer too.
2016-01-30 13:55:58 +11:00
7ed0ab442f
Emergency patch to slow down redis player count updates.
2016-01-30 12:36:20 +11:00
b45e00796d
Fixed explosions dropping right items.
2016-01-29 15:58:49 -05:00
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
d10266c4d1
sapling fix
2016-01-29 20:56:38 +00:00
7d28bc69c9
collision boxes on siege weapons and other stuff
2016-01-29 20:55:56 +00:00
76dba421b4
sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA]
2016-01-29 20:54:31 +00:00
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
1e29bd6936
Made block define its own drops.
2016-01-29 11:44:40 -05:00
447583aa2a
Removed an nunnecesarry method
2016-01-29 09:41:45 -05:00
075a1141f1
Fixed items not dropping their regular counterpart.
2016-01-29 09:36:09 -05:00
c1f91cbfb0
Final changes
2016-01-29 03:56:49 -05:00
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
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
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
NewGarbo
phobia
md_5
Shaun Bennett
Mysticate