Commit Graph

9542 Commits

Author SHA1 Message Date
a0770c7707 Moved and expanded in-vehicle interactions to cockpit_interactions 2016-04-29 17:22:04 +02:00
437f85a3b3 Removed in-vehicle interactions from interactions addon 2016-04-29 15:04:18 +02:00
380ae9fdc8 More exp stuff 2016-04-29 15:04:18 +02:00
4edadd1b48 Fix typo 2016-04-29 15:04:18 +02:00
1e47d51538 Experimental vehicle spatial actions. Cockpit action for the littlebird. 2016-04-29 15:04:18 +02:00
ab09e0989b Merge pull request #3722 from acemod/fixmacro
fix wrong macro names
2016-04-28 07:48:25 +02:00
297c367fa5 Merge pull request #3729 from acemod/addCargoToPods
Add cargo to Taru pods
2016-04-28 07:48:11 +02:00
3389bc5e1b Add cargo to Taru pods 2016-04-28 04:44:57 +02:00
a90f48efb9 Merge pull request #3723 from acemod/syncErrorLog
Improve synced event error logging
2016-04-25 23:40:56 +02:00
d40735d5c2 Improve synced event error logging 2016-04-25 15:48:24 -05:00
5c3f5f5751 fix wrong macro names 2016-04-25 21:34:25 +02:00
93450b9e38 Merge pull request #1857 from jonpas/uiSettings
Selective UI Elements
2016-04-23 19:15:26 +02:00
b06659a2e4 Fix params error 2016-04-23 00:29:58 +02:00
dbe4c6ae26 Merge branch 'master' into uiSettings 2016-04-23 00:17:16 +02:00
efc956eb99 Merge pull request #3692 from acemod/unloadOnSlopes
Better handle unloading on slopes
2016-04-22 10:40:16 -05:00
7366133629 Merge pull request #3699 from acemod/cWireFixes
Concertina Wire - Don't recoil broken wire, fix killer
2016-04-22 10:40:04 -05:00
71ff7e9d8a Merge pull request #3682 from acemod/javelinCursorTargetFix
Javelin - Verify player has LOS to cursorTarget
2016-04-21 19:50:23 -05:00
72aa0fffea Merge pull request #3713 from acemod/gesturesFixBIS
Fix BIS gesture keybinds
2016-04-21 19:48:26 -05:00
d7e3f51ec2 Merge pull request #3705 from acemod/gforceSetting
Gforces - Add ace_setting to only run in aircraft
2016-04-21 19:47:29 -05:00
8fba7a8286 Merge pull request #3714 from acemod/exploScope
Make explosives helpers hidden in eden.
2016-04-21 16:35:18 -05:00
9bd66bc40f Cleanup scopeCurator 2016-04-21 15:07:13 -05:00
c432ce714e Make explosives helpers hidden in eden. 2016-04-21 13:56:32 -05:00
097bba9b68 Spaces 2016-04-21 13:21:55 -05:00
4214e31678 Fix BIS gesture keybinds
- From #3635 - FUNC(playSignal) needs "BIgesture" prefix
- Interaction conditions are checked on parent, don't need on every
child
2016-04-21 13:15:35 -05:00
392012bb4b Merge pull request #3702 from acemod/dayVector
Add day (non night vision) version of the vector 21
2016-04-20 18:01:59 +02:00
c2126c3bd4 Simplify binocular check 2016-04-20 10:48:25 -05:00
cf9479efab Non-hardcoded binocular / vector detection 2016-04-20 10:40:00 -05:00
3adbb59f04 Geforce - Change default to aircraft only 2016-04-19 23:04:51 -05:00
236ad912af Gforces - Add ace_setting to only run in aircraft 2016-04-19 12:59:41 -05:00
db5d1d42b7 Merge pull request #3703 from acemod/fix-redundant-privates
Fixed redundant privates in setCardiacArrest
2016-04-18 15:39:35 +02:00
65ccf66d00 Fixed redundant privates in setCardiacArrest 2016-04-18 15:23:04 +02:00
23632281cf Add day (non night vision) version of the vector 21 2016-04-17 23:22:41 -05:00
0762e13816 Merge pull request #3655 from acemod/improveCargoXEH
Improve cargo initialization XEH
2016-04-17 11:29:09 +00:00
10cadb535f Merge pull request #3631 from acemod/customTaggingTextureSupport
Add support for custom textures in tagging
2016-04-17 11:28:14 +00:00
7bd2378c41 Concertina Wire - Don't recoil broken wire, fix killer
Close #3695
- Don't recoil broken wire
- Use midpoint to search for nearby cars, and ensure the veh was moving.
2016-04-16 12:54:33 -05:00
f8fb75247d Merge pull request #3693 from acemod/fixShipViewDistance
Fix ship view distance using foot instead of vehicle setting
2016-04-16 12:45:58 +02:00
32cd23076f Merge pull request #3690 from acemod/engineRepairMsg
Clarify repair while engine is running
2016-04-15 15:56:52 -05:00
de6848d516 Merge pull request #3694 from acemod/excludeFriesRepairAction
Exclude FRIES from repair interactions
2016-04-14 20:17:15 -05:00
d90fc3dd06 Fix variable name and header examples 2016-04-14 18:58:01 +02:00
d523ef1fcd Try to use cursorObject first 2016-04-14 10:57:36 -05:00
839d067797 Exclude base FRIES class 2016-04-14 17:38:11 +02:00
300d069e78 Exclude FRIES from repair interactions 2016-04-14 13:59:31 +02:00
04831267f2 Use lazy evaluation 2016-04-14 13:55:15 +02:00
dec266a546 Fix ship view distance using foot instead of vehicle setting, Cleanup view distance component 2016-04-14 13:52:20 +02:00
5165db73e8 Merge pull request #3688 from acemod/fixLoadingIntoFries
LoadPerson - Only try vehicles that have room
2016-04-14 08:25:03 +02:00
3360047204 Better handle unloading on slopes
Close #3667
2016-04-13 13:05:32 -05:00
f16a65f381 Fix default 2016-04-12 20:05:56 -05:00
4f6b11c2a6 Clarify repair while engine is running
#3348
- Show action, but exit and show warning when selected
- Optional (default off) setting to auto shut off engine to keep
compatibility with missions
2016-04-12 20:04:12 -05:00
d7b0bde1ca Fix Wildcat attach point 2016-04-12 12:28:48 -05:00
5d70db3d9b LoadPerson - Only try vehicles that have room
Fix #2965
The FRIES is a "Helicopter" so we were trying to load into it, because
it was closest.
Also disable Cargo system on it so we don't load other things into it
And remove all interactions on it as well.
2016-04-12 12:12:49 -05:00