Commit Graph

7468 Commits

Author SHA1 Message Date
esteldunedain
b2e9dd0149 Fix _vecy 2016-02-08 17:03:18 -03:00
esteldunedain
73499489e0 Revert "Optimized EFUNC(common,cachedCall)"
This reverts commit b358c4a8af.
2016-02-08 16:45:16 -03:00
esteldunedain
1b912cdca0 Switch back to modelToWorldVisual. Perf is about the same and it moves smoothly with the model. 2016-02-08 16:38:26 -03:00
esteldunedain
b358c4a8af Optimized EFUNC(common,cachedCall) 2016-02-08 16:09:14 -03:00
esteldunedain
62fb26200f Nametags optimization 2016-02-08 15:36:56 -03:00
esteldunedain
94977ffe5c Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nametagsOptimization 2016-02-08 12:52:49 -03:00
SzwedzikPL
94ea26c7b9 typo fix 2016-02-08 00:14:55 +01:00
SzwedzikPL
3bfac35b65 ace repair and medical attributes 2016-02-07 23:56:45 +01:00
Glowbal
e754c89c73 Remove non functional event driven handleDamage 2016-02-07 13:18:19 +01:00
Glowbal
575f362fb6 Add setting for limiting usage of Epinephrine in basic medical #1792
Part of focus feature medical #3134. Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
VKing
f92b798586 Switch to select (is even slightly faster) 2016-02-07 13:09:01 +01:00
VKing
f1cc2ddd51 Change to apply in fcs 2016-02-07 13:08:31 +01:00
Glowbal
bfd90cd5d3 Add Adenosine to replace atropine #1573 2016-02-07 12:54:23 +01:00
Glowbal
39cf11367f improve medical bandage configuration 2016-02-07 12:37:00 +01:00
Glowbal
84878c3d8b Merge branch 'master' into medical-focus-feature 2016-02-07 12:11:25 +01:00
esteldunedain
2b1c312d13 Make explosion reflections optional, default off 2016-02-06 23:46:40 -03:00
esteldunedain
b6058242c8 Fix frag fired EH name 2016-02-06 22:20:08 -03:00
esteldunedain
e4122cf42f Fix winddeflection fire eh 2016-02-06 21:00:42 -03:00
esteldunedain
8fbb6cd72e Fixed event parameters 2016-02-06 20:49:18 -03:00
esteldunedain
a51372a6b3 Add the TRACE_10 macro 2016-02-06 20:28:16 -03:00
esteldunedain
b7d94f5363 Apply the ufeh to ACE_Advanced_Ballistics 2016-02-06 18:48:26 -03:00
esteldunedain
94ef0c5659 Apply the ufeh to ACE_WindDeflection 2016-02-06 18:36:20 -03:00
PabstMirror
1e66cd406b Use location hash for ace events 2016-02-06 15:27:53 -06:00
esteldunedain
25b767a16b Apply the ufeh to ACE_WeaponSelect 2016-02-06 18:27:43 -03:00
esteldunedain
cdfdfffff6 Apply the ufeh to ACE_Scopes 2016-02-06 18:24:48 -03:00
esteldunedain
12d7a171e5 Apply the ufeh to ACE_Recoil 2016-02-06 18:21:43 -03:00
esteldunedain
69dea087ca Apply the ufeh to ACE_Overpressure 2016-02-06 18:17:27 -03:00
esteldunedain
5aa763f0c6 Apply the ufeh to ACE_Overheating 2016-02-06 17:59:54 -03:00
esteldunedain
5b3df2bcf7 Apply the ufeh to ACE_Optics 2016-02-06 17:50:35 -03:00
esteldunedain
33bcd6d9f9 Fix 2016-02-06 17:44:34 -03:00
esteldunedain
45b6b8467d Apply the ufeh to ACE_Nightvision 2016-02-06 17:42:44 -03:00
esteldunedain
7ace1738c0 Apply the ufeh to ACE_HuntIr 2016-02-06 17:29:05 -03:00
esteldunedain
0b9695ce70 Apply the ufeh to ACE_Grenades 2016-02-06 17:20:30 -03:00
esteldunedain
ac3f75c8b4 Apply the ufeh to ACE_Goggles 2016-02-06 17:16:10 -03:00
esteldunedain
b70ae9207c Apply the ufeh to ACE_Frag 2016-02-06 17:12:28 -03:00
esteldunedain
fe66d93275 Added ignore private warnings + trace 2016-02-06 17:07:05 -03:00
esteldunedain
37bc67c951 Create a _vehicle variable 2016-02-06 16:55:36 -03:00
esteldunedain
efbff8cc23 Pass the turret path too 2016-02-06 16:49:53 -03:00
esteldunedain
59cbc6da10 Remove unneeded test in FCS fireEH 2016-02-06 16:49:27 -03:00
esteldunedain
a084373574 Apply the ufeh to ACE_Disposable 2016-02-06 16:39:08 -03:00
esteldunedain
b2bd11ed77 Apply the ufeh to ACE_FCS 2016-02-06 16:29:58 -03:00
esteldunedain
6d9068e306 gunner to lowercase 2016-02-06 16:26:57 -03:00
esteldunedain
72b262f634 Simplified parameter names 2016-02-06 16:22:23 -03:00
esteldunedain
588f76b3f1 Learning to count 2016-02-06 16:12:18 -03:00
esteldunedain
89354e25c8 Unified fired event handler 2016-02-06 16:09:48 -03:00
esteldunedain
698b934801 Increase the volume of the residual woosh when ringing is disabled 2016-02-06 14:49:56 -03:00
esteldunedain
9a8dd3e2ad Fix stringtable 2016-02-06 14:49:28 -03:00
esteldunedain
354ed0cab2 Trace instead of sideChat 2016-02-06 14:11:18 -03:00
esteldunedain
2f1e96ae4f Overhaul ACE_Hearing and change default settings. 2016-02-06 13:59:31 -03:00
commy2
baf979064a remove old ragdoll tweaks 2016-02-06 17:45:47 +01:00
commy2
0a9048815b simlify some select CODE statements 2016-02-06 14:59:31 +01:00
commy2
ac007e6995 replace more map with apply 2016-02-06 12:08:04 +01:00
commy2
41e39c9c3a replace more filter with select 2016-02-06 11:58:31 +01:00
commy2
2ebd2f9046 replace filter and map with select and apply 2016-02-06 11:42:35 +01:00
PabstMirror
d69af47030 Merge branch 'master' of https://github.com/acemod/ACE3 2016-02-05 16:49:39 -06:00
PabstMirror
e3e9d19ca1 Fix "key" capitalization for Interaction_GetOut 2016-02-05 16:49:36 -06:00
commy2
ec4a4ef67f correct capitalization for German translation 2016-02-05 22:21:27 +01:00
commy2
7f6b17cdbc correct name for wheeled apc 01 cannon 2016-02-05 22:19:27 +01:00
commy2
0032e7aa9a Merge pull request #3267 from acemod/removeSwagWalkFix
Remove Swag Walk Fix
2016-02-05 21:59:57 +01:00
PabstMirror
9b3ca2822f Change german stringtable 2016-02-05 14:46:30 -06:00
commy2
f33beb9865 update movement config comments 2016-02-05 21:31:08 +01:00
commy2
d89c93de22 setAllGear - abort function and print warning when used on remote units, 2016-02-05 21:14:20 +01:00
PabstMirror
deac4395c1 Deadman switch - trigger explosives in inventory
Also allow manual triggering of the deadman device
2016-02-05 11:40:11 -06:00
Nicolás Badano
027de27e33 Merge pull request #3268 from acemod/fix3140
Document the locality requirements of fnc_setAllGear.
2016-02-05 10:19:57 -03:00
esteldunedain
dbe7e294a5 Document the locality requirements of fnc_setAllGear. Close #3140 2016-02-05 10:18:36 -03:00
esteldunedain
b2d050afca Close #3188, Close #3260 2016-02-05 09:46:51 -03:00
Nicolás Badano
d26fc4614f Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix
Fix overheating stringtable
2016-02-05 09:35:29 -03:00
Thomas Kooi
0850ab35e3 Merge pull request #3262 from acemod/nozzleFixes
fix some issues with Fuel Nozzle
2016-02-05 09:15:27 +01:00
Thomas Kooi
f47b51c0cb Merge pull request #3070 from dixon13/newCivInteraction
Changes to civilian interaction
2016-02-05 09:14:45 +01:00
dixon13
a0e6f97125 Updated condition for ACE_GetOut 2016-02-05 00:32:56 -07:00
SzwedzikPL
270b557084 fix overheating stringtable 2016-02-05 04:55:05 +01:00
SzwedzikPL
5f0a2b1945 use event system, polish translation 2016-02-05 04:26:54 +01:00
Nicolás Badano
dadec15948 Merge pull request #2104 from acemod/trenches
Trenches
2016-02-04 23:43:06 -03:00
SzwedzikPL
374b015ee4 major cleanup 2016-02-05 03:41:18 +01:00
SzwedzikPL
ab297ff97e more readable macro 2016-02-05 02:03:25 +01:00
SzwedzikPL
a9d57e0d1c fnc_switchLamp cleanup 2016-02-05 02:02:46 +01:00
SzwedzikPL
7b8be590b4 Merge branch 'acemod/master' into interactions_lamps 2016-02-05 01:43:06 +01:00
esteldunedain
b6581cf5ef Fix #3264 2016-02-04 21:00:40 -03:00
esteldunedain
2577992dfc Progress bar localization 2016-02-04 20:43:32 -03:00
esteldunedain
7da6e2a35f Reduce the placement distance 2016-02-04 18:47:30 -03:00
esteldunedain
8c187cbf07 Adjust big trench height 2016-02-04 18:47:17 -03:00
esteldunedain
4cd0028794 Add animation and progresive digging 2016-02-04 18:43:47 -03:00
esteldunedain
3d47156547 Rename some variables 2016-02-04 17:42:12 -03:00
esteldunedain
2d45a28863 Merge branch 'master' into trenches 2016-02-04 17:04:09 -03:00
jokoho48
dc3026366a remove unneeded files
fix hard edge in model
add LOD
2016-02-04 20:52:28 +01:00
Glowbal
8c0472bbeb Merge branch 'master' of github.com:acemod/ACE3 2016-02-04 20:35:15 +01:00
VKing
f652db1d2f Add Loadout box for easy conversion 2016-02-04 20:35:00 +01:00
Glowbal
f1ce133d32 Merge branch 'release'
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
2016-02-04 20:34:32 +01:00
Thomas Kooi
653f6567cc Fix french translation refresh marker interval
As per @alganthe's comment on #3114
2016-02-04 20:30:51 +01:00
Thomas Kooi
543d54d37e Merge pull request #3114 from Luigium/master
Fixed and added French Translation
2016-02-04 20:28:00 +01:00
Glowbal
376b611b89 Merge branch 'master' into Mortar_interact 2016-02-04 20:21:03 +01:00
Thomas Kooi
727cb38be6 Merge pull request #3218 from SzwedzikPL/fix3202
Fix laser_selfdesignate does not measure the distance
2016-02-04 20:17:06 +01:00
PabstMirror
54870f872a Disable Debug 2016-02-04 13:16:41 -06:00
Nicolás Badano
c967bd1ace Merge pull request #3259 from acemod/fix3denGoggles
Fix ACE_goggle changing the tint on the 3den camera
2016-02-04 16:08:02 -03:00
Nicolás Badano
cbafe05f76 Merge pull request #3082 from acemod/deterministicOverheatingX
Deterministic overheating (updated)
2016-02-04 16:03:30 -03:00
Thomas Kooi
dd3613c357 Merge pull request #3190 from acemod/fcs_enableGMG
Add FCS to more things
2016-02-04 20:03:19 +01:00
Thomas Kooi
893040b08a Merge pull request #3102 from buddytex/SandbagEditor
Add Sandbag to editor
2016-02-04 20:00:51 +01:00
Thomas Kooi
f26fb9e9da Merge pull request #3107 from jonpas/headless
Add Dynamic AI Group Tranferring to Headless Clients
2016-02-04 20:00:16 +01:00
Thomas Kooi
a3f80dbc30 Merge pull request #3230 from acemod/draggingStuff
Fix dragging moving object to random location
2016-02-04 19:58:56 +01:00
Thomas Kooi
ce27575de3 Merge pull request #3244 from acemod/fixScopesCapturingKeys
Fix ace_scopes capturing native adjustment keys for the PSO scope.
2016-02-04 19:58:21 +01:00
Thomas Kooi
508f6a16ae Merge pull request #3162 from acemod/Refuel_Fuelbladders
Refuel - Add refuel actions to fuel bladder objects
2016-02-04 19:57:50 +01:00
Thomas Kooi
8c9523e36b Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers
Various explosives enhancements
2016-02-04 19:56:27 +01:00
Thomas Kooi
e0946c3fc5 Merge pull request #3106 from acemod/explEvents
Explosive events, fix #3104
2016-02-04 19:52:10 +01:00
PabstMirror
35333cbe9d Merge branch 'cargoCleanup' 2016-02-04 12:51:52 -06:00
Thomas Kooi
3e5908faf8 Merge pull request #3018 from jonpas/fixFuelHoseExceededAfterDisconnect
Fix refuel PFH not exiting on nozzle disconnect
2016-02-04 19:47:52 +01:00
Thomas Kooi
038befbce0 Merge pull request #3191 from acemod/cargoCleanup
Cargo Cleanup, Add makeLoadable
2016-02-04 19:44:27 +01:00
Thomas Kooi
324edbde6d Merge pull request #3192 from acemod/getTargetDistance_to_LIS
Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.
2016-02-04 19:42:32 +01:00
Thomas Kooi
6cf02bd06b Merge pull request #3193 from acemod/fcs_rewriteRangeFunctions
Cleaning up the FCS code
2016-02-04 19:39:32 +01:00
Thomas Kooi
d68c79efb1 Merge pull request #3204 from acemod/m67_dns
Fix Handgrenade DisplayNameShort
2016-02-04 19:37:20 +01:00
Thomas Kooi
69746a133b Merge pull request #3254 from ProfessorCZ/master
Czech Translation - Update
2016-02-04 19:36:28 +01:00
Thomas Kooi
8034d91d76 Merge pull request #3249 from GitHawk/refuel_nozzle
Added a real nozzle
2016-02-04 19:32:17 +01:00
Thomas Kooi
d72c73dc25 Merge pull request #3257 from acemod/flashbangUnderwater
Flashbangs - pass pos instead of obj reference
2016-02-04 19:31:11 +01:00
Thomas Kooi
dc8e7e2994 Merge pull request #3255 from acemod/tourniquetMedications
Tourniquets block medication until released
2016-02-04 19:30:40 +01:00
PabstMirror
336184dfaa Change medication removal from array 2016-02-04 10:00:33 -06:00
esteldunedain
c87f19c8da Fix #3258 2016-02-04 10:04:26 -03:00
PabstMirror
2cf2cb0e59 Fix statusEffect error in refuel 2016-02-04 01:31:12 -06:00
PabstMirror
7fc84c60dd Flashbangs - pass pos instead of obj reference
Fix #3205
2016-02-03 17:53:24 -06:00
PabstMirror
3cc10a27ce Tourniquets block medication until released
Close #2704
2016-02-03 14:40:26 -06:00
ProfessorCZ
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
PabstMirror
397a12056a Merge branch 'master' into deterministicOverheatingX 2016-02-02 17:11:00 -06:00
Githawk
979ceb7ad7 Fixed rearm unholster macro 2016-02-02 16:04:50 +01:00
Githawk
cbeac7f154 params stuff 2016-02-02 15:47:05 +01:00
Githawk
4d403d21aa Fixes
Moved models into data
fixed vehicle attach for certain angles
2016-02-02 15:45:57 +01:00
Githawk
5e103ba398 Added nozzle
Added code for nozzle object
Params and private update
2016-02-02 15:03:06 +01:00
Githawk
475351fcfa Some bracket errors 2016-02-01 20:21:20 +01:00
Githawk
cc624f58dd Fixes and updates 2016-02-01 20:05:53 +01:00
esteldunedain
f744e164d3 Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0 2016-02-01 14:58:01 -03:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
af6b084ba3 Don't allow carrying with injured legs
Fix #2644
2016-01-28 23:05:55 -06:00
PabstMirror
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
PabstMirror
3f1d6ffeb7 Fix dragging sending objects to random location
attachTo seems to have weird getpos results for a few frames.
also don't show mouse wheel option for carrying man
and always use 0 offset for dragging man
2016-01-28 17:11:05 -06:00
PabstMirror
d9eafbdf0f Privates / Headers 2016-01-28 12:52:53 -06:00
PabstMirror
84e76efc7f Not needed on CfgMagazines 2016-01-27 15:54:45 -06:00
esteldunedain
2eb91cf2b4 Delete spare models 2016-01-27 18:23:04 -03:00
PabstMirror
7a7e0d689a Improve underwater cargo unloading 2016-01-27 14:56:25 -06:00
esteldunedain
d2d7e46401 Align trench to ground surface to avoid having to lower them too much on slopes 2016-01-27 17:54:40 -03:00
esteldunedain
b20a2f338b Replace trench models: bigger and opaque 2016-01-27 17:54:10 -03:00
PabstMirror
17a882fe4d Add findUnloadPosition integration 2016-01-26 18:01:01 -06:00
esteldunedain
f8a1215264 Align trenches to ground 2016-01-26 11:03:11 -03:00
esteldunedain
0358b10298 Bigger trenches 2016-01-26 11:02:55 -03:00
PabstMirror
b15716860d Remove VehicleLock Items from Virtual Arsenal
Close #3215
2016-01-25 14:29:27 -06:00
SzwedzikPL
03fca3c372 fix fcs keyup/down forced params #3202 2016-01-25 09:49:47 +01:00
esteldunedain
3e25f9c5f0 Cache drawIcon3D parameters 2016-01-24 17:12:25 -03:00
esteldunedain
351d20ec32 Cache near object CAManBase that are on LOS instead of recomputing each frame 2016-01-24 17:12:06 -03:00
PabstMirror
276aea04c1 Changes for CBA 2.3 2016-01-24 11:41:10 -06:00
PabstMirror
78729e96ff Fix bad forceWalk params 2016-01-24 11:39:59 -06:00
esteldunedain
0fd6981809 Don't allow placing is standig above the terrain level 2016-01-23 22:05:29 -03:00
esteldunedain
4970423cd7 Cancel placing if position is no longer suitable 2016-01-23 22:04:49 -03:00
esteldunedain
8ff8204905 Initial code implementation of ace_trenches 2016-01-23 20:45:59 -03:00
esteldunedain
1d886ac624 Merge branch 'master' into trenches
Conflicts:
	AUTHORS.txt
