VKing
1cf7fc727d
Fix Handgrenade DisplayNameShort
2016-01-22 13:12:20 +01:00
SzwedzikPL
9ee76742c6
Merge branch 'master' of https://github.com/acemod/ACE3
2016-01-22 09:20:47 +01:00
PabstMirror
1a98726716
Add makeLoadable sync module
2016-01-21 22:12:54 -06:00
VKing
999d8ac2ce
Use max
2016-01-22 00:01:13 +01:00
VKing
8482d45d8b
Add FCS to gunner and commander RCWS types for MRAPs, APCs, and arty.
...
Lower max range to 5500m (9990 is too damn high!)
2016-01-21 16:00:55 +01:00
VKing
299baf1e4a
Fix shotbullet checking (lost in merge)
2016-01-21 15:56:53 +01:00
VKing
fedfa94dcd
Clean up
2016-01-21 15:01:41 +01:00
VKing
4406f270e2
Fix infantry rangefinders (again)
2016-01-21 14:44:23 +01:00
esteldunedain
91b7c7de61
Change the varname of the weapon data cache to be consistent with other modules
2016-01-20 22:22:53 -03:00
esteldunedain
41f8628917
Change cache location type to ACE_HashLocation
2016-01-20 22:20:16 -03:00
esteldunedain
f7cfbebc49
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX
2016-01-20 22:19:11 -03:00
VKing
bf5eb78788
Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions
...
# Conflicts:
# addons/fcs/functions/fnc_keyUp.sqf
2016-01-21 02:14:51 +01:00
VKing
b83be88571
Enhance ranging.
...
KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal.
Sorry in advance for the merge conflicts
2016-01-21 02:02:50 +01:00
VKing
7d3044a5c2
Move display update stuff to fnc_getRange
2016-01-21 00:20:21 +01:00
PabstMirror
be8afe507c
Few more privates
2016-01-20 17:19:08 -06:00
PabstMirror
3dac426bc6
Merge pull request #3132 from acemod/interactionMenuCleanup
...
Cleanup Interaction Menu
2016-01-20 17:04:10 -06:00
PabstMirror
abb01e0653
Merge pull request #3129 from acemod/frag-cacheIfWillFrag
...
Frag - only run addPfhRound on ammo that will frag (for master)
2016-01-20 17:03:55 -06:00
VKing
43ab126c1f
Add FCS to botes RCWS
2016-01-20 23:06:06 +01:00
VKing
5f14d17f98
Another fix for BIS' inconsistent implementations
2016-01-20 22:30:22 +01:00
Thomas Kooi
232fe62d8d
Merge pull request #3195 from acemod/fix3194
...
Fix typo in ACE_hearing config
2016-01-20 22:26:13 +01:00
esteldunedain
9d13cc6f60
Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments.
2016-01-20 15:19:46 -03:00
esteldunedain
851615a234
Inherit custom gesture classes.
2016-01-20 13:44:51 -03:00
esteldunedain
7860f375c2
Better func description
2016-01-20 13:07:51 -03:00
esteldunedain
89106f6953
Replace addPerFrameHandler for waitAndExecute
2016-01-20 13:05:47 -03:00
esteldunedain
80b9a8961a
Improve reload animations
2016-01-20 12:48:39 -03:00
PabstMirror
a140f29784
Remove inherited classes that were not used
2016-01-20 09:45:03 -06:00
esteldunedain
bce572e1df
Derp
2016-01-20 12:15:25 -03:00
esteldunedain
19ccf52425
MRBS to mrbs
2016-01-20 12:05:35 -03:00
VKing
43c9444fb8
Didn't need that isNil check, anyway
2016-01-20 15:51:07 +01:00
esteldunedain
1a115e7f9c
Fix #3194
2016-01-20 11:48:12 -03:00
esteldunedain
6b4b8b707c
Prefix new configs for consistency
2016-01-20 11:42:05 -03:00
esteldunedain
2f7cac68a5
Small fixes
2016-01-20 10:59:58 -03:00
VKing
a9511936fd
LayZ evaluation
2016-01-20 12:35:53 +01:00
VKing
05ce4f824c
Rewrite fnc_getRange to work with specified minimum and maximum ranges
...
Also cleaning up fnc_keyUp a bit
2016-01-20 00:10:27 +01:00
VKing
757436140b
fnc_getTargetDistance rewritten to use LineIntersectsSurfaces.
...
Turns out it wasn't really needed after all, but better is better :p
2016-01-20 00:06:06 +01:00
SzwedzikPL
8ca7e24cc3
Merge branch 'master' of https://github.com/acemod/ACE3
2016-01-19 22:40:34 +01:00
PabstMirror
3d4fc66bb1
Cargo Cleanup, Add makeLoadable
2016-01-19 14:51:58 -06:00
esteldunedain
c78f2f8479
Gotcha travis
2016-01-19 17:29:58 -03:00
esteldunedain
5b90fd8b81
Set default particle effect on for the local player, as per current and historic behaviour.
2016-01-19 17:25:14 -03:00
esteldunedain
9bcabd081b
Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off).
2016-01-19 17:24:01 -03:00
VKing
968f7c000b
Simplify
2016-01-19 21:16:41 +01:00
SilentSpike
ca5f6df3d0
Merge pull request #3147 from acemod/spectatorBandAid
...
Restart specatator display if player in unitList
2016-01-19 20:15:24 +00:00
VKing
c8bcf44561
Increase M307 FCS range
2016-01-19 21:08:03 +01:00
esteldunedain
8b7ed38990
Add a PFH to cool down all player weapons at (infrequent) regular intervals
2016-01-19 17:04:51 -03:00
esteldunedain
0313e7b322
Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately
2016-01-19 17:03:47 -03:00
esteldunedain
782934c4b2
Add the setApproximateVariablePublic function to common
2016-01-19 16:58:07 -03:00
VKing
ae576e57e3
Fix the magazine name being broken in later code
2016-01-19 20:21:37 +01:00
esteldunedain
3792acd7f7
Merge branch 'master' into deterministicOverheatingX
2016-01-19 15:57:38 -03:00
VKing
59923710b7
Fix FCS not taking weapon initSpeed into account in some circumstances
2016-01-19 19:52:18 +01:00
VKing
838945c1db
Add FCS for the M307 GMG
2016-01-19 18:53:42 +01:00