Commit Graph

4323 Commits

Author SHA1 Message Date
esteldunedain
be81e16c71 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-06 09:07:20 -03:00
esteldunedain
4cf2410622 Fix duplicated laser designator actions 2015-04-06 09:06:56 -03:00
Glowbal
0bcb7f76dc This should not be here 2015-04-06 13:12:40 +02:00
Glowbal
83c670576b fixed typeOf instead of typeName 2015-04-06 11:58:52 +02:00
ulteq
c1aad2a0f5 Added manuals for the Horus ATrag and Kestrel 4500. 2015-04-06 11:39:21 +02:00
PabstMirror
d295ee6980 Localization / Headers 2015-04-06 01:05:28 -05:00
esteldunedain
52918557f2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into abIntegration 2015-04-06 00:30:29 -03:00
esteldunedain
b37b549d76 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-06 00:29:12 -03:00
esteldunedain
5a0faf720f EFUNC(advanced_ballistics,calculateWindSpeed) 2015-04-06 00:27:33 -03:00
esteldunedain
7a1e905c79 Move Latitude and Altitude parameters to weather 2015-04-06 00:19:48 -03:00
esteldunedain
c73aff03bd displayWindInfo tab to space 2015-04-06 00:13:43 -03:00
esteldunedain
2d770eb355 Make wind in displayWindInfo dependant on wether AB is used or not 2015-04-06 00:12:50 -03:00
esteldunedain
caf52e8a2f Move wind display resources to weather 2015-04-06 00:12:22 -03:00
esteldunedain
6f89233e12 Move wind info display to weather 2015-04-06 00:02:34 -03:00
esteldunedain
33a87b0488 Reenable weather (disabled in 076c5abf88) 2015-04-05 23:56:24 -03:00
Glowbal
befb52e855 Merge pull request #260 from KoffeinFlummi/serverConfig
Server Config support
2015-04-06 01:42:33 +02:00
jaynus
e93e02c3ff Revert "Beginning of ACE test mission; please add your feature tests, items and equipment to this mission."
This reverts commit 8422ead980.
2015-04-05 16:14:33 -07:00
jaynus
8422ead980 Beginning of ACE test mission; please add your feature tests, items and equipment to this mission. 2015-04-05 16:12:34 -07:00
esteldunedain
038c871356 Make overheating use bullet mass in grains introduced by ab 2015-04-05 20:11:42 -03:00
PabstMirror
2ada87e3ac Rangetable Item 2015-04-05 18:05:23 -05:00
esteldunedain
100686d34a Move ballistic data outside the advance_ballistics pbo, so:
- it can be used by other pbos like overheating without it requiring ab.
- the tweaks to airfriction are available to basic wind_deflection too if ab is not present.
2015-04-05 20:05:04 -03:00
PabstMirror
a8b000c159 Some Headers 2015-04-05 17:50:07 -05:00
PabstMirror
5c5b8f656e Tweak Air to match known data 2015-04-05 17:37:11 -05:00
jaynus
c87f2f8bcc Added: Generic placeholder medical box. 2015-04-05 15:16:32 -07:00
PabstMirror
c768ef65b2 Tweaking PowderEffects/AirRestitance 2015-04-05 17:07:55 -05:00
esteldunedain
b8c493a495 Merge branch 'master' into AdvancedBallistics 2015-04-05 19:05:12 -03:00
PabstMirror
3e77eb9737 Rangetable Builder and Prepcalc 2015-04-05 16:28:12 -05:00
jaynus
8fa6ab38fd Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig 2015-04-05 14:08:54 -07:00
jaynus
d6632a0e45 Module should default to true. 2015-04-05 14:08:42 -07:00
PabstMirror
61a0ae1aec Rangetable Dialog 2015-04-05 15:48:56 -05:00
ulteq
cbed79ddd4 Added AdvancedBallistics.dll 2015-04-05 22:31:29 +02:00
jaynus
e02c6305dc Merge pull request #296 from KoffeinFlummi/cmakefiles
Cmake framework for cross-platform extensions and building.
2015-04-05 13:27:33 -07:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
2015-04-05 13:26:54 -07:00
VKing
8255ff666d Fix long-standing typo (get it?) 2015-04-05 22:18:28 +02:00
Glowbal
52fa8df1fa Merge pull request #318 from KoffeinFlummi/medicalImprovements
Medical improvements and fixes round 2
2015-04-05 22:17:00 +02:00
ulteq
19bbc164b1 Added the AdvancedBallistics dll extension source code 2015-04-05 22:16:51 +02:00
VKing
8ad202b039 Fix Fall-of-Shot units being inverted 2015-04-05 22:16:47 +02:00
Glowbal
9e3bb8ac95 fixed triage card 2015-04-05 22:07:38 +02:00
PabstMirror
3d9da5f142 Make Mils Toogle Self Action 2015-04-05 15:00:59 -05:00
jaynus
7d5fca3c5a DIR guidance on Javelin missiles/Titan. TODO: The guidance codes need re-works. 2015-04-05 12:55:17 -07:00
PabstMirror
34a86e0db3 Fix Heading Mils 2015-04-05 14:48:26 -05:00
Glowbal
12d10b8bf7 Blood loss for basic (from AGM medical) 2015-04-05 21:38:15 +02:00
PabstMirror
0281897a3d Show Charge - Cleanup Settings 2015-04-05 14:34:39 -05:00
ulteq
93eaaeb8e2 Added new advanced_ballistics module 2015-04-05 21:08:55 +02:00
jaynus
788487baa5 Debug disable 2015-04-05 11:54:00 -07:00
jaynus
34b834e700 Rudimentary hold-tab lock on titan, sounds added, jink removed, state tracking. 2015-04-05 11:51:39 -07:00
Glowbal
147bb92541 Added setting to disable variable sync (recommended on) 2015-04-05 20:23:07 +02:00
Glowbal
7ffd690a71 Changed: IVs are now synced and medics can see a unit is receiving an IV 2015-04-05 20:11:54 +02:00
jaynus
278ffe7d65 save 2015-04-05 10:45:09 -07:00
Glowbal
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00