2016-01-23 17:39:54 -03:00
esteldunedain
dec9235810 Periodically test all tags on objects for corner cases 2016-01-23 16:47:00 -03:00
esteldunedain
431a21044a Tabs be damned. 2016-01-23 16:37:30 -03:00
esteldunedain
74b6036f3e Handle destruction of tags placed on objects that don't support handledamage. 2016-01-23 16:24:55 -03:00
esteldunedain
e31636539a Allow tagging wrongly configured static objects. 2016-01-23 16:21:43 -03:00
esteldunedain
b020d88963 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into taggingX 2016-01-23 15:14:32 -03:00
esteldunedain
758611d230 Restrict temp update to current weapon, and only primary or handgun 2016-01-23 11:48:23 -03:00
PabstMirror
3a62956e24 Fix wind display angle being reversed 2016-01-22 20:43:22 -06:00
PabstMirror
5df211c586 Merge pull request #3126 from acemod/weatherCleanup
Weather cleanup, fix wind inversion, add non-color based wind speed indicator
2016-01-22 14:56:21 -06:00
PabstMirror
73b29085e2 Merge pull request #3200 from acemod/moreCache
Hearing - Cache Weapon/Ammo loudness
2016-01-22 14:56:00 -06:00
PabstMirror
45138aea18 Merge pull request #3163 from acemod/unifiedStatusEffects
Unified status effect handler
2016-01-22 14:55:25 -06:00
VKing
9501c54530 Fix #3203 IEDs magically changing shape 2016-01-22 14:21:25 +01:00
VKing
68531bd4a9 Merge branch 'master' into explosives_cleanup_plus_minetriggers 2016-01-22 14:15:45 +01:00
VKing
1cf7fc727d Fix Handgrenade DisplayNameShort 2016-01-22 13:12:20 +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
esteldunedain
ad96617d3a - Tagging cleanup.
- Replaced "Tag wall" and "Tag ground" for a single "Tag" action.
- Added more reliable checks before placing the tag
- Allowed non-player units to tag (via API).
- Replaced execRemoteFnc by events
2016-01-21 19:59:27 -03:00
esteldunedain
a22203a02a Replace player for ACE_player 2016-01-21 14:39:20 -03: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
esteldunedain
e113853395 Merge branch 'master' into tagging 2016-01-20 18:51:41 -03: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
Glowbal
34613b42f2 Increase heart rate increase speed #3134 2016-01-20 11:49:10 +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
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
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
esteldunedain
8e2d489312 Add warnings to deprecated functions 2016-01-19 09:39:06 -06:00
PabstMirror
7e84a9d9b0 Add getter, readd old public funcs, add blockSprint 2016-01-19 09:39:06 -06:00
PabstMirror
d2e006397d cleanup, don't setVar public if no change 2016-01-19 09:39:05 -06:00
PabstMirror
9a3972de76 Unified Status Effect Handler 2016-01-19 09:39:05 -06:00
Thomas Kooi
b99be6122b Merge pull request #3187 from acemod/fixFCS
Add missing FUNC to FCS key (Rangefinders)
2016-01-19 16:05:56 +01:00
PabstMirror
6d6cbec5ef Add missing FUNC to FCS key (Rangefinders)
#3160
2016-01-19 09:02:51 -06:00
Thomas Kooi
c439036abe Deprecate execPersistentFnc 3.7.0
Remove functions the second update after deprecation.
2016-01-19 15:55:33 +01:00
Thomas Kooi
a612bdecf2 Deprecate execRemoteFnc in 3.7.0
Remove functions the second update after deprecation.
2016-01-19 15:54:59 +01:00
PabstMirror
69771d531d Merge pull request #3173 from acemod/fixInvintoryLock
Fix Vehicle inventory is not locked
2016-01-19 08:37:58 -06:00
PabstMirror
0ea1c0c03f Cleanup non-working code, and documentation 2016-01-19 08:31:52 -06:00
Thomas Kooi
e083e60e8c Merge pull request #3142 from acemod/switchUnitsCleanup
Cleanup SwitchUnits, Possible fix for #3122
2016-01-19 09:40:24 +01:00
Thomas Kooi
33479ffcae Merge pull request #3146 from acemod/Explosives_DetonateTrigger
Function to detonate explosives via script
2016-01-19 09:38:43 +01:00
Thomas Kooi
aa535c9167 Merge pull request #3177 from acemod/fixJavelinZeus
Javelin - Fix zeus RC after switchCamera
2016-01-19 09:36:08 +01:00
Thomas Kooi
4ee338c57e Merge pull request #3178 from acemod/scopes_hideNonAdjustments
Scopes: Don't show adjustment or play click sound if the adjustment doesn't happen
2016-01-19 09:35:01 +01:00
Thomas Kooi
5c1f55a0f1 Merge pull request #3181 from acemod/leaveMyPlugsAlone
Do not add or remove earplugs if gear should be preserved
2016-01-19 09:34:38 +01:00
Thomas Kooi
46f832379a Merge pull request #3120 from acemod/explosives_actionmenu_cleanup
Clean up explosive interaction menu
2016-01-19 09:32:26 +01:00
Thomas Kooi
f5d71ca03c Merge pull request #3183 from acemod/codeCleanupGforces
Code cleanup of Gforces module V2
2016-01-19 09:31:16 +01:00
Thomas Kooi
fbb358233b Merge pull request #3172 from acemod/overpressureCleanup
Overpressure cleanup and fix distance check
2016-01-19 09:30:43 +01:00
esteldunedain
f599542b8e gforces cleanup. Close #2130 2016-01-19 00:18:01 -03:00
commy2
8731e8e338 Merge pull request #3133 from acemod/gottaCacheEmAll
Use Function Caching in CBA
2016-01-18 20:27:39 +01:00
esteldunedain
0a91dfa7b2 Do not add or remove earplugs if gear should be preserved. Fix #3180. 2016-01-18 13:23:55 -03:00
VKing
2af3d9e769 Don't show adjustment or click sound if the adjustment doesn't happen 2016-01-18 16:16:53 +01:00
PabstMirror
67087d7c88 Capitalization 2016-01-18 00:27:19 -06:00
PabstMirror
a5c6c5579f #3175 - Javelin - Fix zeus RC after switchCamera 2016-01-17 12:12:05 -06:00
Glowbal
86158ac45b Stage improvements bandage effectiveness 2016-01-17 14:09:22 +01:00
Glowbal
7de1a7bc6c add initial implementation of drowning and collision damage handling 2016-01-17 13:21:18 +01:00
Glowbal
209d10065b Fix missing event log entries #3134 2016-01-17 12:28:37 +01:00
Glowbal
6e42a10d47 Add selectionDamage implementation 2016-01-17 12:28:08 +01:00
PabstMirror
48a1ddd401 #3166 - Fix Vehicle inventory is not locked 2016-01-16 21:58:59 -06:00
PabstMirror
35e6a181b5 opps 2016-01-16 17:48:58 -06:00
PabstMirror
893c6658a5 Fix debug msg order, re-add local check on eh 2016-01-16 17:29:57 -06:00
PabstMirror
a875d6a870 Overpressure cleanup and fix distance check 2016-01-16 15:53:28 -06:00
Glowbal
ee9a620a63 Merge branch '340handledamage' into medical-focus-feature 2016-01-16 22:03:28 +01:00
Thomas Kooi
c8c91d2af7 Merge pull request #3138 from acemod/increaseTrainingInLocations
Medical Locations Boost Training
2016-01-16 21:59:45 +01:00
VKing
e3123b3f56 Local check before setPosition 2016-01-16 01:13:01 +01:00