Commit Graph

2881 Commits

Author SHA1 Message Date
commy2
2ef05577c7 slightly improve nts function 2015-04-06 21:09:20 +02:00
commy2
c1799616c7 add function to convert numbers to string 2015-04-06 20:47:11 +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
jaynus
d6cf07a3b6 Changed: FCS update was not being delayed for laser. Delay of 0.5s added. 2015-04-06 11:44:17 -07:00
Glowbal
bdb5c8e728 Merge pull request #349 from KoffeinFlummi/medicalBugFixes
Exit displayPatientInformation PFH when a different selection is selected.
2015-04-06 19:49:12 +02:00
Glowbal
4c6dad69f9 Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error) 2015-04-06 19:43:27 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
jaynus
bdcec243a8 Changed: Comanche Gatling HEDP effects and dispersion. 2015-04-06 09:14:56 -07:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
jaynus
c3dbcf1351 increase frequency of laser update. 2015-04-06 07:40:20 -07:00
commy2
796a430292 Merge pull request #326 from KoffeinFlummi/VectorFOSfix
Fix for Vector Fall-of-Shot display
2015-04-06 16:20:13 +02:00
commy2
1e497c228c switch sides of add/drop left/right 2015-04-06 16:18:59 +02:00
Glowbal
1c28e82725 Merge pull request #341 from KoffeinFlummi/medicalFixes
Fixes for bodybag and support for radio mods in medical
2015-04-06 16:17:08 +02:00
commy2
ebd1e555a3 fix: derp when switching control numbers 2015-04-06 16:07:52 +02:00
ulteq
1320176c12 Initial merge of the ATragMX - Ballistics calculator WIP) 2015-04-06 15:51:59 +02:00
Glowbal
76ad6b8294 Added missing main actions 2015-04-06 15:46:50 +02:00
Glowbal
ce4cdd3722 staged bodybag fixes 2015-04-06 15:11:54 +02:00
Glowbal
661d93e82c Working commit 2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55 Fixed treatment locations 2015-04-06 14:32:37 +02:00
ulteq
31b6c97cbe Replaced spawn and sleep commands with PFHs 2015-04-06 14:20:31 +02:00
Glowbal
43b3190202 config fix 2015-04-06 14:14:00 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
2657677bd8 Added support for TFR/ACRE on unconscious 2015-04-06 14:09:59 +02:00
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
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
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
jaynus
c87f2f8bcc Added: Generic placeholder medical box. 2015-04-05 15:16:32 -07:00
esteldunedain
b8c493a495 Merge branch 'master' into AdvancedBallistics 2015-04-05 19:05:12 -03: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
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