Commit Graph

344 Commits

Author SHA1 Message Date
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
be8f7f9cc0 Merge pull request #3276 from acemod/156selectapply
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
be742c13cd Merge branch 'master' into 155selectRandom 2016-02-17 15:58:19 -06:00
53d870b62a Merge pull request #3312 from acemod/passengerInteraction
Only get passenger actions for selected unit
2016-02-17 15:33:29 -06:00
4a8b032c1f Don't allow passing mags when not in same veh 2016-02-14 14:53:04 -06:00
54b350a6c0 Only get passenger actions for selected unit
Fix #1690 #3309
2016-02-12 15:57:16 -06:00
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
41e39c9c3a replace more filter with select 2016-02-06 11:58:31 +01:00
e3e9d19ca1 Fix "key" capitalization for Interaction_GetOut 2016-02-05 16:49:36 -06:00
f47b51c0cb Merge pull request #3070 from dixon13/newCivInteraction
Changes to civilian interaction
2016-02-05 09:14:45 +01:00
a0e6f97125 Updated condition for ACE_GetOut 2016-02-05 00:32:56 -07:00
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
3854a5c989 Merge pull request #3109 from acemod/ThingX
fix ThingX capitalization, fix #3076
2016-01-05 21:52:42 +01:00
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
8bdd5d0597 Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge 2015-12-31 14:30:29 -06:00
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
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
f2b3275538 Changed action name
Changed extraction action to 'Get Out' to match other civilian actions.
2015-12-29 09:25:33 -07:00
d410fe42d9 Fixed misspell
'_targe' is suppose to be '_target'
2015-12-28 22:00:08 -07:00
a4781a20d3 Authors 2015-12-23 19:27:55 -07:00
2a98aa57ed Delete fnc_canInteractWithCivilianVehicle.sqf
No need to create another funciton
2015-12-23 11:54:41 -07:00
d3a1110250 Removed a portion of the condition 2015-12-23 11:52:23 -07:00
5f7e833d43 Removed "PREP(canInteractWithCivilianVehicle)"
Function is being removed
2015-12-23 11:51:19 -07:00
21daa331dc Changes to ACE_Unload
- added semi-colon
- changed the condition
- changed the statement
2015-12-23 11:49:17 -07:00
1aa192f7e0 Extract civilans from vehicles, rmeoved actions from civilians in vehicles 2015-12-23 00:19:41 -07:00
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
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
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
ff4406e411 manual merge, more selectRandom command useage 2015-11-29 16:48:23 +01:00
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
35ecef454f Merge pull request #2825 from gienkov/pl-translation
pl translation
2015-11-29 07:35:04 +01:00
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
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
4aeeefdfe8 Fix UBC and increase Heli_04 Pod interaction distance 2015-11-26 11:47:25 -06:00
15267c0433 Merge pull request #2219 from acemod/handSignals
Hand signals enhancement
2015-11-26 16:04:41 +01:00
0b9044e3c7 Merge pull request #2753 from acemod/showHudSetter
Showhud setter
2015-11-25 11:16:21 -06:00
185cae2fe5 Remove Old Gestures from interaction 2015-11-25 11:00:45 -06:00
08c5374a99 Merge pull request #2390 from BaerMitUmlaut/pass-magazine
Added interaction to quickly pass a magazine
2015-11-25 14:04:07 +01:00
36bf2d9cb5 Merge pull request #2803 from BaerMitUmlaut/remove-team-synching
Remove manual team synching
2015-11-24 21:37:50 -06:00
818466d296 Added ACE setting to hide interaction 2015-11-24 19:07:17 +01:00
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
c4117e1283 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
0110ada1b5 Fix zeus waypoint formation actions 2015-11-18 14:54:17 +00:00
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
38105136fa #2820 - Fix target event error 2015-11-04 17:43:51 -06:00