449fa13cc3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
...
Conflicts:
.gitignore
2014-05-27 02:23:22 -07:00
49de140f41
Configured eclipse to use UTF-8
2014-05-25 21:04:14 -04:00
c45e7d2a80
Converted file encoding from ISO-8859-1 to UTF-8
2014-05-25 19:42:39 -04:00
3859a42f1d
Removed broken and obsolete shifter code
...
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
aa6b5324eb
Set up IntelliJ IDEA
2014-05-20 00:39:50 -04:00
eae2d41fad
Fixed party out of bounds exception.
...
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
ebf40afe75
Fix dom bow shoot in lobby bug.
...
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
f79b3b147c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-06 15:59:20 +10:00
223da7bf4d
ResetAll for class skills
2014-05-06 15:55:14 +10:00
a9f4a900f0
Working on fixing dead chunks.
...
Fixed Blizzard memory issue.
2014-05-04 09:31:04 -07:00
1d4d98b910
Twitch Prep
...
MAC changes
2014-05-02 14:35:41 +10:00
8240101d60
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2014-05-01 09:33:59 +10:00
423a355057
Helpers+ wont be kicked yb MAC
2014-05-01 09:31:47 +10:00
fd372b8418
Changed skills to 2k gems each.
...
Changed power/booster to 2k gems each.
Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
2014-04-28 01:05:08 -07:00
40ef432211
Cannot use skills/items in HubManager
...
Dom CP score rate lowered
Dom items dont use energy
2014-04-28 09:41:00 +10:00
07ca3a83ca
Arrows shouldnt bounce
2014-04-26 13:37:01 +10:00
b86b014058
Fixed a whole bunch of bugs
2014-04-26 11:59:11 +10:00
a37ace7576
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-25 00:44:27 -07:00
9136fa0b15
Upgraded to latest spigot.
...
Fixed npcs being so loud.
Npcs are now ghosted automatically.
Added UUID on login.
2014-04-25 00:44:14 -07:00
9495630bf2
CP rate increase
2014-04-25 11:10:37 +10:00
7fef4adbee
Fixed resupply resetting skills.
2014-04-22 22:19:03 -07:00
0325892e2a
Champs water fixes
...
First push for Twitch games
2014-04-23 10:21:01 +10:00
e62dfb0dd2
Fix skill/item packs not deducting gems.
...
Fix players not getting spectating flag when dying.
2014-04-22 16:50:44 -07:00
7680eaaedc
Fixed non-Ultra being able to unlock spells/skills.
...
Fixed Items that weren't free.
2014-04-22 11:20:00 -07:00
2378df6191
Fixed builds losing tokens.
2014-04-22 10:35:56 -07:00
923d2455d0
Stampede ends immediately on taking damage
2014-04-21 17:21:52 +10:00
62c245d728
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-21 17:06:08 +10:00
0f0b66a8cf
Stampede cancel on damage taken
2014-04-21 17:04:51 +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
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
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
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
1bf1f04d53
Champs Stuff
2014-04-19 14:50:14 +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
f25a6c26c9
Champs Update
2014-04-13 11:06:10 +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
ba1c6ae35f
Champs Balance
2014-04-12 18:22:53 +10:00
80df2c2944
Bux fixes for 1.7
...
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
71b2931936
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-11 10:34:51 +10:00
2adf0395a1
Merge
2014-04-11 10:33:56 +10:00
0375384fb5
Converted to Spigot's latest 1.7.5
2014-04-10 17:15:44 -07:00
84ffd56c82
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:50:46 -07:00
8460fcc8f6
Added ninja check for bow charge if you just right click quickly.
2014-04-09 02:50:37 -07:00
b868db0f22
Fixed so you can now charge bow skills in air.
2014-04-09 19:07:12 +10:00
146202a52c
Champs Balance + Red Arrow Fix
2014-04-09 18:50:38 +10:00
0ecd38c656
Champs Balance
2014-04-09 16:48:01 +10:00
9b4e1aa9eb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-07 22:25:08 -04:00
109d2cb6f1
Fixed edit build issue.
2014-04-07 22:18:04 -04:00
bb3f2c6281
CHAMPS
2014-04-08 10:53:41 +10:00
85c57f2942
IButton now has Left/Right
...
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
88131836d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-05 16:01:07 -04:00
db2ae49074
Fixed saving custom builds.
...
Work on skill tokens.
2014-04-05 15:53:22 -04:00
8214e3b8f4
Lots of little bug fixes
2014-04-05 16:52:23 +11:00
05d916de3c
Fixed custombuild selection not applying armor
2014-04-04 15:57:56 -04:00
13b8f1e7ea
Champs Update
2014-04-04 13:26:00 +11:00
26fe974b00
More CHamps
2014-04-03 15:48:58 +11:00
80c153095b
Cooldown bar
2014-04-02 22:03:56 +11:00
2f0167ea09
Champs Update
2014-04-02 21:22:21 +11:00
2aaf749414
Champions Update
2014-04-02 15:19:58 +11:00
0f937b165c
skill shop stuff
2014-03-30 09:45:53 +11:00
e1eda749a7
Skill lore changes
2014-03-30 09:05:29 +11:00
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
f4e8879d55
skilly test stuff
2014-03-29 17:07:07 +11:00
fce249d7d8
fixed some desc stuff
...
castle seige removed OP kit
2014-03-28 18:50:38 +11:00
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
f5ca6408f8
Merge?
2014-03-28 14:51:26 +11:00
aae40d3899
Changed up Skills and SkillsPage for Dom 2 changeover.
...
Fixed CustomBuild stuff.
2014-03-27 22:17:31 -04:00
8bf78fe14d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-21 15:30:06 -07:00
ab2a72ba16
CS Update
2014-03-21 11:59:56 +11:00
Jonathan Williams
CoderTim
Chiss