Glowbal
|
7f2ada38a2
|
Merge branch 'checkpboSettings' of github.com:usecforce/ACE3
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/config.cpp
|
2015-06-04 21:51:54 +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 |
|
PabstMirror
|
84d940e69d
|
Fix circular dependency - ModuleDescription
|
2015-05-30 00:31:07 -05: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
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
jonpas
|
cccc741a16
|
#1123 - Added CheckPBOs to ACE_Settings
|
2015-05-16 00:54:01 +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 |
|
commy2
|
1dea63067a
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics
|
2015-04-04 16:14:19 +02:00 |
|
commy2
|
ea275b1e52
|
2d with and without PIP
|
2015-04-04 08:51:22 +02:00 |
|
Glowbal
|
4478602cfb
|
Consistent use of quotes for localized text
|
2015-04-03 12:56:12 +02:00 |
|
Glowbal
|
2d0e8dea7e
|
Added banana to curator item list
|
2015-04-03 01:27:22 +02:00 |
|
bux578
|
c44b944044
|
add missing icons
|
2015-03-25 06:32:08 +01:00 |
|
bux578
|
ba42ec831b
|
second batch of icons
|
2015-03-23 20:02:35 +01:00 |
|
commy2
|
46a0fc5631
|
more macros for common
|
2015-01-13 22:32:56 +01:00 |
|
commy2
|
b7050a4a92
|
fixing macros
|
2015-01-13 19:31:26 +01:00 |
|
jaynus
|
3fb2a8e245
|
big code clean up
|
2015-01-12 21:14:27 -08:00 |
|
commy2
|
cf8259882e
|
formating
|
2015-01-12 22:34:01 +01:00 |
|
commy2
|
7954988130
|
rename core to common
|
2015-01-12 19:22:58 +01:00 |
|