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
fa2b6dac2d
Merge pull request #3680 from acemod/wipeAnim
...
Googles - Only play wipe anim for primary weapon
2016-04-12 10:59:13 -03:00
3744b980f4
Javelin - Verify player has LOS to cursorTarget
...
Fix #3668
2016-04-12 02:14:06 -05:00
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
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
153cd28f94
Change event name to weaponJammed
2016-04-11 23:09:45 +01:00
121c45eb84
Raise a local event when a weapon is jammed
2016-04-11 22:29:33 +01:00
8072c9db41
Merge pull request #3652 from acemod/setupAlwaysUseJunctions
...
Always use junctions for dev environment setup
2016-04-10 21:57:16 +00:00
ccaec31a90
Use new QFUNC and QEFUNC macros
2016-04-08 20:43:26 +02:00
014421e8ed
Remove redundant quoted function macro defines
2016-04-08 20:41:54 +02:00
0c124a2af0
Remove redundant macro define
2016-04-08 20:35:50 +02:00
85b4366368
Use new QPATHTOF and QPATHTOEF macros
2016-04-08 20:34:50 +02:00
2f6b932511
Merge branch 'master' into c4996
2016-04-08 07:33:21 -05:00
f6567841a2
Merge pull request #3665 from acemod/add-config-style-validation
...
Add config style validation
2016-04-07 20:01:11 +02:00
f409ce8248
Add config style validation
2016-04-07 19:55:10 +02:00
a8c0840cd1
Merge pull request #3658 from acemod/fixPlayerChangedEvent
...
Wait until postInit to install playerChanged event
2016-04-04 07:56:13 +02:00
f8b46e859c
Wait until postInit to install playerChanged event
2016-04-03 23:36:38 -05:00
d931eb4e15
Improve XEH adding in cargo
2016-04-03 14:17:16 +02:00
357045a0ed
Merge pull request #3518 from ColdEvul/CargoAndInteractionCase
...
Carry, drag and load metal and plastic cases
2016-04-03 11:43:11 +00:00
3abb3d321c
Merge branch 'master' into customTaggingTextureSupport
2016-04-03 13:41:26 +02:00
f4074e981a
Merge pull request #3529 from acemod/tagEvents
...
Throw a globalEvent when a tag is created.
2016-04-03 11:38:24 +00:00
2a7e0b2a48
Remove redundant directory symlink directive
2016-04-03 13:23:20 +02:00