PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
licht-im-Norden87
39e26b0f11
captives
2016-02-10 17:19:42 +01:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
ca9b909e75
fix CBA_fnc capitalization
2015-11-30 16:45:20 +01:00
gienkov
b091b73e24
fixes
2015-11-27 21:54:04 +01:00
gienkov
3250245587
3.4.0 translations and fixes
2015-11-27 21:50:57 +01:00
gienkov
7eecff4296
Merge remote-tracking branch 'origin' into pl-translation
...
Conflicts:
addons/captives/stringtable.xml
addons/map_gestures/stringtable.xml
addons/zeus/stringtable.xml
2015-11-27 21:19:25 +01:00
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
PabstMirror
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
kaban
da16fc1038
\addons\captives\stringtable.xml - resolving conflicts.
2015-11-18 06:50:00 +03:00
PabstMirror
5823749f0c
Merge branch 'master' into settingsErrorChecking
2015-11-17 14:00:22 -06:00
commy2
a57d1bca75
replace local keyword with private
2015-11-17 17:43:07 +01:00
Jonathan Pereira
7ec480c98e
Added ace_captives translation to PT-BR
2015-11-07 11:39:02 -02:00
gienkov
0b6fcacaf0
pl translation
2015-11-06 00:56:15 +01:00
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
PabstMirror
1c26f6c9f5
Captives - Module to set handcuffing
...
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
2015-10-23 14:17:31 -05:00
PabstMirror
ef681e4332
Captives - Fix adding duplicate animEH
2015-10-23 13:11:11 -05:00
bux578
602832cc0c
adjust german translations
2015-10-19 07:29:02 +02:00
bux578
f7b717db64
Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11
2015-10-19 07:23:51 +02:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
PabstMirror
94e3cd1f79
Replace old use of showHud
2015-10-15 22:45:35 -05:00
licht-im-Norden87
66e8914360
Update stringtable.xml
2015-10-01 04:38:21 +02:00
licht-im-Norden87
88ee846d7d
Update Stringtable, german: "captives"
2015-10-01 01:36:27 +02:00
PabstMirror
d454271fb9
Give the event the D
2015-09-29 11:40:32 -05:00
PabstMirror
16b1244b0a
Global Event for "CaptiveStatusChange"
2015-09-29 10:17:17 -05:00
PabstMirror
079d88ded7
Merge pull request #2509 from acemod/miscFixNilFunctions
...
Fix some nil functions
2015-09-21 20:36:09 -05:00
PabstMirror
bf0cdbaf77
Merge pull request #2534 from acemod/unconcHandcuffs
...
Take Unconscious captive
2015-09-21 20:35:02 -05:00
PabstMirror
db41537f56
#2524 - Take Unconscious captive
2015-09-19 13:58:34 -05:00
PabstMirror
c62ea5e406
Fix some nil functions
2015-09-18 13:47:19 -05:00
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
PabstMirror
17fdce7196
Cleanup preInit
2015-09-15 08:03:56 -05:00
SilentSpike
7c846502b5
Reset captive status on respawn for reliability
...
Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player.
To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.
2015-09-12 15:42:20 +01:00
Alessandro Foresi
a764f1772e
Added: IT captives, fixed ballistics
2015-09-12 09:35:56 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
commy2
acfc48efc2
animate head when surrendered and handcuffed
2015-09-01 20:00:28 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
PabstMirror
d3db5ad2ed
Cleanup
2015-08-24 00:07:40 -05:00
PabstMirror
40634318f0
Move RemoveHandcuffs to Main (always blocked by hands)
2015-08-23 23:41:35 -05:00
PabstMirror
8ca06a9a76
More FFV animation stuff
2015-08-23 12:32:46 -05:00
PabstMirror
b5fb0daa9b
Merge branch 'master' into captiveFFV
2015-08-23 10:46:49 -05:00
PabstMirror
69df301e67
Replace one more macro
2015-08-23 02:29:51 -05:00
PabstMirror
51a8cb7974
Only force Animation for FFV Cargo Seats
2015-08-20 23:58:06 -05:00
PabstMirror
645e8a63ef
Captive FFV Lock Animation
2015-08-20 04:20:46 -05:00
jonpas
683e727cb4
Readded items
2015-08-19 04:22:39 +02:00
jonpas
de033f0ff2
README.md files added to all modules
2015-08-19 04:18:33 +02:00
bux578
ec29890780
Merge pull request #2128 from acemod/gienkov-pl-translation-5
...
Gienkov pl translation 5
2015-08-16 08:54:47 +02:00
PabstMirror
c35fc35eb3
Captive FFV stuff
2015-08-14 21:29:01 -05:00
PabstMirror
3425913d27
#2132 - Don't use depreciated Helicopter_F
2015-08-12 23:32:57 -05:00
gienkov
1c537c6739
fix captives again
2015-08-09 23:04:16 +02:00
gienkov
0914193e14
fix captives module
2015-08-09 22:45:01 +02:00
gienkov
be787883f2
captives translation
2015-08-09 22:38:34 +02: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
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +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
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
KoffeinFlummi
b263ac6847
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/common/stringtable.xml
2015-04-29 12:57:48 +02:00
KoffeinFlummi
c854d2208f
Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/captives/stringtable.xml
2015-04-29 12:54:20 +02:00
KoffeinFlummi
a1e709047e
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
NukeDev
0b4bb6e4c9
Italian's Translation fixes
...
atragmx, attach, ballistics, captives languages fixes
2015-04-28 19:40:36 +02:00
PabstMirror
ca980379c8
Minor captive cleanup
2015-04-25 16:03:21 -05:00
KoffeinFlummi
06a4f3d10e
Remove tabler comments.
2015-04-20 15:48:50 +02:00
Grzegorz Sikora
8530684fa6
PL fix #2
2015-04-19 23:09:11 +02:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
ruPaladin
e38a6fc62b
one more russian fix
2015-04-17 12:01:01 +03:00
PabstMirror
638433614c
Some missing private defines.
2015-04-16 12:36:16 -05:00
Tachii
def2f9c28e
Update stringtable.xml
2015-04-16 18:13:53 +03:00
PabstMirror
0076be6a86
Fix stringtables
2015-04-15 17:08:35 -05:00
KoffeinFlummi
9e6ae52ca5
Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/captives/stringtable.xml
2015-04-15 22:07:42 +02:00
PabstMirror
e84689a771
#544 - Change ERROR warning to debug trace
2015-04-15 11:46:06 -05:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
Marco
f328d302e1
Update stringtable.xml
...
Italian translation
2015-04-15 10:42:25 +02:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
KoffeinFlummi
96319c8799
Merge https://github.com/ruPaladin/ACE3 into russian-merge
2015-04-14 12:50:14 +02:00
Harakhti
3c3f6ba4c3
Translation: A to I
...
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
KoffeinFlummi
f6c7d444e1
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
KoffeinFlummi
b93cf4fb4a
Merge branch 'polish-merge'
2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
PabstMirror
7111cdd8ff
#540 - remove debug spam
2015-04-13 03:16:33 -05:00
Anthariel
3db8f4ad44
Update stringtable.xml
...
Added: Some missing french translation.
2015-04-12 18:10:41 +02:00
esteldunedain
d6ec8d771e
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-12 11:14:31 -03:00
esteldunedain
91df52056b
Only display "Surrender" action if the player is not holding a weapon.
2015-04-12 11:13:54 -03:00
KoffeinFlummi
614afa8537
Merge https://github.com/Kllrt/ACE3 into czech-merge
...
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
FreeZbe
45ff6c7ce9
French: (Nearly) Complete French translations
...
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
EpMAK
21abff3713
Revert "Revert "Russian Translation""
...
This reverts commit ea04f4ab3e
2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e
Revert "Russian Translation"
...
This reverts commit 17a552bb80
2015-04-11 21:33:07 +03:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
ruPaladin
a3a40a711c
Update stringtable.xml
2015-04-10 20:24:23 +03:00
