Commit Graph

4115 Commits

Author SHA1 Message Date
ulteq
6d1e8eebce Reworked the range card output when AB is disabled 2015-05-29 15:07:30 +02:00
ulteq
a5a96052b8 Made use of the newly implemented speed of sound calculation 2015-05-29 13:34:34 +02:00
ulteq
ade2cc1c56 Refined the reference barometric pressure calculation 2015-05-29 12:55:16 +02:00
ulteq
988a12327f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rangecard 2015-05-29 12:44:11 +02:00
ulteq
1ec37aabed Merge pull request #1424 from acemod/barometricPressureFix
Fixed incorrect barometric pressure calculation
2015-05-29 12:40:17 +02:00
ulteq
abf0149b1d Added speed of sound calculation:
* Influences the advanced ballistics transonic instability
* Influences the ATragMX range card output
2015-05-29 11:36:37 +02:00
ulteq
69b9d0e122 More in-depth barometric pressure calculation:
* Temperature is now taken into account
2015-05-29 11:18:40 +02:00
ulteq
83f2e35907 Fixed incorrect unit conversion in the barometric pressure calculation 2015-05-29 10:30:30 +02:00
ulteq
01810b8723 - Altitude is only taken into account when AB is enabled
- Separate solution caches for Vanilla and AB ballistics
2015-05-29 09:49:07 +02:00
Garth "L-H" de Wet
e2970ab40e Merge pull request #1414 from acemod/Explosives_ZeusCompatible
Made explosives Zeus and AI compatible specifically in regards to Dea…
2015-05-29 07:48:50 +02:00
Glowbal
d34c96038e Merge branch 'master' of github.com:acemod/ACE3 2015-05-28 20:56:35 +02:00
Glowbal
9135d956f0 Merge branch 'surgicalkit' 2015-05-28 20:54:52 +02:00
Glowbal
27106ce59f minor refactor 2015-05-28 20:54:13 +02:00
ulteq
4ad82d9629 Switched to ctrlCreate to avoid aspect ratio problems with the listbox. 2015-05-28 20:13:22 +02:00
ulteq
697710d40d Initial draft of the range card implementation. 2015-05-28 19:17:29 +02:00
Garth L-H de Wet
529e200a4c Made explosives Zeus and AI compatible specifically in regards to Deadman's switches. 2015-05-28 17:56:45 +02:00
Nicolás Badano
5f70001ac0 Merge pull request #1409 from acemod/gogglesCacheSurfaceDust
Goggles - Cache Surface Dust
2015-05-28 09:48:42 -03:00
Glowbal
5df9bb4a60 Merge pull request #1322 from acemod/SendSettingsDirectlyInsteadOfSplitting
Send directly to extension instead of splitting it
2015-05-28 11:54:11 +02:00
PabstMirror
236ae767b5 Goggles - Cache Surface Dust 2015-05-28 00:18:45 -05:00
PabstMirror
3a4a02e524 #1407 - Make Saline 500ml match mass blood/plasma 2015-05-27 16:23:25 -05:00
Glowbal
7dd01ebb69 Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
PabstMirror
9ed15d9702 Merge pull request #1302 from acemod/nameTagFixes
Nametags - Use EyePos of target / windows
2015-05-27 12:19:17 -05:00
PabstMirror
30adc2d463 Patch Merge of PR #1156 - Optics for tripplehead 2015-05-27 11:28:06 -05:00
Nicolás Badano
c365008330 Merge pull request #1275 from acemod/fixUAVandInteractionInhert
Fix UAV and Interaction Compile Inheritance
2015-05-27 12:20:46 -03:00
esteldunedain
39fec12528 Merge branch 'master' into reliableSettings 2015-05-27 12:09:06 -03:00
esteldunedain
bb99d5a860 Merge branch 'master' of github.com:KoffeinFlummi/ACE3
Conflicts:
	addons/advanced_ballistics/stringtable.xml
2015-05-27 12:08:47 -03:00
Ivan Navarro Cabello
047a2ee736 added spansih translate
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).

I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
BaerMitUmlaut
f2e6a98eb4 Killed tabs 2015-05-27 13:51:22 +02:00
BaerMitUmlaut
6894a7433a Removed duplicate private var 2015-05-27 13:51:15 +02:00
PabstMirror
d2eb08594b Merge branch 'master' into fixUAVandInteractionInhert
Conflicts:
	addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
2015-05-27 00:36:43 -05:00
BaerMitUmlaut
f7578a92c9 Reverted in favour of onProgress treatment 2015-05-27 00:52:16 +02:00
BaerMitUmlaut
30df0e8dc9 Switched to callbackPogress for treatment 2015-05-27 00:45:50 +02:00
BaerMitUmlaut
890b568225 Implemented dynamic treatment time 2015-05-27 00:45:22 +02:00
ulteq
5223455174 New nighttime picture. 2015-05-26 22:26:30 +02:00
Nicolás Badano
32325fc784 Merge pull request #1394 from acemod/sortWaitAndExecute
Single PFEH for waitAndExecute - using sort
2015-05-26 16:40:17 -03:00
ulteq
5e6e62280e Fixed a typo 2015-05-26 15:00:52 +02:00
ulteq
dc1bfa9c92 Nighttime GUI for the ATragMX. 2015-05-26 12:32:37 +02:00
ViperMaul
388d6c3519 Change to the proper isAwake function
#1375
2015-05-25 20:47:28 -07:00
PabstMirror
4e70bf6e83 Single PFEH for waitAndExecute - using sort 2015-05-25 22:46:56 -05:00
BaerMitUmlaut
41892fd6df Added surgicalKit treatment 2015-05-26 00:33:20 +02:00
PabstMirror
d410350a25 Make code less smelly 2015-05-25 14:01:59 -05:00
ViperMaul
6a1724343d remove debug
#1375
2015-05-25 11:38:28 -07:00
ViperMaul
789e92d8ef Ensuring a proper return value and removing unnecessary code.
#1375
2015-05-25 10:32:52 -07:00
ViperMaul
3bdb27386c removing obsolete drag code
#1375
2015-05-25 10:25:28 -07:00
ViperMaul
9a07a9bfd6 modify unloadPerson to use unloadPersonLocal
#1375
2015-05-25 09:43:29 -07:00
ViperMaul
7141d251c7 create unloadPersonLocal
#1375
2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612 revert missing actionDragUnit file
#1375
2015-05-25 09:39:12 -07:00
PabstMirror
c7d9074f3f Javelin - Only run if weapon and ammo supported 2015-05-25 05:38:45 -05:00
PabstMirror
0452270380 Add Javelin CfgAmmo
Leave M_Titan_AT alone for A3 Vehicles / Mods that use it
2015-05-25 05:34:07 -05:00
ulteq
cc7639ea22 Merge pull request #1386 from acemod/airFrictionUpdate
airFriction update
2015-05-25 12:00:31 +02:00