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

..

armor_break.py

Added cAble's innate_reduction_all_mob for armor break

2013-12-02 22:18:27 +00:00

bh_armor_sprint_1.py

Bounty Hunter: Take Cover & Armor Sprint

2013-12-11 04:48:45 -06:00

bh_cover_1.py

Bounty Hunter: Take Cover & Armor Sprint

2013-12-11 04:48:45 -06:00

bh_prescience.py

Added duels, added incap and deathblow, fixed some buff issues

2013-09-14 22:25:52 +02:00

bh_return_fire_1.py

Bounty Hunter: Return Fire

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

bleeding.py

finished Officer Buffs completely

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

buildabuff_inspiration.py

Added ent skillmods, fixed attribute points in buff workshop

2013-11-25 17:00:32 -05:00

co_base_of_operations.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_first_aid_training.py

Added First Aid Training (commando)

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

co_position_secured.py

Added collidable areas which can trigger a script, started work on AI, fixed position secured, updated engine

2013-12-02 23:58:22 +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

flawless_bead_1.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

flawless_bead_2.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

flawless_bead_3.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

fs_ae_dm_cc_0.py

Added All Officer Debuffs/Buffs

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

fs_ae_dm_cc_1.py

Added All Officer Debuffs/Buffs

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

fs_ae_dm_cc_2.py

Added All Officer Debuffs/Buffs

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

fs_ae_dm_cc_3.py

Added All Officer Debuffs/Buffs

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

fs_ae_dm_cc_4.py

Added All Officer Debuffs/Buffs

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

fs_ae_dm_cc_5.py

Added All Officer Debuffs/Buffs

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

fs_ae_dm_cc_6.py

Added All Officer Debuffs/Buffs

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

fs_buff_ca_1.py

More Jedi Expertise Work

2013-11-08 10:17:59 -08:00

fs_buff_def_1_1.py

a few jedi abilities

2013-09-27 03:38:27 -07:00

fs_dm_cc_crit_1.py

Added All Officer Debuffs/Buffs

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

fs_dm_cc_crit_2.py

Added All Officer Debuffs/Buffs

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

fs_dm_cc_crit_3.py

Added All Officer Debuffs/Buffs

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

fs_dm_cc_crit_4.py

Added All Officer Debuffs/Buffs

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

fs_dm_cc_crit_5.py

Added All Officer Debuffs/Buffs

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

fs_force_run.py

Force run effect should end properly now

2013-11-08 15:42:45 +00:00

fs_force_throw.py

finished Officer Buffs completely

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

fs_saber_reflect.py

a few jedi abilities

2013-09-27 03:38:27 -07:00

invis_fs_buff_invis_1.py

removed useless skill mods

2013-09-27 04:37:19 -07:00

me_buff_action_1.py

Finished Medic Buffs and Debuffs

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

me_buff_action_2.py

Finished Medic Buffs and Debuffs

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

me_buff_action_3.py

Finished Medic Buffs and Debuffs

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

me_buff_agility_1.py

Finished Medic Buffs and Debuffs

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

me_buff_agility_2.py

Finished Medic Buffs and Debuffs

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

me_buff_agility_3.py

Finished Medic Buffs and Debuffs

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

me_buff_health_0.py

Finished Medic Buffs and Debuffs

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

me_buff_health_2.py

Finished Medic Buffs and Debuffs

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

me_buff_health.py

Finished Medic Buffs and Debuffs

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

me_buff_melee_gb_1.py

Finished Medic Buffs and Debuffs

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

me_buff_precision_1.py

Finished Medic Buffs and Debuffs

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

me_buff_precision_2.py

Finished Medic Buffs and Debuffs

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

me_buff_precision_3.py

Finished Medic Buffs and Debuffs

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

me_buff_ranged_gb_1.py

Finished Medic Buffs and Debuffs

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

me_buff_strength_1.py

Finished Medic Buffs and Debuffs

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

me_buff_strength_2.py

Finished Medic Buffs and Debuffs

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

me_buff_strength_3.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -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_cure_affliction_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05: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_evasion_1.py

Finished Medic Buffs and Debuffs

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

me_rheumatic_calamity_1.py

Finished Medic Buffs and Debuffs

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

me_serotonin_boost_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

me_stasis_self_1.py

Added some medic specials, minor combat fixes

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

me_thyroid_rupture_1.py

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

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

of_adv_paint_debuff_1.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_debuff_2.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_debuff_3.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_debuff_4.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_debuff_5.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_debuff_6.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_debuff_7.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_debuff_8.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_1.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_2.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_3.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_4.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_5.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_6.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_7.py

Added All Officer Debuffs/Buffs

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

of_adv_paint_expose_8.py

Added All Officer Debuffs/Buffs

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

of_ae_dm_cc_1.py

finished Officer Buffs completely

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

of_ae_dm_cc_2.py

finished Officer Buffs completely

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

of_ae_dm_cc_3.py

finished Officer Buffs completely

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

of_buff_def_1.py

Added All Officer Debuffs/Buffs

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

of_buff_def_2.py

Added All Officer Debuffs/Buffs

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

of_buff_def_3.py

Added All Officer Debuffs/Buffs

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

of_buff_def_4.py

Added All Officer Debuffs/Buffs

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

