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
ruPaladin
100954da06
Update stringtable.xml
2015-04-10 20:19:19 +03:00
EpMAK
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
Jo David
33a14076fc
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
...
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
Grzegorz
37be4f9e53
captives PL translation
2015-04-10 03:56:24 +02:00
VyMajoris
f98b9c27c6
Added - Portuguese translation to Captive surrendering
...
I need more context on "STR_ACE_Captives_Zeus_OnlyInfentry" and "STR_ACE_Captives_Zeus_OnlyAlive" to translate.
Are those texts talking to the player or is just a description for an action?
2015-04-09 22:16:14 -03:00
VyMajoris
ac5589c1c1
Added - Portuguese translation to Captive surendering
...
Need more context to translate STR_ACE_Captives_Zeus_OnlyAlive and STR_ACE_Captives_Zeus_OnlyInfentry.
2015-04-09 20:30:09 -03:00
Legolasindar
1dcbebc04c
Update stringtable.xml
...
Updated spanish terms
2015-04-10 00:10:47 +02:00
licht-im-Norden87
2c7df9da6a
Stringtable: German additions
2015-04-09 23:02:28 +02:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
Glowbal
89015c94d4
Removed rouge system chat and diag_log messages
2015-04-05 19:42:55 +02:00
Nicolás Badano
5f4030469f
Merge pull request #309 from KoffeinFlummi/closeInteractMenu
...
Close interact menu when knocked out
2015-04-04 15:35:00 -03:00
esteldunedain
d090b3328c
- Close interact_menu when the player falls unconscious
...
- Prevent all types of interactions while unconscious
2015-04-04 12:25:49 -03:00
PabstMirror
07dfe52133
Remove Duplicate Mortar Code (inherit from statics)
...
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
2015-04-03 19:07:13 -05:00
Glowbal
244bac8562
Merge branch 'master' into medicalAdvanced
2015-04-03 22:42:09 +02:00
Glowbal
ffcc01ef74
Removed rouge systemChat message on unconsciousness #292
2015-04-03 08:45:02 +02:00
PabstMirror
7c121e6a80
Missing, unused stringtable
2015-04-02 22:32:16 -05:00
PabstMirror
209bdc8dfd
Merge pull request #257 from KoffeinFlummi/captivesFixRespawn
...
Captives fix respawn Fix #230
2015-03-29 11:23:33 -05:00
PabstMirror
40ccf7b241
Captives - Should disable reloading
2015-03-28 01:46:13 -05:00
PabstMirror
14cbceef97
Rerun set func when respawn into captive unit
2015-03-26 14:21:26 -05:00
PabstMirror
d4d0a0a6de
Make sure to remove animEH
2015-03-26 00:53:38 -05:00
PabstMirror
811530f180
Ensure captiveNum is reset for respawning unit
2015-03-26 00:53:02 -05:00
bux578
60c50e0daf
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
2015-03-24 19:12:23 +01:00
PabstMirror
20362e8dc9
Cleanup exception names
2015-03-23 15:22:26 -05:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01:00
commy2
2744f46bd2
spelling
2015-03-15 16:12:37 +01:00
commy2
0064f5739c
manual merge
2015-03-15 09:30:26 +01:00
commy2
4dab0b73d5
add conditions on post init
2015-03-15 09:26:16 +01:00
PabstMirror
93262f3b92
Use ace_isUnconscious in anim changed EH
2015-03-13 00:45:12 -05:00
PabstMirror
55fcc60453
Merge branch 'master' into captivesMedicalInegration
2015-03-12 22:44:24 -05:00
PabstMirror
bed312dcee
Use MACRO_ADDITEM from main instead of redefining
2015-03-11 17:36:40 -05:00
PabstMirror
3f32627d61
Implement Unconc Event Handler
2015-03-10 11:08:15 -05:00
Nicolás Badano
8e0158209c
Merge branch 'master' into ace_interactionCleanup
2015-03-01 17:15:24 -03:00
Nicolás Badano
2235f84408
Moved handcuffing/uncuffing to top level actions, as we apparently won't be interacting with hands for anything else for the moment
2015-03-01 00:48:29 -03:00
PabstMirror
80ac6d83de
Zeus Module Messages
2015-02-24 12:44:54 -06:00
PabstMirror
ae3de331c4
Module At Mission Start (Issue #148 )
2015-02-24 11:51:37 -06:00
PabstMirror
233647a144
Merge branch 'master' into fixSurrendering
2015-02-24 11:37:28 -06:00
PabstMirror
5364980997
Zeus Module Hints
2015-02-24 11:36:49 -06:00
PabstMirror
85c568a061
Comments
2015-02-24 10:27:53 -06:00
Nicolás Badano
669568cafe
Merge pull request #157 from KoffeinFlummi/selfInteractionMenu
...
Self action menu and Action menu on selections
2015-02-23 14:24:43 -03:00
PabstMirror
a8e269bc18
Cleanup Escort Logic
...
No more ERROR spam
2015-02-19 14:34:14 -06:00
Nicolás Badano
f7d5d615ee
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
PabstMirror
37216d5144
Remove HandCuff animEH
2015-02-17 17:05:07 -06:00
PabstMirror
9cdf06383d
Back to getIn
2015-02-16 19:20:55 -06:00
PabstMirror
dc82e50d72
fix
2015-02-16 18:30:35 -06:00
PabstMirror
eee4b256cd
More Changes and add EH
2015-02-16 18:03:09 -06:00
PabstMirror
e0d1d08913
Change AnimChange EH
2015-02-15 18:19:01 -06:00
PabstMirror
a0c2a00777
Cleanup
2015-02-15 16:45:13 -06:00
PabstMirror
3c65c422b1
More Surrender Fixes
...
Increase "drop hands" animation speed (now just 1/2 of normal)
Use "AnimChanged" EH to watch for animation breaks while surrendering
Only "crack" the hands up animation if we are in the right animation
state
2015-02-15 16:42:00 -06:00
PabstMirror
dec34b4b30
Surrender Fixes
...
Remove XEH GetIn and use vehicleChanged Event
Handle Zeus (showHUD)
Attempt to handle failed animation change
2015-02-15 14:55:17 -06:00
PabstMirror
b3f68467bb
Wrong Actions in CfgMoves
2015-02-09 23:33:50 -06:00
PabstMirror
6d534e8846
#130 - Surrender Module Prototype
2015-02-07 15:20:51 -06:00
PabstMirror
fcf39a3916
#118 Sound Effect from CSE
2015-02-06 23:23:33 -06:00
PabstMirror
ed3f28ec6d
Minor Cleanup
2015-02-06 22:24:27 -06:00
PabstMirror
c117e9bf16
Header Examples
2015-02-06 17:03:56 -06:00
PabstMirror
98564fae68
Surrendering
2015-02-06 15:54:26 -06:00
PabstMirror
7a3029b9fd
replace spawns
2015-02-06 03:38:27 -06:00
PabstMirror
82a8fc8ca3
exceptions
2015-02-05 23:11:28 -06:00
PabstMirror
122a38a6aa
More Refactoring
2015-02-05 16:39:45 -06:00
PabstMirror
435b3b8b86
Move Code out of CfgVehicles
2015-02-04 13:16:19 -06:00
PabstMirror
11cd426b87
Redo XEH
2015-02-04 00:35:51 -06:00
PabstMirror
24ab11a1e2
More work
2015-02-03 23:56:51 -06:00
PabstMirror
4c727fbff5
remoteFncs -> events
2015-02-03 23:13:44 -06:00
PabstMirror
4156143ecf
Captives Progress
2015-02-03 00:42:34 -06:00
PabstMirror
982f3b230a
Captives First Pass
2015-02-02 20:04:50 -06:00
PabstMirror
3865598095
AGM_Captives
2015-02-02 19:48:33 -06:00
