ulteq 78bb9193be Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX ...

Conflicts:
	addons/atragmx/RscTitles.hpp
	addons/atragmx/functions/fnc_calculate_solution.sqf
	addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
	addons/atragmx/functions/fnc_target_speed_assist_timer.sqf

2015-04-08 11:08:28 +02:00

..

fnc_add_new_gun.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_calculate_range_card.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_calculate_scope_base_angle.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_calculate_solution.sqf

Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX

2015-04-08 11:08:28 +02:00

fnc_calculate_target_range_assist.sqf

Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX

2015-04-08 11:08:28 +02:00

fnc_calculate_target_solution.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_calculate_target_speed_assist.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_canShow.sqf

Fixed incorrect canShow function

2015-04-07 22:37:47 +02:00

fnc_change_gun.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_create_dialog.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_cycle_range_card_columns.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_cycle_scope_unit.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_delete_gun.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_init.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_parse_input.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_reset_relative_click_memory.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_save_gun.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_show_add_new_gun.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_show_gun_list.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_show_main_page.sqf

Replaced tabs with spaces

2015-04-07 22:44:26 +02:00

fnc_show_range_card_setup.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_show_range_card.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_show_target_range_assist.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_show_target_speed_assist_timer.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_show_target_speed_assist.sqf

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00

fnc_sord.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_target_speed_assist_timer.sqf

Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX

2015-04-08 11:08:28 +02:00

fnc_toggle_gun_list.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_toggle_range_card_setup.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_toggle_range_card.sqf

Replaced tabs with spaces

2015-04-07 22:44:26 +02:00

fnc_toggle_target_range_assist.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_toggle_target_speed_assist.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_atmosphere.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_gun.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_range_card.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_relative_click_memory.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_result.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_scope_unit.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_target_selection.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_target.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_unit_selection.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

fnc_update_zero_range.sqf

Removed duplicate ATragMX_ prefix

2015-04-08 11:05:28 +02:00

script_component.hpp

Initial merge of the ATragMX - Ballistics calculator WIP)

2015-04-06 15:51:59 +02:00