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 |
|
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 |
|
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 |
|
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 |
|
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
|
c23855bd65
|
Merge with develop
|
2016-01-30 02:44:24 -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 |
|
Shaun Bennett
|
50fc1f5a10
|
merge with develop
|
2016-01-29 03:44:04 -05: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 |
|
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 |
|
NewGarbo
|
682a243c31
|
fixed catapult state being mapped to incorrect blocks
|
2016-01-28 09:18:58 +00: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
|
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 |
|
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 |
|