896615beb1
Merge pull request #2826 from acemod/settingsParamsArray
...
Read settings from paramsArray (params in description.ext)
2015-11-17 14:01:16 -06:00
5823749f0c
Merge branch 'master' into settingsErrorChecking
2015-11-17 14:00:22 -06:00
a7b5945a12
Merge pull request #2849 from acemod/localtoprivate
...
replace local keyword with private
2015-11-17 19:37:38 +01:00
a57d1bca75
replace local keyword with private
2015-11-17 17:43:07 +01:00
b6f9a2b776
Merge pull request #2703 from jonpas/removeAdjustedProneOptics
...
Remove enable optics in adjusted prone stances
2015-11-17 16:24:27 +01:00
bc09b50fa5
Merge pull request #2845 from ToasterBR/Translations04
...
Added PT-BR translations to Cargo
2015-11-14 19:29:56 +01:00
6ebd76ff2f
Added PT-BR translations to Cargo
2015-11-14 12:24:01 -02:00
42a42e8b7b
Merge remote-tracking branch 'refs/remotes/acemod/master' into Translations04
2015-11-14 12:20:59 -02:00
99852f2071
Merge pull request #2718 from acemod/rangeCards-scriptError
...
RangeCard / AB fixes
2015-11-10 21:02:16 -06:00
4ff31771d3
DAGR - missing (
2015-11-10 20:51:00 -06:00
e2e74e0f5d
DAGR - Fix degrees (° - seems to need UTF-8 BOM)
2015-11-10 16:17:22 -06:00
830e7d9be4
Merge pull request #2278 from jokoho48/codeCleanUpDagr
...
Code cleanup of Dagr module
2015-11-10 16:15:12 -06:00
716e82619b
Merge pull request #2738 from acemod/pySearchLocalPrivates
...
Local privates to search_privates.py
2015-11-10 10:16:24 -06:00
d91ae9082e
Merge pull request #2628 from acemod/cargoClassnames
...
Add support for virtual cargo
2015-11-10 08:38:17 +01:00
ec1187e79b
Merge pull request #2830 from acemod/mixedMedicalDisplay
...
Display basicMed wounds for AI in mixed mode
2015-11-10 08:33:21 +01:00
28738517e8
Merge pull request #2829 from acemod/FlashlightProxyModel
...
Fix empty flashlightProxy model + Delete map glow lights from disconnecting players
2015-11-08 11:25:06 -06:00
5b16638ae5
Always force param settings
2015-11-08 11:22:41 -06:00
5a599816f6
Merge pull request #2831 from acemod/realName-ka60v22
...
RealisticNames - add ka-60 v2 (black and white)
2015-11-07 18:36:05 -06:00
dad1388eec
RealisticNames - add ka-60 v2 (black and white)
2015-11-07 18:34:46 -06:00
01d679c5dc
#2810 - Delete map glow light from DC players
2015-11-07 14:33:41 -06:00
ff60cdcfa3
#2828 - Fix empty flashlightProxy model
2015-11-07 11:44:31 -06:00
c3653094ea
Merge pull request #2827 from ToasterBR/Translations03
...
Added ace_captives translation to PT-BR
2015-11-07 17:37:31 +01:00
7ec480c98e
Added ace_captives translation to PT-BR
2015-11-07 11:39:02 -02:00
f0fa9875d1
Merge remote-tracking branch 'refs/remotes/acemod/master' into Translations03
2015-11-07 11:31:49 -02:00
d0c6512f47
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-11-07 11:31:03 -02:00
caa36aa4f6
Merge pull request #2819 from acemod/medicalTranslateHitpoints
...
Medical - Better handle odd selection/hitpoint names
2015-11-07 11:06:49 +01:00
826b4fd20b
Cleanup
2015-11-06 20:53:05 -06:00
e0506f29bc
Read settings from paramsArray (params in description.ext)
...
for now just limited to SCALAR/BOOL
2015-11-06 20:46:06 -06:00
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
6e30e9e0df
Fix overpressure priority evaluation
...
The code was checking the wrong configs for priority because of some missing variables.
2015-11-06 19:02:54 +00:00
9161f8e2fb
Merge pull request #2824 from acemod/acreIsSpeaking
...
Nametags - Cleanup isSpeaking for ACRE
2015-11-06 09:58:16 -06:00
c326bc2f87
#2772 - Display basicMed wounds for AI in mixed mode
2015-11-06 01:05:25 -06:00
4b200d6909
bump to v3.3.3
2015-11-05 14:00:01 -08:00
fabbf6d14d
Nametags - Cleanup isSpeaking for ACRE
2015-11-05 13:13:37 -06:00
38105136fa
#2820 - Fix target event error
2015-11-04 17:43:51 -06:00
1cebe613fa
Fix Capitialzation
2015-11-04 14:38:32 -06:00
c5da32e470
Medical Handle Damage - check hitpoints if selection is weird
2015-11-04 14:36:26 -06:00
39d4383a04
Merge pull request #2781 from acemod/updateWirecutters
...
Wirecutters - Update Fence Configs, Use faster getModelInfo
2015-11-04 13:17:15 -06:00
c88f77403b
Merge pull request #2805 from jonpas/cleanupMacros
...
Cleanup Macro Definitions
2015-11-04 13:16:14 -06:00
af5b646adb
Update CBA Includes
...
From
354f1b189e
2015-11-04 13:15:45 -06:00
a3443cae43
Merge pull request #2780 from acemod/fixTimeInComments
...
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
50ab2aa904
MicroDagr - move drawEH array define to preInit
...
Fix load order problems (init.sqf can be before postInit)
2015-11-02 15:21:34 -06:00
ac22ca3637
Merge pull request #2813 from acemod/medical-hitpoints-fix
...
Add method to deal with new hitpoints
2015-11-02 20:20:23 +01:00
bd97c1ee96
fix Docu in waitUntilAndExecute
2015-11-02 12:05:43 +01:00
8f6e9be636
Add method to deal with new hitpoints
...
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.
This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
2015-11-01 16:35:25 +01:00
224bfad1d5
Merge pull request #2809 from jonpas/fixContributingLinks
...
Fix contributing guidelines links
2015-11-01 08:07:19 +01:00
8d3d9ff8f4
Properly fix links
2015-10-31 15:26:24 +01:00
d24569953b
Fix CONTRIBUTING.md links
2015-10-31 15:21:54 +01:00
03d3d1c764
Merge pull request #2789 from ToasterBR/translation02
...
Remaining PT-BR translations
2015-10-31 06:14:37 +01:00
