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
James McCartney
153cd28f94
Change event name to weaponJammed
2016-04-11 23:09:45 +01:00
James McCartney
121c45eb84
Raise a local event when a weapon is jammed
2016-04-11 22:29:33 +01:00
jonpas
8072c9db41
Merge pull request #3652 from acemod/setupAlwaysUseJunctions
...
Always use junctions for dev environment setup
2016-04-10 21:57:16 +00:00
jonpas
ccaec31a90
Use new QFUNC and QEFUNC macros
2016-04-08 20:43:26 +02:00
jonpas
014421e8ed
Remove redundant quoted function macro defines
2016-04-08 20:41:54 +02:00
jonpas
0c124a2af0
Remove redundant macro define
2016-04-08 20:35:50 +02:00
jonpas
85b4366368
Use new QPATHTOF and QPATHTOEF macros
2016-04-08 20:34:50 +02:00
looter
2f6b932511
Merge branch 'master' into c4996
2016-04-08 07:33:21 -05:00
Thomas Kooi
f6567841a2
Merge pull request #3665 from acemod/add-config-style-validation
...
Add config style validation
2016-04-07 20:01:11 +02:00
Glowbal
f409ce8248
Add config style validation
2016-04-07 19:55:10 +02:00
commy2
a8c0840cd1
Merge pull request #3658 from acemod/fixPlayerChangedEvent
...
Wait until postInit to install playerChanged event
2016-04-04 07:56:13 +02:00
PabstMirror
f8b46e859c
Wait until postInit to install playerChanged event
2016-04-03 23:36:38 -05:00
jonpas
d931eb4e15
Improve XEH adding in cargo
2016-04-03 14:17:16 +02:00
jonpas
357045a0ed
Merge pull request #3518 from ColdEvul/CargoAndInteractionCase
...
Carry, drag and load metal and plastic cases
2016-04-03 11:43:11 +00:00
jonpas
3abb3d321c
Merge branch 'master' into customTaggingTextureSupport
2016-04-03 13:41:26 +02:00
jonpas
f4074e981a
Merge pull request #3529 from acemod/tagEvents
...
Throw a globalEvent when a tag is created.
2016-04-03 11:38:24 +00:00
jonpas
2a7e0b2a48
Remove redundant directory symlink directive
2016-04-03 13:23:20 +02:00
jonpas
a9fd7c4d6f
Always use junctions for dev environment setup
2016-04-03 02:27:23 +02:00
Nicolás Badano
8eb7d28e29
Merge pull request #3651 from acemod/addMapAltitudeToGPS
...
Add map altitude to GPS
2016-04-02 10:13:02 -07:00
jonpas
caf06f58c8
Add map altitude to GPS - fix #3650
2016-04-02 18:53:34 +02:00
nomisum
5c87161118
fixed logic problem
2016-04-02 15:53:39 +02:00
nomisum
02e3e1c7ec
Merge remote-tracking branch 'refs/remotes/acemod/master'
2016-04-02 15:39:44 +02:00
nomisum
fed4662884
changed suggested lines to ace standards
2016-04-02 15:36:21 +02:00
Nicolás Badano
ec2c331bd9
Merge pull request #3644 from J3aLeiNe/master
...
fnc_getMGRSdata update1
2016-04-02 09:23:29 -03:00
commy2
a7cf010f7a
Merge pull request #3648 from acemod/fixtagging_master
...
fix script error in tagging
2016-04-02 10:12:38 +02:00
J3aLeiNe
4576ea0194
abbottabad altitude fix
...
altitude 0 for altitude 1256
2016-04-02 09:50:50 +02:00
PabstMirror
84c5a0d266
FCS - Minor firedEH optimization
2016-04-01 21:51:22 -05:00
jonpas
31953c5d52
Merge pull request #3635 from acemod/fixInvertedGestureStopFreeze
...
Fix inverted gestures Stop and Freeze and minor gestures cleanup
2016-04-01 19:30:48 +00:00
jonpas
723d27fc99
Rename tagging action classes
2016-04-01 21:29:03 +02:00
jonpas
fbaae2beb3
Fix stringtable casing
2016-04-01 21:25:00 +02:00
jonpas
9f7f176b1f
Merge branch 'master' into customTaggingTextureSupport
2016-04-01 21:24:31 +02:00
J3aLeiNe
d4a7d864aa
fnc_getMGRSdata update1
2016-04-01 11:53:33 +02:00
J3aLeiNe
093da2badf
Merge branch 'master' into master
2016-03-31 22:22:50 +02:00
PabstMirror
e104b0ac55
Merge pull request #3640 from acemod/fixZeusAutoAdd
...
Delay calling addCuratorEditableObjects for a frame
2016-03-31 10:04:44 -05:00
J3aLeiNe
c998ab622e
fnc_getMGRSdata update1
...
fnc_getMGRSdata update1
2016-03-31 14:41:09 +02:00
bux578
076803951d
Merge pull request #3628 from alef/translation/15bn/alef
...
Italian translation
2016-03-31 06:54:31 +02:00
commy2
35cb4cb0f5
Merge pull request #3643 from acemod/helicargosizes
...
specify helicopter cargo spaces
2016-03-31 01:11:24 +02:00
commy2
92af6ffe2e
add cargo space to csat attack heli (can transport 8 troops)
2016-03-31 01:03:40 +02:00
commy2
28468bec82
specify helicopter cargo spaces, fix #3591
2016-03-31 00:57:04 +02:00
commy2
1b0794d6b4
Merge pull request #3641 from acemod/improveCodeToString
...
improve Code to String
2016-03-31 00:07:42 +02:00
