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 |
|
ulteq
|
15a594ccbc
|
Removed duplicate ATragMX_ prefix
|
2015-04-08 11:05:28 +02:00 |
|
esteldunedain
|
2d211e839f
|
Further remove standalone { on code
|
2015-04-07 18:09:32 -03:00 |
|
esteldunedain
|
24750781aa
|
Remove { on newlines
|
2015-04-07 18:03:30 -03:00 |
|
ulteq
|
5dba9f7b3f
|
Fixed inconsistent tabulation
|
2015-04-07 22:53:20 +02:00 |
|
ulteq
|
31b19a4ef3
|
Replaced tabs with spaces
|
2015-04-07 22:44:26 +02:00 |
|
ulteq
|
45e7194117
|
Fixed Readme
|
2015-04-07 22:40:27 +02:00 |
|
ulteq
|
4ea91d832e
|
Fixed incorrect canShow function
|
2015-04-07 22:37:47 +02:00 |
|
ulteq
|
a4e22986e0
|
Integrated the ATragMX into the ace interaction menu
|
2015-04-07 20:09:25 +02:00 |
|
ulteq
|
26186e1ea4
|
Removed model = "";
|
2015-04-06 23:02:36 +02:00 |
|
ulteq
|
19cb19ab27
|
Finished merging ATragMX
*TODO: Replace EGVAR(advanced_ballistics,AdvancedBallistics)
*TODO: Replace EGVAR(advanced_ballistics,AdvancedAirDragEnabled)
|
2015-04-06 22:56:14 +02:00 |
|
ulteq
|
ec846b24f2
|
The ATragMX GUI (ctrlShow) relies on using execVM instead of call
|
2015-04-06 22:11:06 +02:00 |
|
ulteq
|
91be37c6f3
|
Replaced all execVM occurrences
|
2015-04-06 21:41:07 +02:00 |
|
ulteq
|
cab8603db6
|
Fixed several typos
|
2015-04-06 21:11:02 +02:00 |
|
ulteq
|
6578ff4559
|
*Replaced call compile preprocessFile with FUNC macro
*Removed some unused files
*Fixed incorrect .paa filepath
*Fixed incorrect profileNamespace access
|
2015-04-06 20:46:33 +02:00 |
|
ulteq
|
1320176c12
|
Initial merge of the ATragMX - Ballistics calculator WIP)
|
2015-04-06 15:51:59 +02:00 |
|