commy2
297c367fa5
Merge pull request #3729 from acemod/addCargoToPods
...
Add cargo to Taru pods
2016-04-28 07:48:11 +02:00
PabstMirror
d826c91c99
Cleanup reload launchers
2016-04-28 00:43:33 -05:00
jonpas
3389bc5e1b
Add cargo to Taru pods
2016-04-28 04:44:57 +02:00
Glowbal
a90f48efb9
Merge pull request #3723 from acemod/syncErrorLog
...
Improve synced event error logging
2016-04-25 23:40:56 +02:00
PabstMirror
d40735d5c2
Improve synced event error logging
2016-04-25 15:48:24 -05:00
commy2
5c3f5f5751
fix wrong macro names
2016-04-25 21:34:25 +02:00
PabstMirror
27c5598135
vehicle inventory lock - compatibility with acre
2016-04-24 11:26:13 -05:00
commy2
93450b9e38
Merge pull request #1857 from jonpas/uiSettings
...
Selective UI Elements
2016-04-23 19:15:26 +02:00
jonpas
b06659a2e4
Fix params error
2016-04-23 00:29:58 +02:00
jonpas
dbe4c6ae26
Merge branch 'master' into uiSettings
2016-04-23 00:17:16 +02:00
PabstMirror
efc956eb99
Merge pull request #3692 from acemod/unloadOnSlopes
...
Better handle unloading on slopes
2016-04-22 10:40:16 -05:00
PabstMirror
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
PabstMirror
71ff7e9d8a
Merge pull request #3682 from acemod/javelinCursorTargetFix
...
Javelin - Verify player has LOS to cursorTarget
2016-04-21 19:50:23 -05:00
PabstMirror
72aa0fffea
Merge pull request #3713 from acemod/gesturesFixBIS
...
Fix BIS gesture keybinds
2016-04-21 19:48:26 -05:00
PabstMirror
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
PabstMirror
8fba7a8286
Merge pull request #3714 from acemod/exploScope
...
Make explosives helpers hidden in eden.
2016-04-21 16:35:18 -05:00
PabstMirror
9bd66bc40f
Cleanup scopeCurator
2016-04-21 15:07:13 -05:00
PabstMirror
c432ce714e
Make explosives helpers hidden in eden.
2016-04-21 13:56:32 -05:00
PabstMirror
097bba9b68
Spaces
2016-04-21 13:21:55 -05:00
PabstMirror
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
Glowbal
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
PabstMirror
c2126c3bd4
Simplify binocular check
2016-04-20 10:48:25 -05:00
PabstMirror
cf9479efab
Non-hardcoded binocular / vector detection
2016-04-20 10:40:00 -05:00
PabstMirror
3adbb59f04
Geforce - Change default to aircraft only
2016-04-19 23:04:51 -05:00
PabstMirror
236ad912af
Gforces - Add ace_setting to only run in aircraft
2016-04-19 12:59:41 -05:00
Glowbal
db5d1d42b7
Merge pull request #3703 from acemod/fix-redundant-privates
...
Fixed redundant privates in setCardiacArrest
2016-04-18 15:39:35 +02:00
BaerMitUmlaut
65ccf66d00
Fixed redundant privates in setCardiacArrest
2016-04-18 15:23:04 +02:00
PabstMirror
23632281cf
Add day (non night vision) version of the vector 21
2016-04-17 23:22:41 -05:00
jonpas
0762e13816
Merge pull request #3655 from acemod/improveCargoXEH
...
Improve cargo initialization XEH
2016-04-17 11:29:09 +00:00
jonpas
10cadb535f
Merge pull request #3631 from acemod/customTaggingTextureSupport
...
Add support for custom textures in tagging
2016-04-17 11:28:14 +00:00
PabstMirror
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
Glowbal
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
PabstMirror
32cd23076f
Merge pull request #3690 from acemod/engineRepairMsg
...
Clarify repair while engine is running
2016-04-15 15:56:52 -05:00
PabstMirror
de6848d516
Merge pull request #3694 from acemod/excludeFriesRepairAction
...
Exclude FRIES from repair interactions
2016-04-14 20:17:15 -05:00
jonpas
d90fc3dd06
Fix variable name and header examples
2016-04-14 18:58:01 +02:00
PabstMirror
d523ef1fcd
Try to use cursorObject first
2016-04-14 10:57:36 -05:00
jonpas
839d067797
Exclude base FRIES class
2016-04-14 17:38:11 +02:00
jonpas
300d069e78
Exclude FRIES from repair interactions
2016-04-14 13:59:31 +02:00
jonpas
04831267f2
Use lazy evaluation
2016-04-14 13:55:15 +02:00
jonpas
dec266a546
Fix ship view distance using foot instead of vehicle setting, Cleanup view distance component
2016-04-14 13:52:20 +02:00
Glowbal
5165db73e8
Merge pull request #3688 from acemod/fixLoadingIntoFries
...
LoadPerson - Only try vehicles that have room
2016-04-14 08:25:03 +02:00
PabstMirror
3360047204
Better handle unloading on slopes
...
Close #3667
2016-04-13 13:05:32 -05:00
PabstMirror
f16a65f381
Fix default
2016-04-12 20:05:56 -05:00
PabstMirror
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
PabstMirror
d7b0bde1ca
Fix Wildcat attach point
2016-04-12 12:28:48 -05:00
PabstMirror
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
Nicolás Badano
fa2b6dac2d
Merge pull request #3680 from acemod/wipeAnim
...
Googles - Only play wipe anim for primary weapon
2016-04-12 10:59:13 -03:00
PabstMirror
3744b980f4
Javelin - Verify player has LOS to cursorTarget
...
Fix #3668
2016-04-12 02:14:06 -05:00
PabstMirror
2869a53e6d
Googles - Only play wipe anim for primary weapon
...
Close #3638
Animation only makes sense for primary weapon, so skip for others.
2016-04-12 00:19:24 -05:00
Nicolás Badano
d57d6af898
Merge pull request #3678 from Jsmuk/weapon-jam-event
...
Raise a local event when a weapon is jammed
2016-04-11 19:25:32 -03:00
