Commit Graph

151 Commits

Author SHA1 Message Date
PabstMirror
3425913d27 #2132 - Don't use depreciated Helicopter_F 2015-08-12 23:32:57 -05:00
Glowbal
c7ac190f58 Finalized settings 2015-08-09 00:21:59 +02:00
Glowbal
27ec3adeac Added stringtable entries requireSurrender setting 2015-08-07 14:51:56 +02:00
Glowbal
997ac53c11 Added isSurrendering check 2015-08-07 14:49:01 +02:00
Glowbal
4c935bb504 Added setting for require surrender 2015-08-07 14:46:28 +02:00
PabstMirror
016f45f0e8 fix speling 2015-08-06 15:41:24 -05:00
jokoho48
24dd320c3c Updated parameterization in Captives module. 2015-08-05 01:15:20 +02:00
KoffeinFlummi
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02: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
Macusercom
500504d93b Further improvements as suggested for German translation 2015-06-18 00:43:23 +02:00
Macusercom
cf2f36a775 Corrections suggested by others 2015-06-16 23:17:34 +02:00
Macusercom
24cea18ae5 Revert "Revert "Added German translations""
This reverts commit 4403e3c665.
2015-06-16 03:21:25 +02:00
Macusercom
4403e3c665 Revert "Added German translations"
This reverts commit 0adc07d284.
2015-06-16 03:06:23 +02:00
Macusercom
0adc07d284 Added German translations 2015-06-16 03:06:13 +02:00
esteldunedain
d53ee1cf85 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk
Conflicts:
	addons/captives/CfgVehicles.hpp
2015-06-13 15:19:52 -03:00
PabstMirror
fdb30f4e68 Merge pull request #1599 from acemod/captivesFixes
Captives fixes
2015-06-13 13:15:29 -05:00
esteldunedain
3d5afd7d8f Close #1018 2015-06-13 14:32:18 -03:00
PabstMirror
58e5bc3581 Switch unload captive to passenger actions 2015-06-13 00:02:30 -05:00
ProfessorCZ
acc5f4d29f CZ - Translation 2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3 CZ - Translation
Already in README
2015-06-12 14:50:50 +02:00
PabstMirror
84a12bcd56 Can't escort when mounted (passenger actions) 2015-06-10 22:44:54 -05:00
Ivan Navarro Cabello
d15bae105d Updated spanish translation
Updated spanish translation
2015-06-08 12:43:07 +02:00
ulteq
47d0d98680 Merge pull request #1537 from gienkov/pl-translation-2
captives and tripod PL translation
2015-06-08 00:34:56 +02:00
gienkov
ecf7873f33 captives and tripod PL translation 2015-06-07 18:55:49 +02:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
PabstMirror
b466566104 Switch to new CSTRING 2015-06-04 13:19:05 -05:00
PabstMirror
e5edc0345b Merge branch 'master' into captiveModuleSettings
Conflicts:
	addons/captives/CfgVehicles.hpp
2015-06-04 13:15:53 -05:00
PabstMirror
701aa7e343 Add New Icons 2015-06-03 00:55:20 -05:00
PabstMirror
5dc94487c5 Module Settings for Captivity
Setting for handcuffing own team, and allowing surrender.
2015-06-02 20:50:27 -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
SilentSpike
bfce854be3 Localise module messages 2015-06-01 20:50:19 +01:00
SilentSpike
eefe995a0c Transfer curator functionality from ace_captives 2015-06-01 20:44:50 +01:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02: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
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
PabstMirror
c4e5e9a7ac #1298 - Reset handcuffs on respawn 2015-05-18 22:02:50 -05:00
GieNkoV
1610221a70 Remove duplicated strings 2015-05-12 20:01:10 +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
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
jaynus
8e7763af08 Removed: systemChat debug in captive 2015-05-11 13:50:24 -07:00
ViperMaul
b0051a6638 Merge pull request #1094 from acemod/fixUnSurrender
Fix not being able to UnSurrender (currentWeapon)
2015-05-11 08:39:39 -07:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
PabstMirror
59adf92862 Fix not being able to UnSurrender (currentWeapon) 2015-05-10 01:47:50 -05:00
Alessandro Foresi
6695a8793b Added: Some italian translastions 2015-05-09 23:43:03 +02:00