fa460dbd45
catapult rotatyyyy
2016-02-04 21:50:47 +00:00
50c2da2a95
forgot to include this; version getter thingy in Clans
2016-02-04 16:10:14 +00:00
5a8fae4974
stop catapult projectile from getting stuck on bounding box
2016-02-04 16:09:32 +00:00
ecdd21a800
version or plugin command now shows version of clans
2016-02-04 16:09:13 +00:00
b13494f399
more modifications to siege weapons.
2016-02-04 16:00:41 +00:00
c17849b751
fixed some autoboxing stuff
2016-02-03 17:30:07 +00:00
4e2da061bb
added protection around siege weapon
2016-02-03 17:07:06 +00:00
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
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
f011fdad5f
Fixes to TntProtection
2016-02-03 15:10:56 +11:00
0e0582a1a7
Added safe zone protection for flame
2016-02-03 10:39:21 +11: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
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
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
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
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
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
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
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
dc469b9562
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2016-01-29 17:02:07 +13:00
8aac172c4a
Update CB.jar
2016-01-29 17:01:48 +13:00
caa5d922b5
Prevent hearts changing colors in UHC tab.
2016-01-28 22:54:20 -05:00
7d33e76055
Fixed ForTheKing achievement.
2016-01-28 22:51:19 -05:00
733ba067fe
Made sure Sniper achievement in Bridges is always fulfilled.
2016-01-28 22:49:51 -05:00
fffa1d5926
Fixed + Tidied Gladiators Precision achievement.
2016-01-28 22:48:52 -05:00
d1d3382ec0
Prevented Coal particles from showing during the game
2016-01-28 22:44:33 -05:00
b92ddc7575
Added proper ore pickup delay.
2016-01-28 22:39:48 -05:00
60ee5d1da0
Move disable custom inside of IsActive check
2016-01-28 22:33:48 -05:00
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
40f6969413
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
251fb53f29
Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
...
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
bf273708f9
Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
...
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
the L
Updateting spectator Menu layout.
fixing spec item in menu
Removing right clicking.
removing switching players until spigot patch is on.
adding spectator rotation.
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
015cca57b6
Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
...
* commit '75629055d851265e91eb7d0679a40a1357552e17':
Un-register HotbarEditor MiniPlugin and fix /spec bug.
Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06:00
f72ee95759
Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
...
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
Remove debug message.
Fix flickering judge laser.
Borders for spec are fixed.
Leaves fix.
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
Make dependable require 50 perfect builds instead of 10.
Multiply by less
negative!
Trying different hologram location
Fix messages, fix /stats
Center hologram
Make achievement category classics
hologram changes
Holograms maybe?
Chiss' checklist.
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
Fixed builds with only mobs not loading.
Fixed mobs.
TICK TICK TICK TICK.
all players equal, no one loses
...
2016-01-28 21:02:23 -06:00
7860ca24c8
disallow all staff from using /we
2016-01-28 23:33:06 +00:00
f86262dc0e
catapult and cannon progress
2016-01-28 23:32:23 +00:00
b6db99806a
Remove debug message.
2016-01-28 18:28:43 -05:00
96ea001291
Clean up
2016-01-28 23:05:27 +00:00
da8a55f99c
Final edits
2016-01-28 22:57:54 +00:00
75629055d8
Un-register HotbarEditor MiniPlugin and fix /spec bug.
2016-01-28 20:43:58 +00:00
04544c2b8d
Fix flickering judge laser.
2016-01-28 14:28:47 -05:00
d44d4c2278
Un-register the hotbar page listener on disable.
2016-01-28 19:21:42 +00:00
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
37fb656279
dispenser
2016-01-28 13:31:45 +00:00
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
88c1391ba2
disallow sapling in dispensers (grrr working in two different branches is really strange)
2016-01-28 13:30:16 +00:00
8cb5591218
merge conflicts
2016-01-28 13:28:39 +00:00
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
b5f04011e5
fixed chatslow not working + filter not working for players not in clan
2016-01-28 13:24:30 +00:00
ceeeb3bc45
no tnt from dispensers
2016-01-28 10:58:46 +00:00
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +00:00
682a243c31
fixed catapult state being mapped to incorrect blocks
2016-01-28 09:18:58 +00:00
70be135a40
Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
40113f99d3
Borders for spec are fixed.
2016-01-26 17:14:21 -05:00
NewGarbo
phobia
md_5
Shaun Bennett
Mysticate
libraryaddict
Virizion
teddy
William Burns