PabstMirror
|
9d2d5b9c7c
|
AdvanBalls - Fix ACE_twistDirection
|
2015-11-11 01:58:12 -06:00 |
|
PabstMirror
|
e72c1d874a
|
Merge branch 'master' into fixFlashlightPrivates
Conflicts:
addons/map/functions/fnc_determineMapLight.sqf
|
2015-11-10 21:21:06 -06:00 |
|
PabstMirror
|
99852f2071
|
Merge pull request #2718 from acemod/rangeCards-scriptError
RangeCard / AB fixes
|
2015-11-10 21:02:16 -06:00 |
|
PabstMirror
|
4ff31771d3
|
DAGR - missing (
|
2015-11-10 20:51:00 -06:00 |
|
PabstMirror
|
87b9ff9785
|
Hearing - Reset earplugs on respawn, addItem setting
Fix #2835 - readd item on respawn
Fix #2837 - setVariable false on respawn
|
2015-11-10 20:44:55 -06:00 |
|
PabstMirror
|
e2e74e0f5d
|
DAGR - Fix degrees (° - seems to need UTF-8 BOM)
|
2015-11-10 16:17:22 -06:00 |
|
PabstMirror
|
830e7d9be4
|
Merge pull request #2278 from jokoho48/codeCleanUpDagr
Code cleanup of Dagr module
|
2015-11-10 16:15:12 -06:00 |
|
PabstMirror
|
716e82619b
|
Merge pull request #2738 from acemod/pySearchLocalPrivates
Local privates to search_privates.py
|
2015-11-10 10:16:24 -06:00 |
|
Thomas Kooi
|
d91ae9082e
|
Merge pull request #2628 from acemod/cargoClassnames
Add support for virtual cargo
|
2015-11-10 08:38:17 +01:00 |
|
Thomas Kooi
|
ec1187e79b
|
Merge pull request #2830 from acemod/mixedMedicalDisplay
Display basicMed wounds for AI in mixed mode
|
2015-11-10 08:33:21 +01:00 |
|
PabstMirror
|
845909f8af
|
#2833 - Add earplugs based on loudness (+MGs)
Use same loudness calc as firedNear (replacing old audibleFire)
Give ear plugs to machine gunners (depends on magzine size)
|
2015-11-08 14:02:00 -06:00 |
|
PabstMirror
|
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 |
|
PabstMirror
|
5b16638ae5
|
Always force param settings
|
2015-11-08 11:22:41 -06:00 |
|
P1NGA
|
6dd3aebe63
|
Authors....
|
2015-11-08 15:26:17 +11:00 |
|
P1NGA
|
5ffa646ded
|
updated spotting scope model and textures.
|
2015-11-08 15:18:31 +11:00 |
|
PabstMirror
|
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 |
|
PabstMirror
|
dad1388eec
|
RealisticNames - add ka-60 v2 (black and white)
|
2015-11-07 18:34:46 -06:00 |
|
[OMCB]kaban
|
2dd90824aa
|
Map Gestures translations update
|
2015-11-08 02:52:16 +03:00 |
|
PabstMirror
|
01d679c5dc
|
#2810 - Delete map glow light from DC players
|
2015-11-07 14:33:41 -06:00 |
|
PabstMirror
|
ff60cdcfa3
|
#2828 - Fix empty flashlightProxy model
|
2015-11-07 11:44:31 -06:00 |
|
[OMCB]kaban
|
34163b5e56
|
Nametags translations are rolled back
|
2015-11-07 19:54:48 +03:00 |
|
bux578
|
c3653094ea
|
Merge pull request #2827 from ToasterBR/Translations03
Added ace_captives translation to PT-BR
|
2015-11-07 17:37:31 +01:00 |
|
Jonathan Pereira
|
7ec480c98e
|
Added ace_captives translation to PT-BR
|
2015-11-07 11:39:02 -02:00 |
|
Jonathan Pereira
|
f0fa9875d1
|
Merge remote-tracking branch 'refs/remotes/acemod/master' into Translations03
|
2015-11-07 11:31:49 -02:00 |
|
Jonathan Pereira
|
d0c6512f47
|
Merge remote-tracking branch 'refs/remotes/acemod/master'
|
2015-11-07 11:31:03 -02:00 |
|
Glowbal
|
caa36aa4f6
|
Merge pull request #2819 from acemod/medicalTranslateHitpoints
Medical - Better handle odd selection/hitpoint names
|
2015-11-07 11:06:49 +01:00 |
|
PabstMirror
|
826b4fd20b
|
Cleanup
|
2015-11-06 20:53:05 -06:00 |
|
PabstMirror
|
e0506f29bc
|
Read settings from paramsArray (params in description.ext)
for now just limited to SCALAR/BOOL
|
2015-11-06 20:46:06 -06:00 |
|
PabstMirror
|
c91789f3c4
|
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
|
2015-11-06 20:30:12 -06:00 |
|
SilentSpike
|
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 |
|
PabstMirror
|
9161f8e2fb
|
Merge pull request #2824 from acemod/acreIsSpeaking
Nametags - Cleanup isSpeaking for ACRE
|
2015-11-06 09:58:16 -06:00 |
|
PabstMirror
|
c326bc2f87
|
#2772 - Display basicMed wounds for AI in mixed mode
|
2015-11-06 01:05:25 -06:00 |
|
gienkov
|
0b6fcacaf0
|
pl translation
|
2015-11-06 00:56:15 +01:00 |
|
ViperMaul
|
4b200d6909
|
bump to v3.3.3
|
2015-11-05 14:00:01 -08:00 |
|
PabstMirror
|
fabbf6d14d
|
Nametags - Cleanup isSpeaking for ACRE
|
2015-11-05 13:13:37 -06:00 |
|
[OMCB]kaban
|
59b9e9a7df
|
Missing periods added.
|
2015-11-05 03:45:34 +03:00 |
|
kaban
|
e2763dde27
|
Russian Translations - Update
|
2015-11-05 03:28:53 +03:00 |
|
PabstMirror
|
38105136fa
|
#2820 - Fix target event error
|
2015-11-04 17:43:51 -06:00 |
|
PabstMirror
|
1cebe613fa
|
Fix Capitialzation
|
2015-11-04 14:38:32 -06:00 |
|
PabstMirror
|
c5da32e470
|
Medical Handle Damage - check hitpoints if selection is weird
|
2015-11-04 14:36:26 -06:00 |
|
[OMCB]kaban
|
c992458964
|
Merge pull request #3 from acemod/master
Fork update from master
|
2015-11-04 23:28:21 +03:00 |
|
PabstMirror
|
39d4383a04
|
Merge pull request #2781 from acemod/updateWirecutters
Wirecutters - Update Fence Configs, Use faster getModelInfo
|
2015-11-04 13:17:15 -06:00 |
|
PabstMirror
|
c88f77403b
|
Merge pull request #2805 from jonpas/cleanupMacros
Cleanup Macro Definitions
|
2015-11-04 13:16:14 -06:00 |
|
PabstMirror
|
af5b646adb
|
Update CBA Includes
From
354f1b189e
|
2015-11-04 13:15:45 -06:00 |
|
PabstMirror
|
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 |
|
PabstMirror
|
cfba7c01e8
|
Merge branch 'master' into settingsErrorChecking
Conflicts:
addons/map_gestures/stringtable.xml
|
2015-11-03 12:09:36 -06:00 |
|
PabstMirror
|
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 |
|
Glowbal
|
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 |
|
Joko
|
bd97c1ee96
|
fix Docu in waitUntilAndExecute
|
2015-11-02 12:05:43 +01:00 |
|
ColdEvul
|
03b82e5859
|
Adjusted interaction nod, changed carrying height for he barrier.
|
2015-11-01 22:38:55 +01:00 |
|