Chiss
424f915388
Champs Merge
2014-04-18 13:24:30 +10:00
Jonathan Williams
6b07541b3b
DERP JONLONS
2014-04-15 18:40:43 -07:00
Chiss
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
Jonathan Williams
81ab27cd83
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-14 17:09:47 -07:00
Jonathan Williams
6c8651d2c7
Fixed classes not being added.
2014-04-14 17:09:37 -07:00
Chiss
1c23cf7b4e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-14 09:27:44 +10:00
Chiss
e5ea7483db
Merge
2014-04-14 09:27:31 +10:00
Jonathan Williams
d3a3cc278f
Fixed ultra custom builds not saving.
...
Fixed default builds.
Fixed armor bug.
2014-04-13 04:24:22 -07:00
Jonathan Williams
591caa1589
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 01:36:46 -07:00
Jonathan Williams
cac59afed4
Fixed bug with missing default skill and kit page opening.
2014-04-13 01:36:34 -07:00
Chiss
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
Chiss
9874dae60f
Merge
2014-04-13 18:00:53 +10:00
Jonathan Williams
5efaf9bd36
Fixed inf loop.
2014-04-13 00:59:55 -07:00
Chiss
b22be81cbb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:49:44 +10:00
Jonathan Williams
8b159557b2
Added PvpClass set in default customBuild.
2014-04-13 00:49:16 -07:00
Chiss
d087b379d1
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:21:02 +10:00
Chiss
85aa748218
Champs Bug Fixes
2014-04-13 17:20:49 +10:00
Jonathan Williams
d84c234f47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 00:16:07 -07:00
Jonathan Williams
1b25dce2c5
Added default application on setGameClass.
...
Removed print info on custom build saving.
2014-04-13 00:15:44 -07:00
Chiss
081da93bbd
blocked /bukkit:me
2014-04-13 11:19:16 +10:00
Chiss
f25a6c26c9
Champs Update
2014-04-13 11:06:10 +10:00
Chiss
154479d1b7
Fixed TDM health
2014-04-13 09:29:22 +10:00
Chiss
f73d4d3e23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 09:29:12 +10:00
Chiss
2e4bc587b1
Champs Update
2014-04-13 09:26:31 +10:00
Jonathan Williams
1cb35262ac
Fixed skill tokens not being returned.
2014-04-12 14:02:40 -07:00
Jonathan Williams
98430be09e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-12 01:45:01 -07:00
Jonathan Williams
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
Chiss
ecc40bda47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-12 18:25:59 +10:00
Chiss
ba1c6ae35f
Champs Balance
2014-04-12 18:22:53 +10:00
Jonathan Williams
eb1d1c1ed2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-11 03:10:02 -07:00
Jonathan Williams
c8af89dded
Fixed BH and GRavity.
2014-04-11 03:09:21 -07:00
Chiss
80df2c2944
Bux fixes for 1.7
...
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
Chiss
71b2931936
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-11 10:34:51 +10:00
Chiss
2adf0395a1
Merge
2014-04-11 10:33:56 +10:00
Jonathan Williams
0375384fb5
Converted to Spigot's latest 1.7.5
2014-04-10 17:15:44 -07:00
Jonathan Williams
a26894fda6
Added missing file.
2014-04-09 21:38:12 -07:00
Jonathan Williams
84ffd56c82
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:50:46 -07:00
Jonathan Williams
8460fcc8f6
Added ninja check for bow charge if you just right click quickly.
2014-04-09 02:50:37 -07:00
Chiss
b64acf524c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 19:07:22 +10:00
Chiss
b868db0f22
Fixed so you can now charge bow skills in air.
2014-04-09 19:07:12 +10:00
Jonathan Williams
e4ca9084cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c
Added arrows sticking in you.
...
Removed bouncing arrows.
2014-04-09 02:03:19 -07:00
Chiss
146202a52c
Champs Balance + Red Arrow Fix
2014-04-09 18:50:38 +10:00
Chiss
7d59f43ffa
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 16:48:14 +10:00
Chiss
0ecd38c656
Champs Balance
2014-04-09 16:48:01 +10:00
Jonathan Williams
bedabd84cc
Added silence to kits (UtilEnt.silence)
...
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
Jonathan Williams
e8260b20f7
Fixed dragon spawn location for text util.
2014-04-07 23:35:45 -04:00
Jonathan Williams
9b4e1aa9eb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-07 22:25:08 -04:00
Jonathan Williams
109d2cb6f1
Fixed edit build issue.
2014-04-07 22:18:04 -04:00
Chiss
2eaaa85e04
Fixed /game stop trapping players in dead world.
2014-04-08 12:08:59 +10:00
