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 |
|
Chiss
|
bb3f2c6281
|
CHAMPS
|
2014-04-08 10:53:41 +10:00 |
|
Chiss
|
85c57f2942
|
IButton now has Left/Right
Added right-click skill removal.
|
2014-04-06 12:45:52 +10:00 |
|
Jonathan Williams
|
88131836d7
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-04-05 16:01:07 -04:00 |
|
Jonathan Williams
|
db2ae49074
|
Fixed saving custom builds.
Work on skill tokens.
|
2014-04-05 15:53:22 -04:00 |
|
Chiss
|
8214e3b8f4
|
Lots of little bug fixes
|
2014-04-05 16:52:23 +11:00 |
|
Jonathan Williams
|
05d916de3c
|
Fixed custombuild selection not applying armor
|
2014-04-04 15:57:56 -04:00 |
|
Jonathan Williams
|
ddcc8a26b3
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-04-04 15:02:42 -04:00 |
|
Jonathan Williams
|
edfe23fb01
|
Fixed collision with Projectiles.
|
2014-04-04 15:02:13 -04:00 |
|
Chiss
|
13b8f1e7ea
|
Champs Update
|
2014-04-04 13:26:00 +11:00 |
|
Chiss
|
26fe974b00
|
More CHamps
|
2014-04-03 15:48:58 +11:00 |
|
Chiss
|
80c153095b
|
Cooldown bar
|
2014-04-02 22:03:56 +11:00 |
|
Chiss
|
2f0167ea09
|
Champs Update
|
2014-04-02 21:22:21 +11:00 |
|
Chiss
|
2aaf749414
|
Champions Update
|
2014-04-02 15:19:58 +11:00 |
|
Jonathan Williams
|
afc26e21e3
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-03-29 18:46:52 -04:00 |
|
Jonathan Williams
|
06bdc22c89
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-03-29 18:45:53 -04:00 |
|
Chiss
|
0f937b165c
|
skill shop stuff
|
2014-03-30 09:45:53 +11:00 |
|
Jonathan Williams
|
d227a6bd06
|
Changed full server message
|
2014-03-29 18:45:44 -04:00 |
|
Chiss
|
e1eda749a7
|
Skill lore changes
|
2014-03-30 09:05:29 +11:00 |
|
Jonathan Williams
|
b7857ef20c
|
Fixes for Skill level desc.
Fix for level staying same across skill changes.
Removed logging statements in ClientClass
|
2014-03-29 02:49:57 -04:00 |
|
Chiss
|
f4e8879d55
|
skilly test stuff
|
2014-03-29 17:07:07 +11:00 |
|
Jonathan Williams
|
195e555a6e
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-03-29 01:33:18 -04:00 |
|
Jonathan Williams
|
6963f6bacf
|
Added Player version stat tracking.
Added server group stats.
|
2014-03-29 01:32:24 -04:00 |
|
Chiss
|
fce249d7d8
|
fixed some desc stuff
castle seige removed OP kit
|
2014-03-28 18:50:38 +11:00 |
|
Chiss
|
4386ce0b96
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
|
2014-03-28 14:55:13 +11:00 |
|
Chiss
|
f5ca6408f8
|
Merge?
|
2014-03-28 14:51:26 +11:00 |
|
Jonathan Williams
|
aae40d3899
|
Changed up Skills and SkillsPage for Dom 2 changeover.
Fixed CustomBuild stuff.
|
2014-03-27 22:17:31 -04:00 |
|
Chiss
|
47feabcad3
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-28 10:06:03 +11:00 |
|
Jonathan Williams
|
17e6658437
|
Fixed up AntiHack database reporting.
|
2014-03-24 01:16:02 -07:00 |
|
Chiss
|
2680edbd85
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-24 16:15:29 +11:00 |
|
Jonathan Williams
|
2450265909
|
Fixed damage rate limiting for mobs.
|
2014-03-22 00:16:51 -07:00 |
|
Chiss
|
e4a86e0600
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-22 10:45:01 +11:00 |
|
Chiss
|
fe09c3fc49
|
More CS Update
|
2014-03-22 10:44:31 +11:00 |
|