jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
PabstMirror
d7d225cebc
Send waiting debug msg only once
2015-05-30 01:28:15 -05: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
esteldunedain
333cb80171
Delay initialization of ACE_Modules until settings are properly setup
2015-05-30 01:18:23 -03:00
esteldunedain
afa6a2fad9
Remove the "ServerSettingsReceived" event, which is not longer needed. As per @pabstmirror solution, the GVAR(Settings) variable is monitored to determine when the server info has arrived. Fix #1273
2015-05-30 00:43:51 -03:00
PabstMirror
5efde25585
Fix ace_settings
2015-05-29 21:03:47 -05:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
jonpas
baca5a25d5
Merge branch 'master' into checkpboSettings
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-05-28 20:52:35 +02:00
jonpas
86264a7b7d
Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized
2015-05-28 20:49:30 +02:00
jonpas
b85ae8f194
Fixed missed external strings
2015-05-27 22:34:57 +02:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
esteldunedain
39fec12528
Merge branch 'master' into reliableSettings
2015-05-27 12:09:06 -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
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
PabstMirror
4e70bf6e83
Single PFEH for waitAndExecute - using sort
2015-05-25 22:46:56 -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
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
PabstMirror
f4bf6ea26d
Fix Time Calc
2015-05-22 14:29:56 -05:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
jonpas
1a468cb4ff
Split common ACE_Settings.hpp from config.cpp, shortened sampleSetting
2015-05-16 01:06:29 +02:00
jonpas
cccc741a16
#1123 - Added CheckPBOs to ACE_Settings
2015-05-16 00:54:01 +02:00
esteldunedain
0b1beed219
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reliableSettings
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-05-15 18:18:13 -03:00
jaynus
d4dab0275d
Me and my typos.
2015-05-15 12:54:02 -07:00
esteldunedain
d189cffce6
Fix event names
2015-05-15 15:49:22 -03:00
jaynus
e1c3e96eb1
Fixes: Nil scheduled space bug with hashes. This is still a bug everywhere else.
2015-05-15 10:45:07 -07:00
esteldunedain
ca94fd4c78
Remove the pfh
2015-05-14 20:58:45 -03:00
esteldunedain
5e3b6f389a
Reliable settings framework
2015-05-14 20:45:53 -03:00
PabstMirror
666db5e245
Fix Typo
2015-05-14 18:13:20 -05:00
PabstMirror
d5db268fc0
Clean unused privates
2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382
Common Privates Redo
2015-05-14 17:12:40 -05:00
PabstMirror
fd8d68c451
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/common/stringtable.xml
2015-05-14 15:38:13 -05:00
SAM
0b6f02f45e
Second batch of cleaned up files.
2015-05-14 20:06:06 +02:00
SAM
9b55dd0b57
First batch of cleaned up files
2015-05-14 20:02:42 +02:00
jaynus
cac70762f5
Merge pull request #1149 from acemod/extBuildFix
...
Extensions build system updates, changes and crash fixes
2015-05-14 07:25:49 -07:00
Glowbal
abadf05342
Merge remote-tracking branch 'gienkov/module-translations'
...
Conflicts:
addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
jaynus
9f3a57bf32
Changed: checkFiles extension check prints version returned by extension
...
Changed: Build changed to SSE2 instead of defaulting to AVX.
2015-05-13 09:57:24 -07:00
jaynus
ed2f73d4d9
Merge pull request #1117 from acemod/waveHeightAtFunc
...
Added: waveHeightAt Function
2015-05-12 21:15:35 -07:00
jaynus
d972f14649
Merge pull request #1092 from acemod/superTime
...
ACE_time variables for accurate purposeful time use
2015-05-12 19:34:20 -07:00
PabstMirror
e613db1fea
Add missing script_component include
2015-05-12 15:40:12 -05:00
GieNkoV
ed1acd8c15
Some small errors fixed #2
...
Mainly tabs and wrong italian strings (got those from newest master)
2015-05-12 19:42:35 +02:00
GieNkoV
bc72c71e8e
Fix small errors inside stringtables
2015-05-12 19:11:56 +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
PabstMirror
043fee03bd
Return Valid bool for keybind
2015-05-11 22:48:03 -05:00
PabstMirror
de2a89613c
ATragMX
2015-05-11 22:22:24 -05:00