of_buff_def_5.py

Added All Officer Debuffs/Buffs

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

of_buff_def_6.py

Added All Officer Debuffs/Buffs

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

of_buff_def_7.py

Added All Officer Debuffs/Buffs

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

of_buff_def_8.py

Added All Officer Debuffs/Buffs

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

of_buff_def_9.py

Added All Officer Debuffs/Buffs

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

of_cc_melee_1.py

finished Officer Buffs completely

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

of_cc_melee_2.py

finished Officer Buffs completely

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

of_cc_melee_3.py

finished Officer Buffs completely

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

of_cc_melee_4.py

finished Officer Buffs completely

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

of_cc_melee_5.py

finished Officer Buffs completely

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

of_cc_melee_6.py

finished Officer Buffs completely

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

of_cc_melee_7.py

finished Officer Buffs completely

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

of_charge_1.py

finished Officer Buffs completely

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

of_deadeye_debuff.py

finished Officer Buffs completely

2013-11-06 17:32:29 -05: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_decap_bleed_1.py

Added All Officer Debuffs/Buffs

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

of_decap_bleed_2.py

Added All Officer Debuffs/Buffs

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

of_decap_bleed_3.py

Added All Officer Debuffs/Buffs

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

of_decap_bleed_4.py

Added All Officer Debuffs/Buffs

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

of_decap_bleed_5.py

Added All Officer Debuffs/Buffs

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

of_decap_bleed_6.py

Added All Officer Debuffs/Buffs

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

of_dot_bomb_1.py

Added All Officer Debuffs/Buffs

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

of_drillmaster_1.py

finished Officer Buffs completely

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

of_emergency_shield.py

Added All Officer Debuffs/Buffs

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

of_firepower.py

Added All Officer Debuffs/Buffs

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

of_focus_fire_1.py

Added All Officer Debuffs/Buffs

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

of_focus_fire_2.py

Added All Officer Debuffs/Buffs

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

of_focus_fire_3.py

Added All Officer Debuffs/Buffs

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

of_focus_fire_4.py

Added All Officer Debuffs/Buffs

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

of_focus_fire_5.py

Added All Officer Debuffs/Buffs

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

of_focus_fire_6.py

Added All Officer Debuffs/Buffs

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

of_inspiration_1.py

fixed type errors on a few buff scripts

2013-10-29 20:20:15 -04:00

of_inspiration_2.py

fixed type errors on a few buff scripts

2013-10-29 20:20:15 -04:00

of_inspiration_3.py

Added All Officer Debuffs/Buffs

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

of_inspiration_4.py

Added All Officer Debuffs/Buffs

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

of_inspiration_5.py

Added All Officer Debuffs/Buffs

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

of_inspiration_6.py

Added All Officer Debuffs/Buffs

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

of_last_words.py

Added All Officer Debuffs/Buffs

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

of_pistol_bleed.py

Added All Officer Debuffs/Buffs

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

of_purge_1.py

Added All Officer Debuffs/Buffs

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

of_scatter_1.py

fixed tiny bug

2013-11-06 17:40:59 -05:00

of_stimulator_1.py

finished Officer Buffs completely

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

of_vortex_bleed_1.py

Added All Officer Debuffs/Buffs

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

of_vortex_bleed_2.py

Added All Officer Debuffs/Buffs

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

of_vortex_bleed_3.py

Added All Officer Debuffs/Buffs

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

of_vortex_bleed_4.py

Added All Officer Debuffs/Buffs

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

of_vortex_bleed_5.py

Added All Officer Debuffs/Buffs

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

of_vortex_root.py

finished Officer Buffs completely

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

poisoned.py

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

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

proc_old_dark_jedi_gift.py

Added an Example script for wearables

2013-09-14 17:47:37 -05:00

proc_old_light_jedi_gift.py

Added Stats to Light Jedi Robes

2013-12-04 20:27:29 -05:00

saberblock.py

Jedi Buff Update (Take 2)

2013-11-07 09:30:03 -08:00

set_bonus_bh_dps_1.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_dps_2.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_dps_3.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_utility_a_1.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_utility_a_2.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_utility_a_3.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_utility_b_1.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_utility_b_2.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_bh_utility_b_3.py

Added BH jewelry sets and buffs

2013-09-23 01:51:35 +03:00

set_bonus_hero_1.py

Added heroism set and buffs, fixed robe_jedi_dark

2013-09-20 07:11:57 +03:00

set_bonus_hero_2.py

Added heroism set and buffs, fixed robe_jedi_dark

2013-09-20 07:11:57 +03:00

set_bonus_hero_3.py

Added heroism set and buffs, fixed robe_jedi_dark

2013-09-20 07:11:57 +03:00

sm_ae_dm_cc_1.py

finished Officer Buffs completely

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

sm_ae_dm_cc_2.py

finished Officer Buffs completely

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

sm_ae_dm_cc_3.py

finished Officer Buffs completely

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

sm_ae_dm_cc_4.py

finished Officer Buffs completely

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

sm_ae_dm_cc_5.py

finished Officer Buffs completely

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

sm_ae_dm_cc_6.py

finished Officer Buffs completely

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

sm_pistol_whip_1.py

finished Officer Buffs completely

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