jonpas
|
332afb2174
|
Allow certain self-interactions while sitting
|
2015-06-09 16:17:05 +02:00 |
|
jonpas
|
541f1010a7
|
Merge branch 'master' into macroSTR
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
|
2015-06-02 22:14:32 +02:00 |
|
esteldunedain
|
9d29aa2107
|
- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
|
2015-05-30 01:37:41 -03:00 |
|
jonpas
|
0b0f7274d7
|
Applied ESTRING and ECSTRING macros
|
2015-05-27 22:04:41 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
Grzegorz Sikora
|
44466e8be8
|
Remove tabs and repair errors @Glowbal found
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
|
2015-05-12 18:27:27 +02:00 |
|
Grzegorz Sikora
|
156bba3321
|
Yes/No to BOOL
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
|
2015-05-12 18:26:24 +02:00 |
|
Grzegorz Sikora
|
6a821715a0
|
Stringtable modules
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
|
2015-05-12 18:25:40 +02:00 |
|
Nicolás Badano
|
4fb50fa71e
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-03-24 15:44:10 -03:00 |
|
Nicolás Badano
|
8b3648cf8d
|
Configure exceptions for self actions inside vehicles
|
2015-03-24 15:43:49 -03:00 |
|
bux578
|
ba42ec831b
|
second batch of icons
|
2015-03-23 20:02:35 +01:00 |
|
Nicolás Badano
|
eb4ccd9505
|
Merge branch 'hearingCleanup' of github.com:KoffeinFlummi/ACE3
Conflicts:
addons/hearing/functions/fnc_updateVolume.sqf
|
2015-03-16 20:39:49 -03:00 |
|
Nicolás Badano
|
5b91996c69
|
Add hearing module and additional customization parameters:
- Enable/Disable combat deafness altogether (default on)
- Volume when using earbuds (default 50%)
- Volume when unconscious (default 40%)
|
2015-03-16 20:28:37 -03:00 |
|
PabstMirror
|
5d0f0c2896
|
Rename ACE_EarBuds -> ACE_EarPlugs
Can't verify translations
|
2015-03-16 10:56:05 -05:00 |
|
PabstMirror
|
bed312dcee
|
Use MACRO_ADDITEM from main instead of redefining
|
2015-03-11 17:36:40 -05:00 |
|
PabstMirror
|
436815fea3
|
Paths
|
2015-01-13 21:45:09 -06:00 |
|
Nicolás Badano
|
e7c3b0db18
|
hearing: various fixes
|
2015-01-13 22:41:53 -03:00 |
|
Nicolás Badano
|
5d6fd9ab3e
|
CBAfy AGM_Hearing
|
2015-01-13 01:17:52 -03:00 |
|