Commit Graph

148 Commits

Author SHA1 Message Date
KoffeinFlummi
b472292b20 Remove tabler comments.
sed is awesome.
2015-04-26 21:05:41 +02:00
ulteq
eca7657ffa Removed a bunch of obsolete code:
*Obsolete, as of: 6fdaf4c400
2015-04-25 13:34:47 +02:00
ulteq
dd72fced36 Added M955, M993, MK316 Mod 0, 127x99mm API ammo classes:
*Recalculated the vanilla calibers based on (6.5mm ~ 1.0)
2015-04-23 12:42:01 +02:00
ulteq
860b4a446a Updated the 6.5mm Creedmor airFriction:
*Also added it to the ATRagMX gun list
2015-04-22 22:48:38 +02:00
ulteq
7c57ad25bd Fixes a recently introduced bug in the relative click memory 2015-04-21 16:54:26 +02:00
ulteq
e22a7e1aad Improved the range card column spacing 2015-04-21 16:01:53 +02:00
ulteq
c27f3fb131 Added target speed direction switch / Improved the solution result output 2015-04-21 15:46:53 +02:00
ulteq
4833193860 Added a new solution setup menu 2015-04-21 15:01:23 +02:00
ulteq
c24586ce02 Reworked the result output GUI on the main page 2015-04-21 11:53:28 +02:00
ulteq
0cf2374475 Atmospheric Calc Method GUI improvement 2015-04-21 11:43:16 +02:00
ulteq
f98a0cdfae Overworked the scope click number GUI 2015-04-21 11:24:59 +02:00
ulteq
6c4b078dce Updated the default gun profile used for adding new profiles 2015-04-21 09:46:57 +02:00
ulteq
0e08fd4457 Incremented the ATragMX profile namespace version 2015-04-20 11:09:12 +02:00
ulteq
de0414803e Fixed some more airFriction values in the ATragMX gun list 2015-04-20 11:08:28 +02:00
ulteq
c049ee5c08 Fixed incorrect .408 Chey Tac airFriction value 2015-04-20 11:02:28 +02:00
ulteq
2bf47ca0c4 Added two more asterix (*) meter indicator GUI elements 2015-04-20 10:36:20 +02:00
ulteq
8ff72e7fc8 Fixed another bug in the unit conversion code 2015-04-20 10:35:29 +02:00
ulteq
f7d35d5593 The ATragMX now also accounts for vertical coriolis drift (Eötvös effect) 2015-04-19 22:30:13 +02:00
ulteq
20740679cc Fixed inconsistent 'workingMemory' initialization 2015-04-19 17:40:49 +02:00
ulteq
a73c0bc429 Sord is now able to transmit the direction of fire 2015-04-19 12:40:13 +02:00
ulteq
2b5b89604e Removed unused RscControlsGroup 2015-04-19 12:29:26 +02:00
ulteq
f6263e9e8b Overworked the scope click feature:
*TODO: Add the "Setting Up a Solution for Your Scope" screen
2015-04-19 12:07:27 +02:00
ulteq
874858ebb4 Added a sanity check to the cycle gun list function
*Top/Down buttons only cycle the gun list in the main/gun list menu
2015-04-19 11:43:20 +02:00
ulteq
5195271894 Fixes: https://github.com/acemod/ACE3/commit/4235163
*The asterix needs to be shown on distances shown in meters not yards
2015-04-19 11:32:02 +02:00
ulteq
4430e8a0ee Increased the minimum barometric pressure value that is accepted 2015-04-19 11:18:37 +02:00
ulteq
4235163801 Added asterix (*) prefix to distances in yards on the main page 2015-04-19 11:14:18 +02:00
ulteq
de5c5139c0 Moved a private declaration out of the hot path 2015-04-19 11:02:25 +02:00
ulteq
8f20303a08 Fixed a bug in the atmosphere unit conversion 2015-04-19 11:02:06 +02:00
ulteq
336a192302 The range card setup data is now also restored on mission start 2015-04-19 10:57:55 +02:00
ulteq
51590d39ad Cleaned up the ATragMX postInit routine 2015-04-19 10:47:43 +02:00
KoffeinFlummi
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
2015-04-19 00:39:44 +02:00
ulteq
454c6dfbfe Added more GUI elements to structure the ATragMX main page 2015-04-18 22:58:23 +02:00
bux578
0f2e4c22b7 Merge pull request #749 from FreeZbe/master
French: updates / fixes stringtable
2015-04-18 21:16:07 +02:00
ulteq
c1ee623808 Added a few static gui elements 2015-04-18 19:22:24 +02:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
ulteq
fc39b81c95 *Fixed a minor bug in the dual inclination calculation
*Added a profile namespace format version
*The profileNamespace data is now automatically reset on version mismatch
2015-04-18 17:45:32 +02:00
ulteq
5e45734cf4 Implemented the dual inclination angle input method 2015-04-18 15:52:06 +02:00
ulteq
422e175f09 Implemented the dual wind speed feature 2015-04-18 15:08:54 +02:00
ulteq
4449c99eba Removed debug output 2015-04-18 12:13:27 +02:00
ulteq
2a6dcbfbcb Added automatic unit conversion for the target data 2015-04-18 12:12:19 +02:00
ulteq
314b0d23d6 ATragMX Feature Expansion:
*Added Gun and Ammo Data Screen
*Added Atomospheric and Environmental Data Screen
*Added Target Data Screen
*Added support for coriolis- and spin drift
*Added a second option (AT) to enter atmospheric data
*Target data is now saved/restored in/from the profileNamespace
*Atmosphere data is now saved/restored in/from the profileNamespace
*Selected gun profile is now saved/restored in/from the profileNamespace
*Fixed several bugs in the dual-/imperial unit systems
*Minor bug fixes in the target range assist screen
*Minor bug fix in the target speed assist screen
2015-04-18 00:11:53 +02:00
nomisum
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
ulteq
e04a0c438a Fixed deprecated delete_gun function 2015-04-17 11:05:24 +02:00
ulteq
1794606304 Got rid of the __DSP macro 2015-04-16 19:52:20 +02:00
ulteq
668888de81 Fixed constant name not following the coding-guideline 2015-04-16 19:00:37 +02:00
KoffeinFlummi
bf0aa6f344 Merge branch 'spanish-merge' 2015-04-16 18:32:37 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
2015-04-16 18:31:31 +02:00
ulteq
e35d3dab49 Overworked the ATragMX target slot logic:
*Added missing privates
*Solutions are now automatically calculated on target/gun selection
2015-04-16 18:14:32 +02:00
ulteq
55d9f7a3da The previous GUI state is now restored when you open the ATragMX 2015-04-16 13:46:32 +02:00
ulteq
d6cadb593a Enabled the ATragMX to use the advanced ballistics extension 2015-04-16 13:44:54 +02:00
ulteq
0b7ceea64e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 22:50:19 +02:00
ulteq
25e1fd2df3 Completely overworked the ATragMX gun list 2015-04-15 22:50:04 +02:00
Nicolás Badano
1678a6d695 Merge pull request #628 from ruPaladin/master
Russian translation fixes
2015-04-15 16:17:59 -03:00
ulteq
3a062a4ff9 Fixed incorrect Mk319 Mod 0 BC/airFriction 2015-04-15 20:33:11 +02:00
ruPaladin
3773238e25 Update stringtable.xml 2015-04-15 19:56:34 +03:00
ulteq
64d6bbaf26 Fixed an incorrect BC in an ATragMX gun profile 2015-04-15 18:55:20 +02:00
Ivan Navarro Cabello
40b784fb7a update stringtable
added spanish translate
2015-04-15 17:41:10 +02:00
ulteq
238cf1cc63 Added keybinds for ATragMX and Kestrel 4500 (empty by default) 2015-04-15 15:06:28 +02:00
Nicolás Badano
85d253cdc1 Merge pull request #574 from gienkov/master
Advanced Ballistics PL translation
2015-04-14 10:10:59 -03:00
ulteq
44232987b0 Commented out deprecated icon paths 2015-04-14 12:34:27 +02:00
ulteq
3d558f376f Fixed some icon path names 2015-04-14 12:16:29 +02:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
ulteq
acc021c11c Replaced TABs and newline braces 2015-04-13 23:10:55 +02:00
ulteq
40e013ed6d Added SORD interface (Connection to the Vectronix Vector LRF) 2015-04-12 19:51:13 +02:00
ulteq
ef0884c49d Added comments to all ATragMX functions 2015-04-11 23:40:46 +02:00
ulteq
e108598b36 Added a model for the ATragMX 2015-04-11 21:01:38 +02:00
ulteq
d7a40bfba2 Replaced all execVM calls with FUNC() 2015-04-11 14:51:40 +02:00
ulteq
9604699f26 Replaced QUOTE(GVAR(...)) with QGVAR(...) 2015-04-10 18:11:01 +02:00
ulteq
4e50760064 Fixed a syntax error 2015-04-10 18:08:38 +02:00
ulteq
37804f01f6 Fixed a nasty typo 2015-04-10 16:48:58 +02:00
ulteq
013c56f070 Replaced an outdated ATragMX 'AdvancedBallistics detection routine' 2015-04-10 16:48:45 +02:00
ulteq
25ec665f45 Fixed the ATragMX 'AdvancedBallistics detection routine' 2015-04-10 15:17:16 +02:00
ulteq
ad3c9493d7 Fixed ATragMX not working when bipod is deployed 2015-04-10 15:09:38 +02:00
ulteq
c7db3dbffe Renamed canShow function to fit the rest of the functions 2015-04-10 15:09:18 +02:00
ulteq
f003ff590e Fixed the target speed assist feature:
*Replaced while/sleep with a PFH
2015-04-10 15:02:45 +02:00
ulteq
f7944381af Updated the .50 Cal airFriction values 2015-04-10 13:00:08 +02:00
ulteq
8f6bf930ee Added gun profiles for the new vanilla calibers 2015-04-10 12:41:29 +02:00
ulteq
bbfafdb5e1 Added missing private variable declaration 2015-04-10 11:43:47 +02:00
ulteq
77d39016fa Fixed an issue with zero ranges close to 0 meters. 2015-04-10 11:14:13 +02:00
ulteq
5fe483cf33 Fixed incorrect function call 2015-04-09 19:12:39 +02:00
ulteq
377390d282 Added missing braces 2015-04-09 19:12:10 +02:00
ulteq
6d46567696 Overworked ATragMX canShow function 2015-04-08 11:44:09 +02:00
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