a150249f4f
game will not announce winner multiple times
2014-04-21 17:01:50 +10:00
9ce6d4866d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-20 23:37:01 -07:00
e012129427
Fixed edit custom build bugs.
...
Fixed vehicle exit event not firing.
Fixed item info not showing once you have the item.
2014-04-20 23:36:45 -07:00
adf8821a26
more CP changes
2014-04-21 12:55:24 +10:00
b1e082b73a
fixed riposte bug
...
tweaked capture effects
2014-04-21 11:56:14 +10:00
0eaa3110f5
Risposte nerf
2014-04-21 11:18:14 +10:00
b8e573e8f8
redid capture display. much less annoying.
2014-04-21 11:15:49 +10:00
07098b0b82
fixed no damage on weapons
...
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
2014-04-21 10:48:04 +10:00
ddc8e435e8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
2014-04-21 08:49:13 +10:00
3281eb2ed7
Merge
2014-04-21 08:47:07 +10:00
60039d5b76
More missing files.
2014-04-20 01:07:59 -07:00
8bf40169f3
Added missing files.
2014-04-20 01:06:55 -07:00
65e94e59cc
Changed item tokens to 10 for non bow classes.
...
Fixed token prices on power/booster items.
Removed You already have this item message on items in CustomBuild.
2014-04-20 01:06:17 -07:00
1f225f05ff
Custom build fixes.
2014-04-20 00:27:32 -07:00
dc625726c4
Item Custom Build Fixes.
2014-04-19 22:54:52 -07:00
458f5741d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-19 20:54:04 -07:00
e5e9cc7284
Custom Items in custom Builds for dom.
2014-04-19 20:53:55 -07:00
845d45bd4d
fixed some skill bugs
...
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
2014-04-20 13:50:15 +10:00
de2b42e190
fixed tnt bug
2014-04-19 15:18:13 +10:00
b720a6433c
Explosions crack carved stone brick
2014-04-19 15:10:30 +10:00
1bf1f04d53
Champs Stuff
2014-04-19 14:50:14 +10:00
f96272b1d9
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-18 13:24:42 +10:00
424f915388
Champs Merge
2014-04-18 13:24:30 +10:00
6b07541b3b
DERP JONLONS
2014-04-15 18:40:43 -07:00
5ac48a02fb
Stripped indicator func out of Condition
...
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
2014-04-15 17:53:24 +10:00
81ab27cd83
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-14 17:09:47 -07:00
6c8651d2c7
Fixed classes not being added.
2014-04-14 17:09:37 -07:00
1c23cf7b4e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-14 09:27:44 +10:00
e5ea7483db
Merge
2014-04-14 09:27:31 +10:00
d3a3cc278f
Fixed ultra custom builds not saving.
...
Fixed default builds.
Fixed armor bug.
2014-04-13 04:24:22 -07:00
591caa1589
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 01:36:46 -07:00
cac59afed4
Fixed bug with missing default skill and kit page opening.
2014-04-13 01:36:34 -07:00
5df8d34426
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
2014-04-13 18:01:55 +10:00
9874dae60f
Merge
2014-04-13 18:00:53 +10:00
5efaf9bd36
Fixed inf loop.
2014-04-13 00:59:55 -07:00
b22be81cbb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:49:44 +10:00
8b159557b2
Added PvpClass set in default customBuild.
2014-04-13 00:49:16 -07:00
d087b379d1
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:21:02 +10:00
85aa748218
Champs Bug Fixes
2014-04-13 17:20:49 +10:00
d84c234f47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 00:16:07 -07:00
1b25dce2c5
Added default application on setGameClass.
...
Removed print info on custom build saving.
2014-04-13 00:15:44 -07:00
081da93bbd
blocked /bukkit:me
2014-04-13 11:19:16 +10:00
f25a6c26c9
Champs Update
2014-04-13 11:06:10 +10:00
154479d1b7
Fixed TDM health
2014-04-13 09:29:22 +10:00
f73d4d3e23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 09:29:12 +10:00
2e4bc587b1
Champs Update
2014-04-13 09:26:31 +10:00
1cb35262ac
Fixed skill tokens not being returned.
2014-04-12 14:02:40 -07:00
98430be09e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-12 01:45:01 -07:00
8f42d91d8a
Fixed ban kick bug.
...
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.
Updated to 1.7.8 spigot support.
Removed logging on HS.
2014-04-12 01:28:33 -07:00
ecc40bda47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-12 18:25:59 +10:00
Chiss
Jonathan Williams