commy2
fa3913752b
replace XEH_ENABLED macro with actual class, fix #3482 , fix #3483
2016-03-01 17:05:00 +01:00
Thomas Kooi
27c6934ff2
Merge pull request #2230 from SzwedzikPL/interactions_lamps
...
Interaction with portable lamps
2016-02-20 16:47:28 +01:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01: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
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
7b8be590b4
Merge branch 'acemod/master' into interactions_lamps
2016-02-05 01:43:06 +01: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
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
d410fe42d9
Fixed misspell
...
'_targe' is suppose to be '_target'
2015-12-28 22:00:08 -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
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
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
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
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
ColdEvul
03b82e5859
Adjusted interaction nod, changed carrying height for he barrier.
2015-11-01 22:38:55 +01:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -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
d6dcd4112e
Resolved merge conflicts
2015-10-06 17:50:55 +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
4b536425b1
Code Cleanup Interaction
2015-09-28 14:36:51 +02:00
BaerMitUmlaut
45bfa3eaf5
Fixed vanishing mags and localized hint
2015-09-10 22:23:37 +02:00
BaerMitUmlaut
c26107bc5c
Added ability to pass a magazine
2015-09-08 14:07:16 +02:00
commy2
7a4c37c085
disable all actions on ladders by default, close #2289
2015-08-30 22:03:45 +02:00
ViperMaul
d38cb31240
Merge pull request #2109 from acemod/pushSubmaine
...
Push SDV sub, cleanup push
2015-08-26 21:03:46 -07:00
SzwedzikPL
384c4bc55e
config macro, script tweaks
2015-08-24 16:48:53 +02:00
SzwedzikPL
3e19b33493
interaction with portable lamps
2015-08-22 20:00:26 +02:00
PabstMirror
4cce799ace
#2045 - Push SDV sub, cleanup push
2015-08-10 22:08:13 -05:00
PabstMirror
0e17bebd23
Merge branch 'master' into repair
2015-08-09 00:33:08 -05:00
PabstMirror
451c88c601
Merge pull request #2027 from acemod/joinGroupTeamManagement
...
EnableTeamManagement setting for joinGroup
2015-08-08 11:16:20 -05:00
jonpas
1aecd54fc3
Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common
2015-08-08 18:02:20 +02:00
PabstMirror
0bd1e1afce
#2024 - EnableTeamManagement setting for joinGroup
2015-08-05 18:02:57 -05:00
Glowbal
1ad2a5cdf1
Merge branch 'master' into repair
...
Conflicts:
addons/interaction/CfgVehicles.hpp
2015-07-03 22:29:29 +02:00
Nicolás Badano
10ef88b655
Merge pull request #1596 from SzwedzikPL/interaction_box_inventory
...
Open action for boxes
2015-07-01 12:59:24 -03:00
jonpas
29ce8f635e
Merge branch 'master' into sitting
...
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
SzwedzikPL
805c0e1c68
Open action for boxes
2015-06-12 19:48:28 +02:00
jonpas
332afb2174
Allow certain self-interactions while sitting
2015-06-09 16:17:05 +02:00
PabstMirror
abf2887826
Manual MainActions position for some statics weapons
2015-06-07 00:25:52 -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
