Commit Graph

3173 Commits

Author SHA1 Message Date
jaynus
8361ec3812 ace_lasers 2015-04-18 10:57:11 -07:00
jaynus
953faf3d4b ace_missileguidance privates. 2015-04-18 10:53:21 -07:00
jaynus
87337bcb7a ace_javelin privates 2015-04-18 10:50:22 -07:00
jaynus
34b62a0a86 Print privates declaration for file. 2015-04-18 10:50:16 -07:00
jaynus
d80d340eaf Merge pull request #710 from acemod/guidanceHandoff
Guidance handoff
2015-04-18 10:37:40 -07:00
jaynus
11336cdade Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-18 10:37:16 -07:00
jaynus
364c270f58 Merge pull request #709 from acemod/laserCodes
Laser codes
2015-04-18 10:36:51 -07:00
jaynus
26e2917f79 Merge remote-tracking branch 'origin/master' into laserCodes
Conflicts:
	addons/javelin/CfgWeapons.hpp
2015-04-18 10:36:07 -07:00
jaynus
1d908c2f70 Merge pull request #677 from acemod/titanCompat
Titan static & variant compatability with missile guidance
2015-04-18 10:32:57 -07:00
ulteq
c1ee623808 Added a few static gui elements 2015-04-18 19:22:24 +02:00
jaynus
9c076364ec Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff. 2015-04-18 10:18:33 -07:00
jaynus
d1e03d8e7a Slight tweaks. 2015-04-18 09:40:46 -07:00
jaynus
e14ee45249 debug checking. 2015-04-18 09:29:58 -07:00
ulteq
1b578b8835 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 17:45:39 +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
commy2
370e6bd9a7 maybe fix for #741, Speedlimiter locking vehicle controls 2015-04-18 17:42:13 +02:00
jaynus
d1993836ae Cleanup. missing string. 2015-04-18 08:40:28 -07:00
Nicolás Badano
4a76b0e5c9 Merge pull request #686 from acemod/modifiableActions
Allow to dynamically modify actions at runtime.
2015-04-18 11:24:01 -03:00
Nicolás Badano
b86d148fe4 Merge pull request #304 from acemod/linearMenuExperiment
Add Optional List form for the Interact Menus
2015-04-18 11:22:41 -03: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
9057edb1e2 Added a new module option for wind deflection:
*enabled - true/false
2015-04-18 11:10:05 +02:00
commy2
4264f78128 player has to put weapon on back before climbing, check if still can climb 2015-04-18 10:16:10 +02:00
commy2
fd821de353 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 09:27:07 +02:00
commy2
9633547d6b tweak ability to climb 2015-04-18 09:26:47 +02:00
PabstMirror
060dc22ad5 Merge pull request #721 from acemod/privatesPass1
Privates Var Fixing
2015-04-17 23:51:23 -05:00
PabstMirror
d7da259c11 Merge pull request #688 from acemod/optionMenuStuff
Option menu stuff
2015-04-17 23:49:37 -05:00
bux578
e2185d2d4a Merge pull request #725 from Tachii/patch-9
Update stringtable.xml
2015-04-18 06:44:37 +02:00
bux578
a610872863 Merge pull request #724 from Tachii/patch-8
Update stringtable.xml
2015-04-18 06:44:20 +02:00
bux578
55cd6536a8 Merge pull request #727 from Tachii/patch-11
Update stringtable.xml
2015-04-18 06:44:05 +02:00
bux578
386802cc16 Merge pull request #726 from Tachii/patch-10
Update stringtable.xml
2015-04-18 06:42:48 +02:00
bux578
ed242fdea4 Merge pull request #723 from Tachii/patch-7
Update stringtable.xml
2015-04-18 06:42:39 +02:00
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
PabstMirror
71e62711c6 #731 - stop error if target offscreen 2015-04-17 22:02:23 -05:00
Tachii
ad61557557 Update stringtable.xml 2015-04-18 03:10:28 +03:00
Tachii
711be038fc Update stringtable.xml 2015-04-18 03:09:51 +03:00
Tachii
b7c7d2ff15 Update stringtable.xml 2015-04-18 03:04:14 +03:00
Tachii
04858bb673 Update stringtable.xml 2015-04-18 02:19:09 +03:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
Tachii
7f942a06f8 Update stringtable.xml 2015-04-18 02:11:16 +03:00
Tachii
0bb3238db1 Update stringtable.xml 2015-04-18 02:09:59 +03:00
Tachii
bd3ef35c88 Update stringtable.xml 2015-04-18 02:07:49 +03:00
Tachii
1e446fb060 Update stringtable.xml 2015-04-18 02:01:09 +03:00
ulteq
b32a2b7495 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 00:12:04 +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
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
bux578
9c054b7f35 Merge pull request #720 from gienkov/master
PL translation
2015-04-17 22:38:04 +02:00