esteldunedain
ff04ca8981
Uniformize interaction distance for vehicle. Distance is now aprox 4m from the bounding box of the vehicle, consistent with interaction with people.
2016-02-18 20:20:02 -03:00
bux578
93e655588b
Merge pull request #3294 from gienkov/pltranslations
...
pl translation
2016-02-18 19:38:43 +01:00
commy2
be8f7f9cc0
Merge pull request #3276 from acemod/156selectapply
...
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
PabstMirror
be742c13cd
Merge branch 'master' into 155selectRandom
2016-02-17 15:58:19 -06:00
PabstMirror
53d870b62a
Merge pull request #3312 from acemod/passengerInteraction
...
Only get passenger actions for selected unit
2016-02-17 15:33:29 -06:00
PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
PabstMirror
4a8b032c1f
Don't allow passing mags when not in same veh
2016-02-14 14:53:04 -06:00
PabstMirror
54b350a6c0
Only get passenger actions for selected unit
...
Fix #1690 #3309
2016-02-12 15:57:16 -06:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01:00
SzwedzikPL
388b00f58c
remove unnecessary code, aesthetic tweak
2016-02-10 01:38:14 +01:00
gienkov
d5dd718b8d
fix endlines
2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7
pl translation
2016-02-09 11:50:35 +01:00
commy2
41e39c9c3a
replace more filter with select
2016-02-06 11:58:31 +01:00
PabstMirror
e3e9d19ca1
Fix "key" capitalization for Interaction_GetOut
2016-02-05 16:49:36 -06:00
Thomas Kooi
f47b51c0cb
Merge pull request #3070 from dixon13/newCivInteraction
...
Changes to civilian interaction
2016-02-05 09:14:45 +01:00
dixon13
a0e6f97125
Updated condition for ACE_GetOut
2016-02-05 00:32:56 -07:00
SzwedzikPL
5f0a2b1945
use event system, polish translation
2016-02-05 04:26:54 +01:00
SzwedzikPL
374b015ee4
major cleanup
2016-02-05 03:41:18 +01:00
SzwedzikPL
ab297ff97e
more readable macro
2016-02-05 02:03:25 +01:00
SzwedzikPL
a9d57e0d1c
fnc_switchLamp cleanup
2016-02-05 02:02:46 +01:00
SzwedzikPL
7b8be590b4
Merge branch 'acemod/master' into interactions_lamps
2016-02-05 01:43:06 +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
commy2
3854a5c989
Merge pull request #3109 from acemod/ThingX
...
fix ThingX capitalization, fix #3076
2016-01-05 21:52:42 +01:00
commy2
427628045c
fix ThingX capitalization, fix #3076
2016-01-03 15:21:38 +01:00
Alessandro Foresi
2d152675fc
Add: IT small translations, DE removed duplicate
2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
PabstMirror
8bdd5d0597
Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge
2015-12-31 14:30:29 -06:00
PabstMirror
cf27571b5a
Merge pull request #3007 from dudakov/master
...
Russian Translations - Update
2015-12-31 14:11:45 -06:00
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
dixon13
356bd36728
Changed action name
...
- Changed display name for extraction action on civilians to match the new action name 'Get Out'.
- Changed class name for extracting civilians out of vehicles to match the action name
2015-12-29 09:27:43 -07:00
dixon13
f2b3275538
Changed action name
...
Changed extraction action to 'Get Out' to match other civilian actions.
2015-12-29 09:25:33 -07:00
dixon13
d410fe42d9
Fixed misspell
...
'_targe' is suppose to be '_target'
2015-12-28 22:00:08 -07:00
dixon13
a4781a20d3
Authors
2015-12-23 19:27:55 -07:00
dixon13
2a98aa57ed
Delete fnc_canInteractWithCivilianVehicle.sqf
...
No need to create another funciton
2015-12-23 11:54:41 -07:00
dixon13
d3a1110250
Removed a portion of the condition
2015-12-23 11:52:23 -07:00
dixon13
5f7e833d43
Removed "PREP(canInteractWithCivilianVehicle)"
...
Function is being removed
2015-12-23 11:51:19 -07:00
dixon13
21daa331dc
Changes to ACE_Unload
...
- added semi-colon
- changed the condition
- changed the statement
2015-12-23 11:49:17 -07:00
dixon13
1aa192f7e0
Extract civilans from vehicles, rmeoved actions from civilians in vehicles
2015-12-23 00:19:41 -07:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
Jonathan Pereira
ad48f51ec7
Added PT-BR translations
...
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
commy2
ff4406e411
manual merge, more selectRandom command useage
2015-11-29 16:48:23 +01:00
commy2
e5c4d35969
1.55 use new selectRandom command
2015-11-29 16:33:25 +01:00
bux578
35ecef454f
Merge pull request #2825 from gienkov/pl-translation
...
pl translation
2015-11-29 07:35:04 +01:00
Thomas Kooi
ced94d73a7
Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone
...
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
2015-11-28 20:51:39 +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
PabstMirror
4aeeefdfe8
Fix UBC and increase Heli_04 Pod interaction distance
2015-11-26 11:47:25 -06:00
Thomas Kooi
15267c0433
Merge pull request #2219 from acemod/handSignals
...
Hand signals enhancement
2015-11-26 16:04:41 +01:00
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
PabstMirror
185cae2fe5
Remove Old Gestures from interaction
2015-11-25 11:00:45 -06:00
Thomas Kooi
08c5374a99
Merge pull request #2390 from BaerMitUmlaut/pass-magazine
...
Added interaction to quickly pass a magazine
2015-11-25 14:04:07 +01:00
PabstMirror
36bf2d9cb5
Merge pull request #2803 from BaerMitUmlaut/remove-team-synching
...
Remove manual team synching
2015-11-24 21:37:50 -06:00
BaerMitUmlaut
818466d296
Added ACE setting to hide interaction
2015-11-24 19:07:17 +01:00
PabstMirror
51a463de24
Fix tap shoulder msg display
...
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
2015-11-24 11:25:56 -06:00
PabstMirror
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
SilentSpike
0110ada1b5
Fix zeus waypoint formation actions
2015-11-18 14:54:17 +00: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
PabstMirror
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
PabstMirror
38105136fa
#2820 - Fix target event error
2015-11-04 17:43:51 -06:00
ColdEvul
03b82e5859
Adjusted interaction nod, changed carrying height for he barrier.
2015-11-01 22:38:55 +01:00
BaerMitUmlaut
8f473b4a27
Removed all assignTeam occurrences
2015-10-30 16:50:13 +01: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
SzwedzikPL
98f6bb3589
Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps
...
Conflicts:
addons/cargo/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/interaction/XEH_preInit.sqf
addons/interaction/stringtable.xml
2015-10-15 11:49:08 +02:00
BaerMitUmlaut
1effe61aa9
Removed parent condition
2015-10-06 19:09:51 +02:00
BaerMitUmlaut
090384c014
Fixed canPassMagazine header
2015-10-06 17:56:32 +02:00
BaerMitUmlaut
d6dcd4112e
Resolved merge conflicts
2015-10-06 17:50:55 +02:00
commy2
bc8cefa5e7
manual merge
2015-09-28 21:06:40 +02:00
commy2
6c968d8bc7
per frame handler for incremental door opening
2015-09-28 20:07:01 +02:00
commy2
443cbf8be3
fix compile error when trying to open a locked door by shortcut
2015-09-28 19:03:37 +02:00
commy2
6f64fcd0fb
search for door in geometry lod (lineintersectssurface)
2015-09-28 18:45:10 +02:00
commy2
5a3a32f236
more interaction cleanup
2015-09-28 18:06:25 +02:00
commy2
9bf7b68d76
fix errors on game start
2015-09-28 17:28:51 +02:00
commy2
5c5a65443b
more interaction cleanup
2015-09-28 17:20:56 +02:00
commy2
f48636e633
more interaction cleanup, remove dead code
2015-09-28 17:11:53 +02:00
commy2
9189148b3f
more interaction cleanup
2015-09-28 15:37:18 +02:00
commy2
4b536425b1
Code Cleanup Interaction
2015-09-28 14:36:51 +02:00
commy2
2fe142032e
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
2015-09-26 03:16:55 +02:00
KoffeinFlummi
067b08611e
Fix missing newlines
2015-09-17 12:54:26 +02:00
gienkov
e2f9b31fb2
small fix + repair translation
2015-09-16 11:53:05 +02:00
Glowbal
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
Alessandro Foresi
89eb98a248
Added: IT more translation, medic partial
...
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
BaerMitUmlaut
8ee1136758
Rewrite canPassMagazine condition
2015-09-11 23:52:00 +02:00
BaerMitUmlaut
ccf1bf1de7
Cleaned up canPassMagazine condition
2015-09-11 18:24:46 +02:00
BaerMitUmlaut
a29902ddb3
More use of params, event system, removed compile
2015-09-11 15:36:23 +02:00
BaerMitUmlaut
45bfa3eaf5
Fixed vanishing mags and localized hint
2015-09-10 22:23:37 +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
BaerMitUmlaut
c26107bc5c
Added ability to pass a magazine
2015-09-08 14:07:16 +02: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
Michael Braun
035b3432c5
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
commy2
e7d9e8c0dc
Merge pull request #2312 from acemod/322opendoor3rdperson
...
increase reach in 3rd person for opening doors, fix #2301
2015-08-31 21:32:34 +02:00
commy2
7a4c37c085
disable all actions on ladders by default, close #2289
2015-08-30 22:03:45 +02:00
commy2
4682235d8a
increase reach in 3rd person for opening doors, fix #2301
2015-08-30 11:13:26 +02:00
KoffeinFlummi
5f63290508
Merge branch 'ptbr'
2015-08-30 00:42:31 +02:00
