commy2
55f49eaa1c
fix shitty initSpeed definitions breaking SD mags, fix #182
2015-03-08 19:51:52 +01:00
Nicolás Badano
1b81a23da2
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-07 18:04:28 -03:00
Nicolás Badano
26b7c13631
Let me fix that
2015-03-07 18:03:55 -03:00
PabstMirror
81a944457b
Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding
...
Key Bind Redo (switch to new CBA 150306)
2015-03-07 14:09:52 -06:00
PabstMirror
7ed682a849
Fix Parachutes
2015-03-07 13:48:39 -06:00
Felix Wiegand
8f9ced3f8e
Merge pull request #154 from KoffeinFlummi/fcs-improvements
...
Refine bullet tracing in FCS extension
2015-03-07 19:31:33 +01:00
Nicolás Badano
8962ee5d51
Fix the FCS reset action
2015-03-07 14:56:20 -03:00
Nicolás Badano
bcf533292a
Remove weapon initVelocities for guns with FCS
2015-03-07 14:12:00 -03:00
PabstMirror
3940ba9a62
opps
2015-03-07 10:58:34 -06:00
PabstMirror
e191105200
Merge Changes
2015-03-07 10:36:01 -06:00
PabstMirror
3690f1a733
Pull reload changes from master
2015-03-07 10:32:31 -06:00
Nicolás Badano
e42851dd8b
Merge branch 'master' into fcs-improvements
2015-03-07 13:08:48 -03:00
Nicolás Badano
31a50ee7aa
Merge pull request #158 from KoffeinFlummi/linkBelt
...
Link belt
2015-03-07 13:00:26 -03:00
KoffeinFlummi
a45486cfc8
Remove superfluous todos
2015-03-06 07:36:13 +01:00
KoffeinFlummi
8b11759fe4
Fix faulty interaction config
2015-03-06 07:32:23 +01:00
Nicolás Badano
9010f7a926
Change main action point for static weapons to the gunnerview selection
2015-03-06 01:35:12 -03:00
Nicolás Badano
5d68969b63
Added action for checking ammo on others MG's belts and on Static Weapons
2015-03-06 01:34:38 -03:00
Nicolás Badano
7b4487e8fc
Split checkammo function
2015-03-06 01:32:47 -03:00
Nicolás Badano
342b3c3a4c
Make reload require ace_interaction
2015-03-06 01:30:51 -03:00
Nicolás Badano
5b4fa6b503
Remove debug stuff
2015-03-05 22:52:37 -03:00
Nicolás Badano
c8f320d501
Fix action hierarchy
2015-03-05 22:52:29 -03:00
Nicolás Badano
6b43c7bc20
Merge branch 'master' into linkBelt
...
Conflicts:
addons/common/XEH_preInit.sqf
addons/interact_menu/functions/fnc_renderMenu.sqf
2015-03-05 22:48:31 -03:00
PabstMirror
4018742f26
Return False on keyUp Code
2015-03-05 02:51:24 -06:00
PabstMirror
5d21cd6cc7
Fix Vector/FCS debounce
2015-03-05 02:46:24 -06:00
PabstMirror
e18cbbfaad
Vector Keys
2015-03-05 02:00:56 -06:00
PabstMirror
0919e59719
Key Bind Redo (except vector)
2015-03-05 01:32:26 -06:00
Glowbal
a11d6b2dff
Merge pull request #169 from KoffeinFlummi/Medical_Medication
...
Medical: Advanced medication improvements
2015-03-04 13:16:22 +01:00
PabstMirror
ebf42bb35c
Merge pull request #165 from KoffeinFlummi/arma140inhertiaceFix
...
Arma140inhertiace fix
2015-03-03 21:07:58 -06:00
PabstMirror
9d4a0be0db
FCS - FCSMags could be undefined, and cause probs
...
Shooting the B_apc_tracked_01_rcws_F, veh variables aren't defined and
cause problems downstream.
14:40:58 Error in expression <ir select 1) * _r,
_l
];
_vel = _vdir
vectorMultiply _adjustSpeed + vectorMagn>
14:40:58 Error position: <vectorMultiply _adjustSpeed + vectorMagn>
14:40:58 Error Type Number,Not a Number, expected Number
14:40:58 File
z\ace\addons\common\functions\fnc_changeProjectileDirection.sqf, line 42
2015-03-03 15:09:38 -06:00
Glowbal
c5a27d3cd7
Support for unlimited dosages
2015-03-03 20:16:04 +01:00
Glowbal
7f2d41b1a8
Added onOverDose callback. Allows for medication specific side effects.
2015-03-03 20:12:57 +01:00
Glowbal
7750f2d1b2
Added support for callbacks with heart rate changes through medication
2015-03-03 20:07:09 +01:00
Glowbal
83cdef770a
Can no longer go below zero
2015-03-03 19:58:58 +01:00
Glowbal
8f76832177
Added pain killer medication class draft
2015-03-03 19:57:52 +01:00
Glowbal
f8421b2589
Added support for viscosity adjustment from medication
2015-03-03 19:56:32 +01:00
Nicolás Badano
39be8ffbe7
Merge pull request #166 from KoffeinFlummi/ace_interactionCleanup
...
ACE_Interaction cleanup and improvements to ACE_Interact_Menu
2015-03-03 01:53:33 -03:00
Nicolás Badano
27808847db
- Solve a number of ASL vs ATL issues
...
- Replace the way of calculating 3D positions for subactions
2015-03-03 01:37:17 -03:00
Nicolás Badano
12c0a77f86
Add functions to common for converting between "position" and ASL
2015-03-03 01:37:00 -03:00
Nicolás Badano
1c25baa404
Base interaction distance in distance to head instead of distance to camera. Works much better on third person view
2015-03-03 00:34:34 -03:00
Nicolás Badano
b675d9d180
Compensate for movement during the frame to get rid of jittering
2015-03-03 00:16:38 -03:00
Nicolás Badano
8fd13f3fe5
Activate bandaging conditions
2015-03-03 00:04:15 -03:00
Nicolás Badano
cd00eda8c0
Fix interactions with civilians
2015-03-02 23:30:11 -03:00
Nicolás Badano
83572921ae
- Modification of actions data structure to separate action parameters from children
...
- The action tree of each interaction point is parsed before drawing, pruning inactive actions
- Parent actions without statements or active children are not drawn, in order to reduce clutter
2015-03-02 23:29:57 -03:00
Nicolás Badano
094be22a19
Move collect children on a sepparate function
2015-03-02 17:53:30 -03:00
Nicolás Badano
472e2c5bff
Reduce opacity of base actions
2015-03-01 20:14:27 -03:00
Nicolás Badano
716eb72d16
Prevent ace_vehiclelock from overwritting mainaction distance
2015-03-01 19:35:18 -03:00
Nicolás Badano
71477f820a
Add displayName to vehicle main actions. Increase range to 10m
2015-03-01 18:47:49 -03:00
Nicolás Badano
a824c1266a
Create an interaction point for the current weapon
2015-03-01 18:29:54 -03:00
Nicolás Badano
8b761e3528
Bandage actions moved from base to second level
2015-03-01 18:28:05 -03:00
Nicolás Badano
8e0158209c
Merge branch 'master' into ace_interactionCleanup
2015-03-01 17:15:24 -03:00
