Treeku b6c9e74859 Merge branch 'master' of https://github.com/xbang21/NGECore2 into xbang21-master ...

Conflicts:
	src/services/combat/CombatCommands.java

2013-12-12 14:34:24 +00:00

..

bh_dm_1.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_2.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_3.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_4.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_5.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_6.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_7.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_8.py

Bounty Hunter - Fixed Assault CD reduction expertise

2013-12-10 20:13:03 +01:00

bh_dm_crit_1.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_dm_crit_2.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_dm_crit_3.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_dm_crit_4.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_dm_crit_5.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_dm_crit_6.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_dm_crit_7.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_dm_crit_8.py

Bounty Hunter - Fixed Ambush CD reduction expertise

2013-12-10 20:13:32 +01:00

bh_return_fire_command_1.py

Bounty Hunter: Return Fire

2013-12-11 03:20:55 -06:00

bh_sh_0.py

Bounty Hunter - Fixed heal CD reduction expertise

2013-12-10 20:10:50 +01:00

bh_sh_1.py

Bounty Hunter - Fixed heal CD reduction expertise

2013-12-10 20:10:50 +01:00

bh_sh_2.py

Bounty Hunter - Fixed heal CD reduction expertise

2013-12-10 20:10:50 +01:00

bh_sh_3.py

Bounty Hunter - Fixed heal CD reduction expertise

2013-12-10 20:10:50 +01:00

co_ae_hw_dot_acid_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_acid_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_acid_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_acid_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_acid_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_cold_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_cold_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_cold_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_cold_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_cold_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_electrical_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_electrical_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_electrical_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_electrical_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_electrical_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_energy_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_energy_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_energy_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_energy_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_energy_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_fire_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_fire_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_fire_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_fire_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_fire_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_kinetic_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_kinetic_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_kinetic_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_kinetic_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_ae_hw_dot_kinetic_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_armor_cracker.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_cc_1_1.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_cc_1_2.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_cc_1_3.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_cc_2_1.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_cc_2_2.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_dm_1.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_dm_2.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_del_ae_dm_3.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_hw_dot_acid_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_acid_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_acid_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_acid_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_acid_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_cold_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_cold_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_cold_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_cold_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_cold_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_electrical_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_electrical_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_electrical_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_electrical_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_electrical_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_energy_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_energy_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_energy_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_energy_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_energy_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_fire_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_fire_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_fire_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_fire_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_fire_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_kinetic_1.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_kinetic_2.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_kinetic_3.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_kinetic_4.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_hw_dot_kinetic_5.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

co_riddle_armor.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

co_stand_fast.py

Added Heal Over Time buffs, finished most of commando except kill meter and some abilities

2013-11-25 22:10:33 +01:00

forcethrow.py

finished Officer Buffs completely

2013-11-06 17:32:29 -05:00

me_burst_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_cranial_smash_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_dm_dot_6.py

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

me_doom.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_electrolyte_drain_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_induce_insanity_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_serotonin_purge_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_stasis_1.py

Added some medic specials, minor combat fixes

2013-09-23 18:02:31 +02:00

of_ae_dm_cc_1.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_ae_dm_cc_2.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_ae_dm_cc_3.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_cc_melee_1.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_cc_melee_2.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_cc_melee_3.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_cc_melee_4.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_cc_melee_5.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_cc_melee_6.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_cc_melee_7.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deadeye_debuff.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_1.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_2.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_3.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_4.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_5.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_6.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_7.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_deb_def_8.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_decapitate_1.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_decapitate_2.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_decapitate_3.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_decapitate_4.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_decapitate_5.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_decapitate_6.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_del_ae_dm_dot_1.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_del_ae_dm_dot_2.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_del_ae_dm_dot_3.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_pistol_bleed_1.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_sh_0.py

Heal CD reduction is now done through scripts

2013-12-08 05:51:03 +01:00

of_sh_1.py

Heal CD reduction is now done through scripts

2013-12-08 05:51:03 +01:00

of_sh_2.py

Heal CD reduction is now done through scripts

2013-12-08 05:51:03 +01:00

of_sh_3.py

Added First Aid Training (commando)

2013-12-08 12:16:26 +01:00

of_vortex_1.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_vortex_2.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_vortex_3.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_vortex_4.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00

of_vortex_5.py

Added All Officer Debuffs/Buffs

2013-10-27 08:52:14 -04:00