PabstMirror
451c88c601
Merge pull request #2027 from acemod/joinGroupTeamManagement
...
EnableTeamManagement setting for joinGroup
2015-08-08 11:16:20 -05:00
jonpas
1aecd54fc3
Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common
2015-08-08 18:02:20 +02:00
PabstMirror
0bd1e1afce
#2024 - EnableTeamManagement setting for joinGroup
2015-08-05 18:02:57 -05:00
SilentSpike
123825a6fe
Updating zeus waypoint actions icon
2015-07-19 12:23:57 +01:00
Ivan Navarro Cabello
78529af60c
Update spanish translation
2015-07-08 20:57:46 +02:00
ProfessorCZ
89a9218e59
CZ Translation - Update
2015-07-04 15:56:00 +02:00
SilentSpike
bbadc9242b
Further zeus actions cleanup
2015-07-03 14:21:21 +01:00
SilentSpike
ca36b62356
Zeus interactions string cleanup
2015-07-03 13:20:32 +01:00
gienkov
70862c5de9
PL translation
2015-07-02 23:55:26 +02:00
Nicolás Badano
10ef88b655
Merge pull request #1596 from SzwedzikPL/interaction_box_inventory
...
Open action for boxes
2015-07-01 12:59:24 -03:00
Nicolás Badano
a284cc3f6b
Merge pull request #1755 from ToasterBR/master
...
Translation to Brazilian Portuguese (PT-BR)
2015-06-29 17:22:38 -03:00
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
SilentSpike
f2e5f729e8
Merge branch 'master' into gm_revamp
2015-06-27 18:26:30 +01:00
jonpas
29ce8f635e
Merge branch 'master' into sitting
...
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
PabstMirror
fdb30f4e68
Merge pull request #1599 from acemod/captivesFixes
...
Captives fixes
2015-06-13 13:15:29 -05:00
PabstMirror
e9750ddc9b
Merge pull request #1611 from acemod/refineStaticInteration
...
Manual MainActions position for some statics weapons
2015-06-13 12:18:28 -05:00
ViperMaul
cb1d016a39
Merge pull request #1592 from ProfessorCZ/master
...
CZ - Translation
2015-06-13 07:39:18 -07:00
PabstMirror
45912c6ddb
Handcuff icon for passengerActions
2015-06-13 00:12:13 -05:00
SzwedzikPL
ac87a28daa
role icon for passengers
2015-06-12 20:32:10 +02:00
SzwedzikPL
19d3cd168c
del extra space
2015-06-12 19:54:45 +02:00
SzwedzikPL
805c0e1c68
Open action for boxes
2015-06-12 19:48:28 +02:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
jonpas
332afb2174
Allow certain self-interactions while sitting
2015-06-09 16:17:05 +02:00
PabstMirror
abf2887826
Manual MainActions position for some statics weapons
2015-06-07 00:25:52 -05:00
SilentSpike
85a281d586
Fixed random missing english string
2015-06-06 17:41:24 +01:00
SilentSpike
822dd11ec6
Moved base ACE_ZeusActions to ace_interaction
2015-06-06 17:33:13 +01:00
PabstMirror
32ce0aa6fd
Macroize all stringtables
2015-06-05 21:02:24 -05: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
Glowbal
1c0c73be54
Merge pull request #1433 from acemod/fixSettingsFromModules
...
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +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
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
Macusercom
489751f5aa
More German string fixed
...
As recommended...
2015-05-28 16:21:53 +02:00
jonpas
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
jonpas
87db721d4f
Stringtable fixes up to medical
2015-05-27 21:19:14 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02: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
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
PabstMirror
1e7e5c7aa5
Don't show passenger actions for UAV crew
2015-05-17 17:52:56 -05:00
PabstMirror
bb63882d20
#1238 - open door error
2015-05-15 22:52:54 -05:00
esteldunedain
89fe91cce0
Fix tap shoulders keybind
2015-05-15 15:52:09 -03:00
Nicolás Badano
d9b6636221
Merge pull request #1196 from Winter259/common-cleanup
...
Cleanup of nearly all common functions
2015-05-14 18:31:19 -03:00
SAM
021679208b
First batch of settings files
...
Separating ACE_Settings.hpp from config.cpp
2015-05-14 20:46:35 +02:00
PabstMirror
f0b7b34321
Cleanup
2015-05-14 13:00:56 -05:00
PabstMirror
ec38c8c951
Merge branch 'master' into interactionPrivates
...
Conflicts:
addons/interaction/functions/fnc_addPassengerActions.sqf
addons/interaction/functions/fnc_getDoorAnimations.sqf
addons/interaction/functions/fnc_moduleInteraction.sqf
addons/interaction/functions/fnc_moveDown.sqf
addons/interaction/functions/fnc_removeTag.sqf
addons/interaction/functions/fnc_showMouseHint.sqf
addons/interaction/functions/fnc_updateTooltipPosition.sqf
2015-05-14 12:53:18 -05:00
jonpas
5a17b39a7e
Merge remote-tracking branch 'origin/master' into interactionCodingGuidelines
...
Conflicts:
addons/interaction/CfgVehicles.hpp
2015-05-14 16:57:49 +02: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
