Arma3_Epoch/ACE3

mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

Author	SHA1	Message	Date
SilentSpike	1ab7a886e7	Improve spectator drawing and selection (#5457 ) * Optimise cursor object updates * Restrict distance units can be selected from * Fix potential for no icons to render in FPP * Limit projectile drawing distance * Optimise icon updates * Fix group names not being drawn in vehicles * Fix selection nameplate not drawing for vehicles * Fix selection of non-spectatable entities	2017-08-30 11:40:12 +01:00
Neviothr	abc91f1564	Cleanup (#5463 ) Cleanup some configs and array spacing	2017-08-29 17:47:01 -05:00
Vdauphin	5ca113d0ba	FIX: ace_common_fnc_loadPerson don't detect taru with place for crew (#5464 ) When you load somebody inside a vehicle the ace_common_fnc_loadPerson is used. This fonction acutually search nearestObjects of type ["Car", "Air", "Tank", "Ship_F"] to put player inside. Infortunatly, the taru family with crew place (exemple :"Land_Pod_Heli_Transport_04_medevac_black_F") are not detected because the corresponding parent class of "Land_Pod_Heli_Transport_04_medevac_black_F" is : ["Land_Pod_Heli_Transport_04_medevac_F","Pod_Heli_Transport_04_crewed_base_F","StaticWeapon","LandVehicle","Land","AllVehicles","All"]. To avoid this, the "Pod_Heli_Transport_04_crewed_base_F" parent class should also be search by nearestobjects.	2017-08-28 22:51:03 -05:00
SilentSpike	4afcc546e7	Improve spectator focus widget (#5452 ) * Optimize widget updates * Improve focus widget vehicle position display * Remove insignia from widget * Add current throwable to widget * Fix padding/spacing of widget items * Fix incorrect vehicle cargo icon being used	2017-08-26 19:16:24 +01:00
PabstMirror	eb18d23181	Allow digging in malden grass (#5453 )	2017-08-24 15:00:25 -05:00
PabstMirror	52915e1104	Common func to run config tests (#5170 ) * Common func to run config tests * Add map config testing, malden data and reverse map config's latitude * Headers * Simplify config levels * Header * fix example	2017-08-22 16:21:41 -05:00
PabstMirror	74fd0f507f	Add EH for UAV control, Add Hellfire support (#5305 ) * Add EH for UAV control, Add Hellfire support * cycle guidance keybind * Handle broken PlayerViewChanged * humps * UAV Self-interactions (#5379) * Switch ACE_Player to uav AI on valid seat change * Different approach to UAV interactions * Forgot to remove a variable * Changed param to select	2017-08-22 16:07:45 -05:00
SilentSpike	43ac39f06c	Improve spectator tab fading (#5441 ) * Cleanup spectator PFH variable * Improve spectator tab fading Looks better	2017-08-22 14:11:34 -05:00
jonpas	e11e102a76	Underwater actions support (#4984 ) * Enable majority of actions underwater * Remove log * Add logistics_wirecutter support (don't play kneel animations underwater - looks silly) * Don't perform kneel animations when repairing or medicaling underwater * Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles) * Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define * Remove left-over systemChat * Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS	2017-08-22 13:30:56 -05:00
PabstMirror	a67815d072	Disable damage on cars loaded as cargo (#5402 )	2017-08-22 13:27:11 -05:00
PabstMirror	e7ebbd5750	Customized map lighting for vehicle interiors (#5401 ) * Customized map lighting for vehicle interiors * Tabs for cases * Add wiki for new configs * V	2017-08-22 13:13:03 -05:00
Vdauphin	c3986b0a04	Add optional parameter useEffects for damage (#5318 ) Since 1.67, you can skip destruction effects if you want to. see : https://community.bistudio.com/wiki/setDamage and https://community.bistudio.com/wiki/setHitPointDamage This add an optional parameter to ace_repair_fnc_setHitPointDamage to allow this new choice	2017-08-22 12:56:14 -05:00
BaerMitUmlaut	b7e42cb7a4	New medical box (#5278 ) * Replaced medical box * Added ElTyranos as author * RVMAT code style * Added ground contact points, fixed broken face	2017-08-22 12:55:14 -05:00
PabstMirror	accaf9fd01	Compatibility with newest mikro tools (#5442 ) * Compatibility with newest mikro tools - Remove all use of `access` in configs - Add skeleton cfg for rtms - Remove use of `-L` in makePbo for non-bin * Tabs in model.cfg	2017-08-22 12:53:58 -05:00
SilentSpike	85c5fbabe9	Remove locations tab from spectator (#5431 ) * Fix incorrect function input for spectator hiding * Remove locations tab from spectator - Doesn't add much value, adds complexity and the implementation is half baked. Would rather add back in at a later date (if at all) with a better implementation. - I have an idea to replace the locations tab with a meta tab so users can toggle things like projectile drawing via the UI and are not forced to use a hotkey. Might also be a good place to display the extended controls.	2017-08-17 12:50:43 +01:00
Joko	d9ea680afa	Fix adenosine self injection displaying incorrect action (#5430 )	2017-08-14 19:47:58 +01:00
SilentSpike	407df4433a	Disable spect camera movement while map is open (#5427 ) - Prevents camera panning when right-click dragging the map around	2017-08-14 11:31:19 +01:00
SilentSpike	d3ce75daef	Spectator overhaul (#5171 ) - Overhauls the spectator module entirely to share a similar UX to BI's "End Game Spectator" while maintaining some of the extended flexibility of ACE Spectator. - Simplifies spectator setup by reducing the number of settings. More advanced setup is still possible via the API functions provided.	2017-08-12 14:25:48 +01:00
Ozan Eğitmen	ff1247daef	Change "Remove Wheel" Action's Color Based on Damage (#5415 ) * Change repair action's colors on wheels * Add dots.	2017-08-10 13:32:55 +02:00
PabstMirror	d81e943590	Delete medical litter on building explosion	2017-08-09 12:13:29 -05:00
Tim Beswick	a0b5f9f2d5	Laser seeker range improvements (#5365 ) * Workaround for laser max range. Made laser hud seeker use ammo values. * Nested ifs for optimization of check	2017-08-03 12:50:29 -05:00
classic	8b7a862611	Update the Jpn translate `fd48c7f` (#5381 ) * Update the Jpn translation Support to new entry * Update the Jpn translation for more Natural words. * Update the Jpn translation Unification of words. * Update the Jpn translation tweaks to words. * Update the Jpn translation Fix to wrong translation. * Update the Jpn translation added translation to Proper noun * Update to Jpn translation Fix to wrong translation.	2017-07-23 14:27:50 +02:00
PabstMirror	13293ee7aa	Add hellfire support to CUP vehicles (#5367 )	2017-07-19 13:59:23 -05:00
Dissyu	a7954368f4	Fix Chinese content & missing string (#5375 ) * Fix missing string with stringtable Fix Advanced Fatigue & QuickMount * Fix Chinese content & missing string * Fix Gestures & DAGR missing string * Fix quickmount string with vanilla string * Remove adr97 unnecessary string	2017-07-19 20:57:20 +02:00
jonpas	6aad1c8af6	Merge branch 'release'	2017-07-18 23:00:48 +02:00
Pawel W	0538647604	Add missing polish translations (#5370 )	2017-07-16 23:14:59 -05:00
Wakbub	2c97865e02	Correct typos ("enginer" to "engineer") (#5355 ) * Update ACE_Settings.hpp Correction of typos. * Update CfgVehicles.hpp Correction of typos. * Update stringtable.xml Correction of typos. * Update AUTHORS.txt In accordance with your process of merging pull requests.	2017-07-11 12:50:35 -05:00
jonpas	23cf08c237	Prepare release 3.10.2	2017-07-11 00:21:09 +02:00
Dystopian	fdaa5891f6	Fix adv. throw key handling when reloading (#5336 ) * Fix throw key handling when reloading * Consider UGL reload to ace_common_isReloading var * Fix if space, change private var assign * Shorten UGL check	2017-07-10 21:44:24 +02:00
Dystopian	dd3a66a643	Fix adv. throw key handling when reloading (#5336 ) * Fix throw key handling when reloading * Consider UGL reload to ace_common_isReloading var * Fix if space, change private var assign * Shorten UGL check	2017-07-10 21:44:02 +02:00
jonpas	8f494e08ae	Add support for Tanoa and Malden Fuel Pumps, Flexible Tanks and Fuel Canister (#5353 ) * Add support for Tanoan fuel pumps, Flexible Tanks and Fuel Canister (as jerry can) * Add to Land_FuelStation_01_pump_malevil_F * Add Malden/Jets to required addons * REQUIRED_VERSION 1.72	2017-07-10 21:42:21 +02:00
jonpas	13d7de9c92	Prevent taking nozzle if already carried (#5352 )	2017-07-10 21:42:11 +02:00
jonpas	84061cb593	Add support for Tanoa and Malden Fuel Pumps, Flexible Tanks and Fuel Canister (#5353 ) * Add support for Tanoan fuel pumps, Flexible Tanks and Fuel Canister (as jerry can) * Add to Land_FuelStation_01_pump_malevil_F * Add Malden/Jets to required addons * REQUIRED_VERSION 1.72	2017-07-10 21:41:37 +02:00
jonpas	6253ec0915	Prevent taking nozzle if already carried (#5352 )	2017-07-10 21:41:23 +02:00
PabstMirror	ddd14d933d	Fix rearm turret events (#5307 )	2017-07-10 17:18:11 +02:00
PabstMirror	c28628aed2	Fix rearm turret events (#5307 )	2017-07-10 17:17:44 +02:00
Tim Beswick	597f439654	Changed hellfire interaction check & added N variant (#5294 ) * Changed weapon check for interaction to generic ace_hellfire_enabled value * Added November hellfire variant * Cleanup * +1	2017-07-10 16:49:10 +02:00
PabstMirror	ef90a069b7	Rallypoints- Don't modify setVar if already set (#5347 )	2017-07-10 16:48:22 +02:00
PabstMirror	01c17271bc	Handle locked doors (#5345 )	2017-07-10 16:48:13 +02:00
PabstMirror	6acd61a68e	Fix broken fonts for map gps display (#5337 ) EtelkaNarrowMediumPro broke with 1.72 hotfix	2017-07-10 16:47:52 +02:00
Joko	59add40db6	Fix the issue that SFX variants are not global (#5335 ) * Fix the issue that SFX variants are not global what means that different players can get different pressure Cookoff sounds to prevent that i split up the sounds in 3 types and used a Weighted select to have the befor used values back * add todo for 1.74 * inherit in CfgSFX from 1 class	2017-07-10 16:47:39 +02:00
jonpas	fa3743ca54	Correct new Chinese stringtable identifiers (#5334 )	2017-07-10 16:47:26 +02:00
0dr	c45927b5f6	fix #5324 (#5325 )	2017-07-10 16:47:10 +02:00
PabstMirror	08ab3307af	Allow repairing from slingload pods (#5316 )	2017-07-10 16:46:58 +02:00
PabstMirror	e9fb0e9b20	Add cargo space to huron containers (#5315 )	2017-07-10 16:46:49 +02:00
classic	dc303aa29f	Japanese translation `d02dacf` (#5309 ) * add the Jpn translation for repair add the Japanese translation for repair * minor fix to Jpn translation for medical minor fix to Jpn translation for medical	2017-07-10 16:46:25 +02:00
PabstMirror	e4ac748f6f	Handle ace_cargo_canLoad set to scalar (#5306 )	2017-07-10 16:46:14 +02:00
PabstMirror	e6b875b252	Add XEH to ace_module (#5304 )	2017-07-10 16:46:02 +02:00
GodofMonkeys	0ccbeb25e9	Add Chinese Traditional & Simplified Localization (#5295 ) Add Chinese Traditional & Simplified Localization	2017-07-10 16:45:22 +02:00
PabstMirror	f207b6c13b	Modify JoinGroup action to show group name (#5287 ) * Modify JoinGroup action to show group name * header * Header	2017-07-10 16:44:00 +02:00
PabstMirror	a83efa8e36	Repair - Handle depends = "0" (#5283 ) * Repair - Handle depends = "0" * quote	2017-07-10 16:43:48 +02:00
classic	317fe93c2d	Jpn translate `feee7f5` (#5280 ) * Add the Jpn translation for quickmount Add the Japanese translation for quickmount * Update the Jpn translation for repair Update the Japanese translation for repair	2017-07-10 16:43:27 +02:00
PabstMirror	153fc975f5	Refuel - change nozzle position calc (#5279 )	2017-07-10 16:43:14 +02:00
classic	483b41b717	Jpn translate 73bd37 (#5277 ) * Update the Jpn translation for cargo Update the Japanese translation for cargo * Add the Jpn translation for hellfire Add the Japanese translation for hellfire * Add the Jpn translation for nlaw Add the Japanese translation for nlaw * Add the Jpn translation for rearm Add the Japanese translation for rearm * Update the Jpn translation for refuel Update the Japanese translation for refuel * Update the Jpn translation for repair Update the Japanese translation for repair * Update the Jpn translation for zeus Update the Japanese translation for zeus	2017-07-10 16:43:03 +02:00
Laid3acK	d0a28b956e	gos ndjenahoud latitude (#5275 )	2017-07-10 16:42:53 +02:00
PabstMirror	af0f7f36d8	Make array of cargo holders dynamic (#5274 )	2017-07-10 16:42:41 +02:00
PabstMirror	bb8d5cadd7	Cleanup heli pod actions (#5271 ) Close #4783 - Make taru pods non loadable - Make taru pods non draggable - Increase interaction range for huron pods	2017-07-10 16:42:28 +02:00
Christian Klemm	16439f5640	Add ability to abort module destination (#5284 ) * Add the ability to abort a module action via ace_zeus_fnc_getModuleDestination * Action can be aborted by pressing ESC * Current position is still passed to the code callback	2017-07-10 12:41:35 +01:00
PabstMirror	4483045604	Rallypoints- Don't modify setVar if already set (#5347 )	2017-07-09 16:15:14 -05:00
PabstMirror	5c713fcc2a	Add cargo space to huron containers (#5315 )	2017-07-08 14:01:15 -05:00
PabstMirror	cb911c91ef	Allow repairing from slingload pods (#5316 )	2017-07-08 14:01:05 -05:00
PabstMirror	cddc34e08a	Handle locked doors (#5345 )	2017-07-08 13:23:28 -05:00
PabstMirror	f210f63bd9	Fix broken fonts for map gps display (#5337 ) EtelkaNarrowMediumPro broke with 1.72 hotfix	2017-07-08 13:23:06 -05:00
0dr	0958eff89e	fix #5324 (#5325 )	2017-07-08 10:07:39 -05:00
Joko	2aa0072104	Fix the issue that SFX variants are not global (#5335 ) * Fix the issue that SFX variants are not global what means that different players can get different pressure Cookoff sounds to prevent that i split up the sounds in 3 types and used a Weighted select to have the befor used values back * add todo for 1.74 * inherit in CfgSFX from 1 class	2017-07-08 09:52:25 -05:00
jonpas	5cf7569711	Correct new Chinese stringtable identifiers (#5334 )	2017-07-08 09:48:39 -05:00
Fishy	b84aec3051	Update fnc_setHearingCapability.sqf	2017-06-29 15:04:32 +01:00
Fishy	ea22ebdf09	Update XEH_preInit.sqf	2017-06-29 15:03:53 +01:00
classic	98ccd879f3	Japanese translation `d02dacf` (#5309 ) * add the Jpn translation for repair add the Japanese translation for repair * minor fix to Jpn translation for medical minor fix to Jpn translation for medical	2017-06-23 11:39:06 -05:00
Tim Beswick	2823ee58a4	Changed hellfire interaction check & added N variant (#5294 ) * Changed weapon check for interaction to generic ace_hellfire_enabled value * Added November hellfire variant * Cleanup * +1	2017-06-23 11:32:48 -05:00
PabstMirror	9bf59bc74d	Add XEH to ace_module (#5304 )	2017-06-23 11:31:59 -05:00
PabstMirror	fde984ad7b	Handle ace_cargo_canLoad set to scalar (#5306 )	2017-06-23 11:31:19 -05:00
PabstMirror	d02dacf613	Refuel - change nozzle position calc (#5279 )	2017-06-22 22:58:57 -05:00
PabstMirror	f33ff4e767	Repair - Handle depends = "0" (#5283 ) * Repair - Handle depends = "0" * quote	2017-06-22 22:58:00 -05:00
PabstMirror	5f779c4c90	Modify JoinGroup action to show group name (#5287 ) * Modify JoinGroup action to show group name * header * Header	2017-06-22 16:05:19 -05:00
GodofMonkeys	60131ee589	Add Chinese Traditional & Simplified Localization (#5295 ) Add Chinese Traditional & Simplified Localization	2017-06-22 16:46:00 +02:00
Glowbal	1144490ef3	Merge branch 'release'	2017-06-22 16:06:57 +02:00
PabstMirror	7b91629fa3	Add malden to getMapData (#5297 ) * Add malden to getMapData * Merge with CWR2 malden	2017-06-21 19:40:53 +02:00
PabstMirror	c6e70a4e88	Add malden to getMapData (#5297 ) * Add malden to getMapData * Merge with CWR2 malden	2017-06-21 19:40:17 +02:00
jonpas	1d355b43db	Prepare release 3.10.1	2017-06-21 15:41:02 +02:00
PabstMirror	c4dd71412b	Fix isFeatureCameraActive (#5291 )	2017-06-21 15:36:23 +02:00
PabstMirror	ffe31d9759	Fix isFeatureCameraActive (#5291 )	2017-06-21 15:34:10 +02:00
Glowbal	ba05b74fd2	Merge branch 'release'	2017-06-20 20:19:29 +02:00
Arcanum	fe16b72837	Fix AI can get to CA from injured	2017-06-18 12:43:39 +02:00
Arcanum	f86420c0d7	Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite-kill-ai	2017-06-18 12:30:03 +02:00
Zakant	bdea0fcdba	[Medical Rewrite] Adding respawn compatibility (#5020 ) * Added respawn transition * Removed respawn transition from statemachine and added manual transition comment * Changed transiton to manual. Added easy way to get current status as well * Updated event reference * Fixed manualTransition call * Minor headers changes	2017-06-17 18:28:16 -05:00
Zakant	b5f6169341	Remove legacy code (#4960 )	2017-06-17 14:01:59 -05:00
PabstMirror	bec55114fa	Add load,unload and radial actions (#5270 ) - Add radial actions - Revert back to using 'ACE_isUnconscious'	2017-06-15 14:35:33 -05:00
classic	a92b6a753d	Jpn translate `feee7f5` (#5280 ) * Add the Jpn translation for quickmount Add the Japanese translation for quickmount * Update the Jpn translation for repair Update the Japanese translation for repair	2017-06-14 12:37:42 -05:00
PabstMirror	feee7f5e1e	Make array of cargo holders dynamic (#5274 )	2017-06-14 15:36:23 +02:00
PabstMirror	183eaaecdc	Cleanup heli pod actions (#5271 ) Close #4783 - Make taru pods non loadable - Make taru pods non draggable - Increase interaction range for huron pods	2017-06-14 15:35:17 +02:00
Laid3acK	3034212701	gos ndjenahoud latitude (#5275 )	2017-06-13 23:15:34 -05:00
classic	a78c42f49e	Jpn translate 73bd37 (#5277 ) * Update the Jpn translation for cargo Update the Japanese translation for cargo * Add the Jpn translation for hellfire Add the Japanese translation for hellfire * Add the Jpn translation for nlaw Add the Japanese translation for nlaw * Add the Jpn translation for rearm Add the Japanese translation for rearm * Update the Jpn translation for refuel Update the Japanese translation for refuel * Update the Jpn translation for repair Update the Japanese translation for repair * Update the Jpn translation for zeus Update the Japanese translation for zeus	2017-06-13 22:00:38 -05:00
jonpas	9d9edc46c7	Prepare release 3.10.0 (build 2)	2017-06-13 14:03:37 +02:00
Moritz Schmidt	e770f669b6	Fix isFeatureCameraActive for Spectator enhacements (#5269 ) * fix isFeatureCameraActive for spec ace_spectator_camera was removed in `77c2b99ee5` . spectator module initializes three separate cameras instead, of which for example ace_spectator_freeCamera can be used to check if spec mode is active * use ace_spectator_isSet to check for spec mode	2017-06-13 13:53:41 +02:00
jonpas	6a4a3d4ce1	Merge branch 'master' into release-3.10.0	2017-06-10 22:35:22 +02:00
Andrea Verano	73bdb37d99	Italian translation updated and fixed (#5268 ) Added newest lines for: -Rearm -Repair	2017-06-10 22:19:13 +02:00
PabstMirror	356a8f640a	Merge branch 'master' into medical-rewrite Conflicts: addons/medical/functions/fnc_actionCheckBloodPressure.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulse.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf addons/medical/functions/fnc_actionDiagnose.sqf addons/medical/functions/fnc_actionRemoveTourniquet.sqf addons/medical/functions/fnc_addHeartRateAdjustment.sqf addons/medical/functions/fnc_addToInjuredCollection.sqf addons/medical/functions/fnc_addUnconsciousCondition.sqf addons/medical/functions/fnc_addVitalLoop.sqf addons/medical/functions/fnc_canTreat.sqf addons/medical/functions/fnc_copyDeadBody.sqf addons/medical/functions/fnc_createLitter.sqf addons/medical/functions/fnc_determineIfFatal.sqf addons/medical/functions/fnc_getBloodLoss.sqf addons/medical/functions/fnc_getBloodPressure.sqf addons/medical/functions/fnc_getBloodVolumeChange.sqf addons/medical/functions/fnc_getCardiacOutput.sqf addons/medical/functions/fnc_getHeartRateChange.sqf addons/medical/functions/fnc_getTriageStatus.sqf addons/medical/functions/fnc_getUnconsciousCondition.sqf addons/medical/functions/fnc_handleBandageOpening.sqf addons/medical/functions/fnc_handleCollisionDamage.sqf addons/medical/functions/fnc_handleDamage.sqf addons/medical/functions/fnc_handleDamage_advanced.sqf addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf addons/medical/functions/fnc_handleDamage_airway.sqf addons/medical/functions/fnc_handleDamage_caching.sqf addons/medical/functions/fnc_handleDamage_fractures.sqf addons/medical/functions/fnc_handleDamage_internalInjuries.sqf addons/medical/functions/fnc_handleDamage_wounds.sqf addons/medical/functions/fnc_handleDamage_woundsOld.sqf addons/medical/functions/fnc_hasMedicalEnabled.sqf addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf addons/medical/functions/fnc_isInStableCondition.sqf addons/medical/functions/fnc_isMedicalVehicle.sqf addons/medical/functions/fnc_itemCheck.sqf addons/medical/functions/fnc_medicationEffectLoop.sqf addons/medical/functions/fnc_modifyMedicalAction.sqf addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf addons/medical/functions/fnc_moduleReviveSettings.sqf addons/medical/functions/fnc_parseConfigForInjuries.sqf addons/medical/functions/fnc_playInjuredSound.sqf addons/medical/functions/fnc_reviveStateLoop.sqf addons/medical/functions/fnc_selectionNameToNumber.sqf addons/medical/functions/fnc_setDead.sqf addons/medical/functions/fnc_setHitPointDamage.sqf addons/medical/functions/fnc_setStructuralDamage.sqf addons/medical/functions/fnc_setUnconscious.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_treatment.sqf addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_medication.sqf addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf addons/medical/functions/fnc_treatmentBasic_epipen.sqf addons/medical/functions/fnc_treatmentBasic_morphine.sqf addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf addons/medical/functions/fnc_treatmentIV.sqf addons/medical/functions/fnc_treatmentIVLocal.sqf addons/medical/functions/fnc_treatmentTourniquet.sqf addons/medical/functions/fnc_treatmentTourniquetLocal.sqf addons/medical/functions/fnc_treatment_failure.sqf addons/medical/functions/fnc_treatment_success.sqf addons/medical/functions/fnc_unconsciousPFH.sqf addons/medical/functions/fnc_useItem.sqf addons/medical/functions/fnc_vitalLoop.sqf addons/medical_blood/functions/fnc_hit.sqf addons/medical_treatment/functions/fnc_hasItem.sqf addons/medical_treatment/functions/fnc_useItems.sqf	2017-06-10 10:21:18 -05:00
jonpas	e0887b3839	Prepare version 3.10.0	2017-06-10 15:27:14 +02:00
jonpas	1027fb5d30	Merge branch 'master' into release-3.10.0	2017-06-10 15:25:27 +02:00
jonpas	f7d63336f5	Increase required CBA version to 3.3.1	2017-06-10 15:24:19 +02:00
SilentSpike	a53f68a347	Use getUnitTrait for medics, engineers and EOD (#5246 )	2017-06-10 11:41:01 +01:00
Phyma	48b9a61497	Fix Large IED defuse distance (#5261 ) * Fix for large-ied bug because underwater thing have changed * Added size of IED in config and determine defuse range * Added typo * Added help text to wiki about defusing * Better English * Increased the defusal range on large bombs make it similar to small ieds * Add wiki doc	2017-06-09 12:52:55 -05:00
jonpas	33e4e6cd11	Remove maximum distance of attach to vehicle action (#5262 ) * Remove maximum distance of attachi to vehicle action * Readd max distance, 10 meters to allow usage with big vehicles but also end placement system if too far	2017-06-09 14:54:58 +02:00
PabstMirror	847832c118	Fix some event names on wiki (#5254 ) * Fix some event names on wiki * Switch callable events to functions	2017-06-08 14:31:27 -05:00
PabstMirror	382028e662	Fix updating body part visuals (#5141 )	2017-06-08 13:50:38 -05:00
Ozan Eğitmen	225d15dcca	Add Ability to Change Repair Times of Vehicles (#5205 ) * Add ability to change repair time based on vehicle * Much better * Unary command not function * Allow changing of track or wheel object per vehicle * Lot more complicated than I thought	2017-06-08 13:31:25 -05:00
Phyma	55df8bca53	Repair specialist rename, fixes #3186 (#5248 ) * Changed name * Fixed Enginner only german and removed big letters * Added docs + PR fixes #3186 * Removed other languages * Fixed request and added comment * Replace all usage of term "Specialist"	2017-06-08 12:10:35 -05:00
PabstMirror	d1f4b90714	Fix minor debug that got left in (#5260 )	2017-06-08 11:55:19 -05:00
PabstMirror	f35f80ee82	Rearm - Pylon Support and Dynamically Add Supply Actions (#5183 ) * Dynamic Add * Support 1.70 Pylon Loadouts * Properly handle old compat pbos - Update RHS Compat * Re-add documentation * cleanup headers (note from other pr) * Cleanup * Fix var spelling	2017-06-08 11:47:52 -05:00
PabstMirror	1be9e7ca30	Merge pull request #5182 from acemod/GitHawk-rearm_supply Rearm - Limited Supply (Fix Merge Conflcits)	2017-06-08 11:45:12 -05:00
Phyma	ffaa195fe5	Conform function headers to coding guidelines (#5255 ) * Fixed headers to work with silentspike python script * Fixed rest of the files * Fixed ace-team	2017-06-08 15:31:51 +02:00
PabstMirror	b3fa074c38	Disable dragging on big AA Turrets (#5251 )	2017-06-06 01:39:49 -05:00
Ľuboš Lendáč	b91e892710	Merge branch 'medical-rewrite' into medical-rewrite-kill-ai	2017-06-05 22:54:03 +02:00
PabstMirror	f715edabc9	Fix debug	2017-06-05 12:30:54 -05:00
PabstMirror	25a28778cb	Tweak randomness for wound bleeding and pain (#5113 ) * Tweak randomness for wound bleeding and pain * Scale damage to bodyPartDamage on multi part wounds	2017-06-05 11:51:53 -05:00
PabstMirror	f98b268419	Split setUnconscious func, add spontaneousWakeUpChance setting (#5114 )	2017-06-05 11:42:46 -05:00
PabstMirror	f369ffaa04	Med rw handle fire damage (#5100 ) * Bundle fire damage into bigger chunks Redo #4223 * Use same values * Decrease combine cuttoff to 0.1	2017-06-05 11:42:00 -05:00
Phyma	606c6d18a6	Added Pylon weapon as a valid weapon (#5250 )	2017-06-05 11:15:55 -05:00
Phyma	cec82be93b	Raise lower carry object (#5234 ) * Fix to move items up and down * Fixed private * Fixed public bug * Inserted Pabst solution * Remove extra space * Fixed request + added author * Fixed to correct comment * Tweeked comment again	2017-06-04 12:46:49 -05:00
PabstMirror	8bb92cee6f	Fix weapon select grenade count wehn using advThrow (#5244 )	2017-06-04 10:07:35 -05:00
PabstMirror	48680d1123	Cleanup unused hellfire vic stringtable (#5245 )	2017-06-03 23:39:03 -05:00
Andrea Verano	0affa14a1b	Italian Translation Update (#5243 ) Added Italian translation for: -cargo -hellfire -nlaw -quickmount -refuel -zeus	2017-06-03 22:27:51 -05:00
PabstMirror	c9b26fa3e5	Fix being unable to throw last mag (#5242 )	2017-06-03 21:39:52 -05:00
PabstMirror	ddccfe563b	Merge branch 'master' into medical-rewrite Conflicts: addons/medical/functions/fnc_determineIfFatal.sqf addons/medical/functions/fnc_displayPatientInformation.sqf	2017-06-03 12:37:28 -05:00
SilentSpike	b3889d9d7e	Fix accidental numerical change (#5235 )	2017-06-02 19:56:24 -05:00
Rebel	bf4b49a213	Fix spectator icons and camera jitter (#5067 ) * Use `Visual` commands for icons and external camera position	2017-06-03 01:38:29 +01:00
PabstMirror	3898202091	Hellfire missiles (#4679 ) * Hellfire * Cleanup dev macros * Cleanup some debug * Add base interaction node for firemode actions * Handle bad data in attack profile variable * Skip ammo checks (returns bad data on added weaps) * Add mags sizes for apache * Add Hellfire Wiki Doc * Cleanup doc * Add pylon support * Add support for pilot controlled weapons * Add label to pylon mags * Cleanup vehicle configs, autoAdd laser des, fix ineractions for driver	2017-06-02 16:51:38 -05:00
PabstMirror	49374feb2a	NLAW - Predicted Line Of Sight Guidance and Overfly Attack Mode (#4791 ) * NLAW Prototype * Make AI Compatible * Add Overfly Top Attack Mode * Limit Max Deflection * Base prediction on AI skill * Generic cycle attack profile key for missile guidance * Add hint for weapons without huds * Configure for attack cycle key * Finish OTA ammo effects * Cleanup * Arm at 20m * Disable Debug * No models for short lived sub-ammos * Fix Korean strings * Change AI randomization to use skillFinal * Add wiki doc for nlaw * Cleanup * Cleanup * Cleanup	2017-06-02 16:51:20 -05:00
James Kingsley	4872e186cd	Vehicle quick mount (#4931 ) * Add quickmount files from ACEX * Rename to ACE3, Streamline, Use clientInit * Rename functions to ACE3, Fix crew getting * Fix enabled text * Fix texts * Remove spaces * Rework seat search	2017-06-02 16:51:07 -05:00
Phyma	288f956316	Open glass and CUP doors (#5226 ) * Fixed glassdoor Fixed so glassdoor now works with ace slow open. * Made it more pretty with new file Made it more pretty with new file * Tidy up a bit * Removed white space * Replace tabs with spaces Replace tabs with spaces * Simplified and added comments * Changes + was stupid was commit Changes to go with code guidlines and extra check if door is empty * Tabs to spaces * Small fixes + Fixed so CUP houses now works Fixed so CUP houses now works * Remove todo * Fixed requested changes * Removed whitespaces	2017-06-02 16:50:53 -05:00
SilentSpike	ae69118fba	Implement new cook off SFX (#5179 ) * Implement new cook off SFX with variants * Add hybrid V to authors	2017-06-02 22:20:36 +01:00
Cuel	5b9c70a738	Fix zeus RC units using player damage treshold (#5219 ) * Fix zeus RC units using player damage treshold Closes #5218 * add pabstmirrors suggestion use gvar	2017-06-02 11:21:57 -05:00
PabstMirror	2712a1ed8a	Remove submuntion ammo changes to A-10 (#5231 ) * Remove changes to Aircraft cannons * keep ammo changes, i guess	2017-06-01 20:48:35 -05:00
PabstMirror	7bccf2f6be	Fix IVs not showing in patient display (#5230 ) Fix #5192 for 3.10	2017-06-01 10:28:47 -05:00
SilentSpike	fea2326488	Add cargo eden attributes (#4780 ) - Add a ace_cargo_space attribute to vehicles to alter how much cargo they can carry. - Add an ace_cargo_size attribute to objects to alter how much cargo space they consume. - Add two public functions `fnc_setSize.sqf` and `fnc_setSpace.sqf` to update the cargo size/space respectively of any given object. - Deprecate cargo makeLoadable module and public function. - Added some macros to get the space/size of a config, making code more readable in places.	2017-05-31 23:54:57 +01:00
SilentSpike	cbe06e5bc7	Fix zeus interaction locality (#5214 ) - The `setUnitPos`, `setFormation`, `setSpeedMode` and `setBehaviour` commands require local arguments - The waypoint equivalents require server execution - Add conditions to only show interactions when the appropriate things are selected	2017-05-31 22:21:44 +01:00
PabstMirror	00b91bed45	Minor fixes, cleanup, add lint ignore directives (#5176 ) - Fix bug in getNumberMagazinesIn (func not used) - Fix bug in seekerFindLaserSpot (func not used yet) - Everything else is just cleanup	2017-05-31 22:09:36 +01:00
SchmittAkaSmallfly	d90f15ac7d	Lower minimum speed limiter speed to 5 km/h (#5065 ) * Update fnc_speedLimiter.sqf * No minimum speed needed anymore Minimum speed limit of 10 km/h was needed in the past due to engine limitations. Multiple user tests have shown that the minimum speed is not needed anymore. The new minimum of 0 km/h allows for example setting walking speed for vehicles (<10 km/h). * Change minimum required speed for speed limiter to 3 km/h To avoid problems with negative speeds (driving backwards) and zero speed, the current change switches from 10 km/h minimum speed to 3 km/h minimum speed. This seems to be the optimal solution to allow all relevant speeds including walking speed. * Changed minimum required speed to 5 km/h Officially the minimum required speed is 10 km/h in the master. Lower minimum needed to set car speed to walking speed of accompanying soldiers. Problems have been reported with 3 kmh/ using cars like ATVs. Thus the new commit is set to 5 km/h minimum speed. Not tested with ATVs yet.	2017-05-31 15:45:02 -05:00
pokertour	38f691034e	French translation missing (#5217 ) * French translation for the two last entries * French translation for the last entrie * French Translation for the first entrie * correct the spelling error	2017-05-31 20:53:41 +02:00
PabstMirror	bdab342548	Handle escape menu with toggle iteractMenu (#5144 ) * Handle escape menu with toggle iteractMenu * Work on non-cursor menu * Close cursor menu if open when switching * Update fnc_handleEscapeMenu.sqf	2017-05-31 11:41:53 -05:00
PabstMirror	e6a291bc3b	Remove unit from laser pointer list if laser removed (#5190 )	2017-05-31 11:31:10 -05:00
PabstMirror	afe862324e	Refuel - Add setting for hose length (#5224 )	2017-05-31 11:30:48 -05:00
PabstMirror	4ad73446a6	Cleanup aircraft (#5197 )	2017-05-31 11:30:29 -05:00
Dystopian	9f291c86d8	Cargo load menu overhaul (#4871 ) * Add submenu with vehicles to cargo load menu * replace private ARRAY with keyword * fix ace function macro using * filter vehicles without cargo * add Load condition, clean params, fix param reusing * replace nearEntities with nearestObjects, add macro * optimize, del magic, replace count with forEach * del unused functions * del useless _this parameter	2017-05-31 17:02:24 +02:00
Josuan Albin	5dc8859984	Add arsenal zeus modules (#4576 ) * Add zeus arsenal modules * Add french strings to arsenal modules * Fix typo in french string * Make changes to fit review * locality check, use showMessage, set categroy	2017-05-31 08:42:45 -05:00
PabstMirror	cff86c35ba	Fix ammo count hidden in UAVs (#5222 ) * Fix ammo count hidden in UAVs * Switch to ace_reload condition	2017-05-31 08:39:32 -05:00
Phyma	95ade30d56	Linkingbelt refactoring (#5213 ) * Linking belt refatoring startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position. * Fixed requested change Fixed requested change * simplified it even more canLinkBelt now returns a value over 0 if success and -1 if something is not right. * Fixed bug where if error we would not exit Fixed bug where if error we would not exit * changed name on canLinkBelt Changed name to better reflect the function of the function. * Author hype * fixed return value info fixed return value info * fix header	2017-05-29 13:49:21 -05:00
Tim Beswick	3b7a3047cd	Refuel for non-AllVehicle objects (#5151 ) * Enabled refuel for non-AllVehicles objects. Un-magic'd refuel progress timer. * Changed helper attach position to centre of object. Offset applied when rope attached. * Made fully compatible with non-thingX simulation types. Removed destruction effects of helper object. * Using arma model. Removed ACE_Actions from helper object. * Correct use of hideObjectGlobal * Remove actions, cargo, repair on helper * Switched helper to be setVar'd on the nozzle object	2017-05-29 13:48:02 -05:00
PabstMirror	ff212d5b3d	Fix AB water vapor pressure calc (#4956 ) * Fix AB water vapor pressure calc * Fix calc in weather * Cleanup usage of constant * Add RVExtensionVersion, Rebuild AB DLLs	2017-05-29 12:55:26 -05:00
PabstMirror	58b15e4aa1	AdvThrow - Handle bugged currentThrowable (#5216 )	2017-05-29 12:55:00 -05:00
Phyma	5145b89405	Linking belt refactoring (#5206 ) * Linking belt refatoring startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position. * Fixed requested change Fixed requested change	2017-05-27 11:16:34 -05:00
PabstMirror	d615cf27fc	Adv Throw - Handle getShotParents being [] (#5210 )	2017-05-27 09:46:31 -05:00
SilentSpike	2ca3716277	Fix Zeus teleport players module (#5175 ) * Add dummy function to zeus UI modules This removes the message about the module having no function when in SP. * Fix zeus teleport module for non-local units BI made a change to the function this module was using. So now it has to be ran local to the player in question.	2017-05-26 16:07:33 +01:00
SilentSpike	24966281e7	Add realistic names to dynamic loadout classes (#5185 )	2017-05-26 07:57:46 +01:00
Andrea Verano	ca14b7f4b2	Zeus updated (#5198 ) Fixes and adds in the zeus section	2017-05-24 23:38:58 -05:00
PabstMirror	a31037bd45	Merge branch 'medical-rewrite' into medical-rewrite-restructure	2017-05-23 13:46:15 -05:00
PabstMirror	114f402c58	Merge branch 'master' into medical-rewrite	2017-05-23 13:44:57 -05:00
Andrea Verano	e3fd1612e2	Italian translation (Add & Fix) (#5193 ) Added Italian translation for: -advanced fatigue -advanced throwing -cook off -dogtags -gunbag -ui-scopes and much more... Fixed a lot of grammatical errors	2017-05-23 13:44:17 -05:00
Arcanum	22e1cdfe35	Add myself as Author	2017-05-22 22:49:27 +02:00
Arcanum	2e856063cb	Fix option in setting module	2017-05-22 22:43:03 +02:00
Arcanum	9895881ad9	Add options to disable AI going unconscious and for AI to die instantly	2017-05-22 22:16:18 +02:00
Arcanum	e3f9e65fb7	Revert "Add function to check if AI and condition from fatal" This reverts commit `31e1e2964b`.	2017-05-22 21:11:25 +02:00
Arcanum	31e1e2964b	Add function to check if AI and condition from fatal	2017-05-22 20:53:00 +02:00
PabstMirror	d4a6caf2b1	Just warn for old compat pbos (#5177 ) * Just warn for old compat pbos * Use CBA_fnc_error big warning box * fix caps	2017-05-22 13:19:43 -05:00
Arcanum	d055845201	Add vars for separate AI fatalInjuty condition	2017-05-22 19:57:02 +02:00
PabstMirror	cd5dcf56fe	Use correct TransportX type for ace items (#5168 ) * Use correct TransportX type for ace items * Fix messing with flare colors	2017-05-18 17:23:01 -05:00
PabstMirror	b192be0b70	Fix merge, cbaEvents, macros, cleanup	2017-05-18 12:42:02 -05:00
PabstMirror	46c041e6bc	Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply Conflicts: addons/attach/functions/fnc_getChildrenAttachActions.sqf addons/common/functions/fnc_dumpArray.sqf addons/common/functions/fnc_removeAllEventHandlers.sqf addons/common/functions/fnc_removeEventHandler.sqf addons/common/functions/fnc_serverEvent.sqf addons/common/functions/fnc_waitUntilAndExecute.sqf addons/explosives/functions/fnc_scriptedExplosive.sqf addons/finger/config.cpp addons/frag/config.cpp addons/interact_menu/functions/fnc_handlePlayerChanged.sqf addons/laser/functions/fnc_laserOn.sqf addons/laser/functions/fnc_seekerFindLaserSpot.sqf addons/laser/functions/fnc_unitTurretCanLockLaser.sqf addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf addons/main/config.cpp addons/main/script_mod.hpp addons/map/functions/fnc_flashlightGlow.sqf addons/maptools/functions/fnc_addLineMarker.sqf addons/maptools/functions/fnc_canDraw.sqf addons/maptools/functions/fnc_cancelDrawing.sqf addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf addons/maptools/functions/fnc_copyMapRemoteSend.sqf addons/maptools/functions/fnc_copyMapStart.sqf addons/maptools/functions/fnc_handleKeyDown.sqf addons/maptools/functions/fnc_handleMouseZChanged.sqf addons/maptools/functions/fnc_removeLineMarker.sqf addons/maptools/functions/fnc_updateLineMarker.sqf addons/missileguidance/functions/fnc_checkLos.sqf addons/missileguidance/functions/fnc_checkSeekerAngle.sqf addons/overheating/CfgWeapons.hpp addons/overheating/functions/fnc_swapBarrelCallback.sqf addons/rearm/XEH_postInit.sqf addons/rearm/XEH_respawn.sqf addons/rearm/functions/fnc_canRearm.sqf addons/rearm/functions/fnc_dropAmmo.sqf addons/rearm/functions/fnc_getMaxMagazines.sqf addons/rearm/functions/fnc_grabAmmo.sqf addons/rearm/functions/fnc_pickUpAmmo.sqf addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf addons/rearm/functions/fnc_rearmSuccess.sqf addons/rearm/functions/fnc_rearmSuccessLocal.sqf addons/rearm/functions/fnc_storeAmmo.sqf addons/repair/functions/fnc_useItem.sqf addons/tagging/CfgVehicles.hpp addons/ui/ACE_UI.hpp optionals/tracers/config.cpp	2017-05-17 18:21:11 -05:00
PabstMirror	f7d9a165f6	Disable aircraft flightmodel changes (#5167 ) * Disable aircraft flightmodel changes * Remove files	2017-05-16 21:40:24 -05:00
PabstMirror	9ba3b5aa6a	Update helmet hearing protection for RHS-US (#5146 ) * Update helmet hearing protection for RHS-US * Hearing - Add standardized helmet protection macros * Tweak peltor vol	2017-05-16 21:40:07 -05:00
Glowbal	c490fcbc5a	Merge branch 'release'	2017-05-16 22:51:28 +02:00
jonpas	5f0e6b7112	Update required Arma 3 version to 1.70	2017-05-16 14:05:23 +02:00
PabstMirror	6034a13d42	Prep 3.9.2 (version numbers)	2017-05-15 18:00:09 -05:00
PabstMirror	5da5a7cc3e	Fix gatling_30mm UBC for 1.70 (#5125 ) * Fix gatling_30mm UBC for 1.70 * Fix verEsion	2017-05-16 00:46:02 +02:00
PabstMirror	225c8d7975	Fix gatling_30mm UBC for 1.70 (#5125 ) * Fix gatling_30mm UBC for 1.70 * Fix verEsion	2017-05-16 00:45:31 +02:00
PabstMirror	941502af46	Realistic names for 1.70 pylon magazines (#5165 )	2017-05-16 00:37:58 +02:00
PabstMirror	cd0609b28d	Realistic names for 1.70 pylon magazines (#5165 )	2017-05-16 00:37:36 +02:00
PabstMirror	0498e3bae1	1.70 FCS - Remove ACE_FCS from most vics (#5152 ) * Handle 1.70 FCS * Cleanup CfgWeapons * Add warning for discreteDistance	2017-05-16 00:36:22 +02:00
jonpas	406db1928b	1.70 CMs - Remove countermeasure mode switching (#5163 )	2017-05-16 00:36:12 +02:00
PabstMirror	305c5a7be7	1.70 FCS - Remove ACE_FCS from most vics (#5152 ) * Handle 1.70 FCS * Cleanup CfgWeapons * Add warning for discreteDistance	2017-05-16 00:30:47 +02:00
jonpas	7ddb5383f3	1.70 CMs - Remove countermeasure mode switching (#5163 )	2017-05-16 00:29:52 +02:00
PabstMirror	9e1a9b9af9	Fix bad var names	2017-05-14 15:14:22 -05:00
PabstMirror	1aebae32c5	Merge branch 'master' into medical-rewrite Conflicts: addons/medical/functions/fnc_treatment_failure.sqf addons/medical/functions/fnc_treatment_success.sqf	2017-05-14 14:50:36 -05:00
PabstMirror	bfd3695868	SQF Lint Cleanup Pass (#5157 ) * SQF Lint Cleanup Pass * Fix var in TRACE * Add basic python tool * Simplify * Hit space key 6 times * Fix error in dropNozzle * handle error message exceptions * Fix py	2017-05-14 14:48:05 -05:00
PabstMirror	f69148bdc0	Disable rearm,refuel on dead vehicles (#5158 )	2017-05-13 17:36:53 -05:00
PabstMirror	0cdb2ce238	Increase max weapon index for large modsets (#5054 )	2017-05-12 13:12:39 -05:00
PabstMirror	b8a6a602f3	Disable g-forces for UAV AI (#5094 )	2017-05-12 13:12:17 -05:00
PabstMirror	3a69019c33	MapGesutres - Fix dependency on maptools (#5154 ) * MapGesutres - Use getVariable to remove dependency * Use isModLoaded	2017-05-11 14:02:21 -05:00
PabstMirror	12f42ab39a	Jerry Can - only set global var on server (#5131 )	2017-05-10 13:13:15 -05:00
Laid3acK	7c7d779250	AtragMx: BC G1 .338LM API526 (#5069 ) * Update fnc_initGunList.sqf * Update fnc_initGunList.sqf * C1 coefficient 0.58	2017-05-10 19:28:43 +02:00
Laid3acK	457461efbe	AB: Lythium latitude (#5109 ) * Update fnc_getMapData.sqf * bump1 * bump2	2017-05-10 19:28:05 +02:00
PabstMirror	c26008ad29	hitreactions - Close map on hit (#5099 )	2017-05-10 11:29:26 -05:00
Jo David	b3f03d5ffb	Zeus Suppression Module (#4977 ) * add base structure * Add getModuleDestination * Add 2d map support, debug * Cleanup, handle weapon max range * Handle non-local units * Use new showMessage func * Run on groups when placed on leader * Support for Indirect Fire Vehicles * Cleanup * Use doArtilleryFire which was fixed in 1.68	2017-05-10 11:29:04 -05:00
PabstMirror	08217f460e	Explosives - Add code handler for detonation (#5115 ) * Explosives - Add code handler for detonation * Add info to wiki * Fix cellphone in demo code, move example to wiki	2017-05-10 11:28:44 -05:00
PabstMirror	68a6782078	Switch 2 perm PFEH to everyFrame (#5140 )	2017-05-10 11:28:26 -05:00
PabstMirror	f1ee7756d4	Fix Spotting Scope Interaction Point (#5132 )	2017-05-07 16:51:34 -05:00
PabstMirror	31a81c4407	Merge branch 'master' into medical-rewrite	2017-05-06 12:01:58 -05:00
classic	777d0e6fb0	Improve Japanese translation (#5133 ) * Add the Japanese translation for cargo Add the Japanese translation for cargo, fix to html tag and few improvement * fix the Japanese transltion Fix the Japanese translation for attach. it was used wrong html tag. * changed The Japanese translation Changed the Japanese translation of azimuth angle * fix The Japanese translation Fix the Japanese translation for chemlights. it was used wrong html tag. * fix The Japanese translation Fix the Japanese translation for laserpointer. it was used wrong html tag. * Fix the Japanese translation Fix the Japanese translation for medical_blood. it was used wrong translation. * Fix the Japanese translation Fix the Japanese translation for rearm. it was used wrong translation. * add The Japanese translation add The Japanese translation to new words * Improve The Japanese translation Improve, fix and change The Japanese translation * minor fix to Japanese translation minor fix to Japanese translation. see `b1b07c5`	2017-05-06 12:01:31 -05:00
SilentSpike	6394f2b975	Fix #5081 The default values of the arrays manipulated by these functions overwrite any changes applied before settings have finished initalising. This won't be an issue after #4456 is merged in future.	2017-05-05 23:02:19 +01:00
SilentSpike	1ff6e820b2	Add 3den info to spectator template - A `displayName` shown in the 3DEN multiplayer attributes display - A `respawnTypes` array to define which respawn types the template is compatible with (currently only includes `2,3` - need to investigate compatibility with other types further).	2017-05-05 23:02:19 +01:00
SilentSpike	74399be109	Optimize spectator unit list function Making good use of the new `select` CODE syntax.	2017-05-05 23:02:19 +01:00
SilentSpike	9ee2f10f63	Simplify spectator compass code	2017-05-05 23:02:19 +01:00
SilentSpike	ec2a90f62c	Disable search on spectator unit tree Finally found out how to do this. Having search enabled on the unit tree might seem useful, but it doesn't interact well with keyboard shortcuts used for other purposes like camera control as it causes the tree to jump around unexpectedly.	2017-05-05 23:02:19 +01:00
Ozan Eğitmen	ea4a159cd2	Add Paradrop Time Coefficient Setting (#5116 ) * Add coef * Show cargo paradrop time in menu * Unary command, not a function call * If drop time is 0 don't show a progress bar * Add the setting to cargo's editor module * Swap values * Remove extra comma * Move unload message to paradrop event This way the message will show up on all paradrops, not just immidiate ones.	2017-05-05 14:02:59 -05:00
PabstMirror	c001be5b09	Add keybind to toggle interaction menu (#5095 )	2017-05-05 13:20:54 -05:00
jonpas	8dde674105	Fix jerry can refuel interaction overlapping (#5107 )	2017-05-05 13:10:50 -05:00
PabstMirror	a08ed0e307	Fix refuel nozzle dropping to ground (#5119 )	2017-05-01 18:06:34 -05:00
Zakant	79047bd2e7	Add player event handler to fix zeus problems with effects (#5022 )	2017-04-30 01:46:51 -05:00
PabstMirror	dab9772d03	Don't let flumi see these	2017-04-29 14:18:31 -05:00
PabstMirror	fdb14cea20	Fix IvBags in displayPatientInformation	2017-04-29 13:05:39 -05:00
PabstMirror	e667931626	More debug monitor stuff	2017-04-29 12:58:35 -05:00
BaerMitUmlaut	47621ac81a	Implemented status macro functions for feedback	2017-04-27 19:12:57 +02:00
BaerMitUmlaut	67f557de6a	Added status macro functions	2017-04-27 19:11:48 +02:00
BaerMitUmlaut	ac126aea28	Added more status functions	2017-04-27 19:02:23 +02:00
BaerMitUmlaut	56818ac780	Added todo for setDead next frame exec	2017-04-27 18:53:06 +02:00
BaerMitUmlaut	f12d69e231	Added proper addon basics to status, moved more functions into status	2017-04-26 22:05:40 +02:00
PabstMirror	c6fc4d0a13	Clenaup / Debug	2017-04-26 10:16:09 -05:00
PabstMirror	9139a52a38	Add more debug	2017-04-22 13:45:56 -05:00
PabstMirror	604ba50a4a	Make medical menu default enabled	2017-04-22 12:22:51 -05:00
PabstMirror	0a7033a186	Remove CfgAiSkill config changes (#5091 ) * Remove CfgAiSkill config changes * Add note to wiki about removal	2017-04-22 11:18:56 -05:00
PabstMirror	6464883852	misc cleanup, 1 sec min delay for vital loop	2017-04-22 10:57:32 -05:00
PabstMirror	d93269304d	Merge branch 'master' into medical-rewrite	2017-04-15 10:09:50 -05:00
11RDP-LoupVert	bcd73edaba	French localization complete (#5079 ) * French localization complete * STR_ACE_MapTools_drawStaightLines_description fix "l'on doit survoler le milieu du trait pour pouvoir le supprimer" * Space management alganthe : Espace en trop après référence. * Diapo alganthe : Slideshow -> diaporama Slide -> diapo * Cohesion fix alganthe : Vous avez traduit le nom du module juste au dessus (displayname). Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux. Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them. * Caisses de munitions caisse de mun -> caisses de munitions * STR_ACE_Scopes_Description Oops, forgot that one.	2017-04-12 10:39:41 +02:00
11RDP-LoupVert	a0e1205e54	(Medical) French text - minor changes (#5043 ) Minor changes due to users feedback	2017-04-12 08:40:31 +02:00
PabstMirror	8d43b899e6	Frag - Cleanup and Performance (#5010 ) * Frag - Cleanup and Performance * Add dots	2017-04-11 10:33:56 -05:00
PabstMirror	f44da354d5	Fix tagging model cache (#5055 )	2017-04-11 10:12:03 -05:00
PabstMirror	6c592e5a10	Virtual units - skip goggles/hearing effects (#4988 ) * Disable goggles and hearing fx for virtual units * Cleanup some other CBA_fnc_addPlayerEventHandler	2017-04-11 10:06:29 -05:00
PabstMirror	fb73286242	Tweak overheating (#4969 ) * Tweak overheating * Add define for constant magic num	2017-04-11 10:04:57 -05:00
PabstMirror	f0c8d5ad95	Fix FCS Vehicle Init (#5063 )	2017-04-11 10:02:59 -05:00
jonpas	fd139abb42	Use setShotParents in Advanced Throwing (#5052 ) * Use setShotParents in Advanced Throwing - close #5034 * Execute setShotParents on server (server-only command)	2017-04-11 16:59:32 +02:00
Cuel	53943c7503	Filter headless clients from zeus teleportation (#5070 )	2017-04-11 16:59:06 +02:00
commy2	a16fafd697	fix highlighted info box color (#5075 )	2017-04-11 09:41:32 -05:00
commy2	a9d562e5f7	use https for main men	2017-04-11 12:03:47 +02:00
commy2	0a0929cdc5	use https for main menu	2017-04-11 12:00:34 +02:00
commy2	8a25cd9c0c	tweak ACE main menu info box	2017-04-11 02:37:53 +02:00
BaerMitUmlaut	b89bc86e00	Added seperate vitals component	2017-04-02 00:27:50 +02:00
BaerMitUmlaut	54291b3b3b	Renamed menu to gui, moved more gui stuff into it	2017-04-01 20:45:05 +02:00
BaerMitUmlaut	676c9a5451	Added seperate status component	2017-04-01 20:41:45 +02:00
BaerMitUmlaut	3840cbdac4	Renamed UI to feedback	2017-04-01 20:31:19 +02:00
BaerMitUmlaut	c4863c756c	Moved statemachine into seperate component	2017-04-01 19:50:26 +02:00
Dystopian	83d2183f61	Fix cargo loading to locked vehicle (#5049 )	2017-04-01 00:33:36 -05:00
PabstMirror	4a24759650	Fix dagr not showing bearing in mils (#5047 )	2017-03-30 10:02:13 -05:00
11RDP-LoupVert	94826cc8d6	French loc fixes (ballistics) (#5041 ) Minor French loc fixes	2017-03-26 19:39:05 -05:00
11RDP-LoupVert	33dd0b5707	French additions (Cargo) (#5040 ) Minor French text additions	2017-03-26 19:38:18 -05:00
PabstMirror	690e415ffe	Minor cleanup	2017-03-25 11:36:37 -05:00
PabstMirror	80d7ef5b67	blood effects moved to UI	2017-03-25 11:27:18 -05:00
Zakant	1fb6521021	Added checkItem on loadout change (#5021 )	2017-03-25 11:08:47 -05:00
PabstMirror	169df1ed3b	Merge branch 'master' into medical-rewrite Conflicts: addons/medical/stringtable.xml	2017-03-25 11:03:50 -05:00
11RDP-LoupVert	fc860e7b43	French loc improvement (#5017 ) * French loc improvement (French) text as it is clutters the interface interface, making it uneasy for medic to use the it smoothly. https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png Hopefully suggested changes fixes that. There were a few typos and, in my opinion, unaccurate or missing translation. Based on French Army Field Manual, actual paramedical personnel and past work on XMedSys. * Pull 5017 with spaces instead of tabs https://github.com/acemod/ACE3/pull/5017 * Fixes a minor typo Selectioner -> Sélectionner * Duplicate entry (French) Removes a duplicate entry, didn't saw first time	2017-03-25 10:52:37 -05:00
PabstMirror	d47ea1d25a	Merge pull request #4754 from acemod/medical-rewrite-effects Medical Rewrite - Post Process Effects	2017-03-25 10:50:48 -05:00
11RDP-LoupVert	fcd57a9492	Duplicate French entry (#5032 ) Removes a duplicate French entry, didn't saw it :/	2017-03-25 10:46:23 -05:00
Zakant	466bdce9e4	Removing point	2017-03-23 18:45:46 +01:00
Zakant	14e146cbeb	Added missing dot	2017-03-23 18:44:45 +01:00
Zakant	7bd2725f29	Fixed space after if	2017-03-23 18:40:18 +01:00
Zakant	f8a2d404e2	Fixed more typos	2017-03-23 18:17:38 +01:00
Zakant	b5a48bb4dc	Fixed newline after include	2017-03-23 17:32:03 +01:00
Zakant	ff823e0590	Fixed space	2017-03-23 17:27:53 +01:00
Zakant	ad1e233a29	Fixed indentation	2017-03-23 17:27:11 +01:00
Zakant	89cf679af3	Replaces return by	2017-03-23 17:26:16 +01:00
Zakant	07033061e3	Fixed function headers	2017-03-23 17:23:18 +01:00
PabstMirror	15346d0919	Add custom CfgUIGrids for microDagr (#5014 )	2017-03-23 11:15:42 -05:00
Zakant	d47d183119	Fixed typo	2017-03-23 16:55:00 +01:00
Zakant	2cfeb5a10e	Fixed missing bracket	2017-03-23 15:30:08 +01:00
Zakant	6ed90496a2	Added calculateBlood function	2017-03-23 15:30:03 +01:00
Zakant	327124003c	Fixed condition expression	2017-03-23 15:30:01 +01:00
Zakant	f1fbf6a8eb	Removed legacy code	2017-03-23 15:29:52 +01:00
Zakant	58ed8a6c81	Modified cpr condition	2017-03-23 13:41:49 +01:00
Zakant	59c4485ef9	Only create pulse if their isn't any	2017-03-23 13:36:57 +01:00
Zakant	86bf9f4262	Fixed progress callback	2017-03-23 13:34:25 +01:00
Zakant	c790d0eb3e	Added failure callback	2017-03-23 13:32:49 +01:00
Zakant	918a62ebce	Implemented cpr failure function	2017-03-23 13:32:14 +01:00
Zakant	d815bd8bdc	Added cpr failure function and fixed PREP mistake	2017-03-23 13:30:40 +01:00
Zakant	a570a6862c	Modified CPR success to work with pulse	2017-03-23 13:28:01 +01:00
Zakant	d9aab91f97	Implemented cpr progress function	2017-03-23 13:26:06 +01:00
Zakant	b1dc4e0c52	Added progress function, reorganized PREPs	2017-03-23 13:21:36 +01:00
Zakant	0cad7d0da6	Fixed arguments and function header	2017-03-23 13:19:25 +01:00
Zakant	5714374a99	Added function to PREP	2017-03-23 13:17:04 +01:00
Zakant	477496e4f6	Added cpr start callback and function	2017-03-23 13:15:17 +01:00
Zakant	c1238501d3	Added CPRcreatePulse setting	2017-03-23 13:14:38 +01:00
Zakant	0d329e0f63	Added startCallback config entry	2017-03-23 13:03:19 +01:00
Zakant	5c89232306	Removed cardiac arrest check	2017-03-23 12:59:40 +01:00
11RDP-LoupVert	5d8cf43199	Dupplicate Polish entry (#5018 ) https://i.gyazo.com/c7557980d7d4c36709be78ef1f2c2a8f.png	2017-03-22 11:05:43 -05:00
Glowbal	bb228fa2b3	Merge branch 'release'	2017-03-21 20:49:11 +01:00
Glowbal	b143af0b8c	Prep 3.9.1 release	2017-03-21 20:42:39 +01:00
classic	67a4e4e5ab	Jpn translate to v391 (#5011 ) * jpn translate slideshow Add the Japanese translation for slideshow for v3.9.1 * jpn translate for cookoff Add the Japanese translation for cookoff of the v3.9.1	2017-03-20 12:20:45 -05:00
simpo	c162739d4f	Translation: Missing 3 strings in Polish (#5008 )	2017-03-19 23:37:36 -05:00
PabstMirror	ecbca20c3a	Recompile medical dll for x64	2017-03-18 14:03:30 -05:00
PabstMirror	46be89eda6	Cleanup	2017-03-18 11:55:40 -05:00
PabstMirror	2e61cc32e1	Locailzation, tweak fast heart rate	2017-03-18 11:53:57 -05:00
PabstMirror	e3af1b55a5	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-03-18 09:56:42 -05:00
PabstMirror	5f9f672f7f	Fix russian translation for avulsion wounds Ref #4994	2017-03-18 09:36:42 -05:00
PabstMirror	15d62ca27f	Add #4941 for rewrite	2017-03-18 09:13:08 -05:00
PabstMirror	672be73bae	Merge branch 'master' into medical-rewrite Conflicts: addons/medical/XEH_preInit.sqf	2017-03-18 09:09:45 -05:00
PabstMirror	1208e441ac	Fix unarmed sprint->prone + minor perf improvments (#4887 )	2017-03-15 10:12:07 -05:00
jonpas	b31abee4fd	Sandbags surfaces update (#4971 ) * Use private keyword, move surface blacklist to script_component.hpp * Check height above terrain * Add Tanoa surfaces, Check if in water * Use 'dust' config entry to determine surface, Add common canDig (checks dustyness) * Re-enable compile cache * Revert to surface blacklist with dust as fallback * Move surface blacklist to script_component because SQF validator complains	2017-03-15 10:11:37 -05:00
PabstMirror	9e27960b86	Add rearm config for Nemmera (#4992 )	2017-03-15 10:10:53 -05:00
commy2	c51b755770	also fix cooking off ammo boxes	2017-03-15 09:09:42 +01:00
commy2	371caaa623	Fix cookoff desynch, fix #4900 Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.	2017-03-15 09:09:02 +01:00
commy2	81f3387dbb	Merge pull request #4991 from acemod/fix-cookoff-2 also fix cooking off ammo boxes	2017-03-14 10:09:13 +01:00
commy2	2c4f286593	also fix cooking off ammo boxes	2017-03-14 10:08:06 +01:00
commy2	2334d501d0	Fix cookoff desynch, fix #4900 Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.	2017-03-14 10:04:56 +01:00
Glowbal	71d9694eb6	Prep 3.9.1 release	2017-03-13 20:48:02 +01:00
jonpas	27ef320542	Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985 )	2017-03-13 20:43:55 +01:00
Mark Ruffner	6403132a9b	Add validation on group id for map gesture color mapping (#4976 )	2017-03-13 20:43:06 +01:00
PabstMirror	11de1326ef	Cleanup use of ACE_HashLocation (#4975 )	2017-03-13 20:42:43 +01:00
PabstMirror	d18ad0c087	Give options menu list focus (#4965 )	2017-03-13 20:42:25 +01:00
PabstMirror	d9be3c0ffc	Fix rangecard not showing wind/lead (#4964 )	2017-03-13 20:42:05 +01:00
J3aLeiNe	ca5f3fa1cf	Update maps' latitude (#4961 ) - add Dingor - add MSKE 2017 - add G.O.S Leskovets - add Trung Si - add I44: Omaha v2 - add I44: Neaville and Neaville (Winter) - add I44: Battle of the Bulge	2017-03-13 20:41:37 +01:00
PabstMirror	43786786de	Fix gforce avg on switching to aircraft (#4955 ) * Fix gforce avg on switching to aircraft * Dont use for-loop for neutral g-forces array	2017-03-13 20:41:14 +01:00
jonpas	ca4060b852	Require CBA v3.2.1 (#4954 ) Conflicts: addons/main/script_mod.hpp	2017-03-13 20:40:52 +01:00
PabstMirror	a1853e0d52	Fix intergrated scopes (#4945 )	2017-03-13 20:40:11 +01:00
PabstMirror	76e9b132d7	Add RHS GREF compat for RKG-3 grenade (#4944 )	2017-03-13 20:39:42 +01:00
PabstMirror	bda09296ed	Fix lost magazines when restoring gunbag mags (#4942 )	2017-03-13 20:39:24 +01:00
PabstMirror	1952dc5798	Reload medical configs into extension on save load (#4941 )	2017-03-13 20:39:01 +01:00
PabstMirror	2c7a5fee76	Fix setVariablePublic reseting to old values (#4938 ) * Fix setVariablePublic reseting to old values * Don't drop delay time	2017-03-13 20:38:41 +01:00
PabstMirror	863d54973d	Verify params in atragmx profile gunlist (#4917 )	2017-03-13 20:38:12 +01:00
PabstMirror	19e1a1f4c5	Pass map gestures draw by reference (#4914 )	2017-03-13 20:37:47 +01:00
PabstMirror	0c479859af	Hide earplug actions if setting disabled (#4913 ) * Hide earplug actions if setting disabled * Add lines that are new	2017-03-13 20:37:29 +01:00
Mark Ruffner	cd526b7f5e	Medical/Repair 3den Toolbox State Fix (Bug fix for #4902 ) (#4905 ) * Update medical/repair 3den away from missionNamespace * Simplify save	2017-03-13 20:37:11 +01:00
Glowbal	5240c225e6	Update CBA required version (#4899 ) * prep v3.9.0 * Update required CBA version	2017-03-13 20:36:49 +01:00
PabstMirror	f3d6a4d90d	Use createSimpleObject to create tags (#4892 )	2017-03-13 20:35:39 +01:00
PabstMirror	b0741f48d7	Fix getPos order (#4889 )	2017-03-13 20:35:15 +01:00
PabstMirror	2e8651deac	Fix passenger actions - Ensure order of MainActions (#4883 )	2017-03-13 20:34:42 +01:00
commy2	bd7c8ce409	Optimize Laserpointer (#4859 ) * only process one unit every 0.1 seconds * exitWith to keep indentation low * use event to determine isIR and isTI * correctly remove units with turned on lights from their arrays * handle weaponAccessories command reporting nil Conflicts: addons/laserpointer/XEH_postInit.sqf	2017-03-13 20:33:32 +01:00
PabstMirror	e8418f6df0	Fix Javelin for AI (#4857 )	2017-03-13 20:31:16 +01:00
Dedmen Miller	1b951231da	Cache Nametags onDraw3D flags. (#4847 ) * Cache Nametag flags * Remove unused privates * Fix fading, cursorOnly mode, improve cache reset * Fix header	2017-03-13 20:30:53 +01:00
Ozan Eğitmen	d3af5f0e64	New Function to Show BIS Style Curator Messages (#4844 ) * Add showMessage fnc that shows BIS curator messages * Add documentation * Make function simpler * Modify to fir new syntax * Handle non-string args	2017-03-13 20:29:39 +01:00
Ozan Eğitmen	2554aba559	Frag Superanal Cleanup (#4803 ) * Minimal frag cleanup * Why did this even happen in the first place Conflicts: addons/frag/functions/fnc_frago.sqf	2017-03-13 20:28:58 +01:00
PabstMirror	a2f1a4684e	Generic cycle attack profile key for missile guidance (#4787 ) * Generic cycle attack profile key for missile guidance * Add hint for weapons without huds * Fix Korean strings * Cleanup	2017-03-13 20:25:30 +01:00
NorXAengell	e20666ba9a	French translation to "Advanced throwing" and "Advanced fatigue" (#4415 ) * French translation of "Advanced fatigue" and "Advanced throwing" Full translation of "Advanced fatigue" and "Advanced throwing". * New batch of translation/correction	2017-03-13 20:25:09 +01:00
PabstMirror	a3750b3160	Pass functions by "reference" to bis event handlers (#4898 ) * Pass functions by "reference" to bis event handlers * Add Doc * Fix Conflicts: addons/laserpointer/XEH_postInit.sqf	2017-03-13 20:24:27 +01:00
Dedmen Miller	5105394f29	Prevent starting additional vital loops on full heal (#4885 )	2017-03-13 20:21:57 +01:00
J3aLeiNe	9733ddc1c0	Update CfgWeapons.hpp (#4893 )	2017-03-13 20:21:10 +01:00
sbng-PAPA	11b4a4a2bc	More accurate Korean translate for medical (#4897 )	2017-03-13 20:20:46 +01:00
jonpas	f0977a18ac	Fix multiple slideshows sub-actions, Add set name setting (#4904 ) * Fix all slides being in multiple slideshows setup, Use private keyword * Add setting for slides main interaction name * Update Slideshow documentation * Add not about new argument added in version	2017-03-13 20:20:23 +01:00
PabstMirror	32c5d1c80c	Add getInteractionDistance and fix VTOL refuel/arm (#4882 )	2017-03-13 20:19:51 +01:00
PabstMirror	d3bfcf0aa9	Fix MUL macros (#4888 ) Conflicts: addons/frag/functions/fnc_frago.sqf	2017-03-13 20:19:16 +01:00
jonpas	5ef06590cc	Fix double single quote to single double quote (#4876 )	2017-03-13 20:16:56 +01:00
PabstMirror	796eba5297	Handle changes to CBA_fnc_addPlayerEventHandler (#4878 ) * Handle changes to CBA_fnc_addPlayerEventHandler * Fix var spelling	2017-03-13 20:16:35 +01:00
commy2	d2bcfe02b5	fix HK416 name, fix #4873 (#4874 )	2017-03-13 20:15:40 +01:00
jonpas	43dc1f020e	Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985 )	2017-03-11 22:49:54 -06:00
PabstMirror	d313d53b02	Fix gforce avg on switching to aircraft (#4955 ) * Fix gforce avg on switching to aircraft * Dont use for-loop for neutral g-forces array	2017-03-09 16:49:50 -06:00
PabstMirror	f3d2833b28	Fix rangecard not showing wind/lead (#4964 )	2017-03-08 19:40:48 +01:00
PabstMirror	d900871da4	Pass map gestures draw by reference (#4914 )	2017-03-08 19:34:58 +01:00
PabstMirror	c49e5bcfa0	Reload medical configs into extension on save load (#4941 )	2017-03-08 19:33:28 +01:00
PabstMirror	110bce763f	Fix intergrated scopes (#4945 )	2017-03-08 19:31:26 +01:00
PabstMirror	19af072c99	Give options menu list focus (#4965 )	2017-03-08 19:26:05 +01:00
Mark Ruffner	acf422b774	Add validation on group id for map gesture color mapping (#4976 )	2017-03-08 09:58:29 -06:00
PabstMirror	0841c05a6d	Cleanup use of ACE_HashLocation (#4975 )	2017-03-08 10:15:15 +01:00
PabstMirror	d403f20d71	Adjust addDamageToUnit for rewrite	2017-03-06 15:06:01 -06:00
PabstMirror	2e47bad280	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-03-02 18:01:40 -06:00
PabstMirror	8ad3571d19	Merge branch 'master' into medical-rewrite	2017-03-02 18:00:34 -06:00
sbng-PAPA	e2c04a80c4	More accurate Korean translate for medical (#4897 )	2017-03-02 17:48:48 -06:00
Ozan Eğitmen	3aa55b1452	New Function to Show BIS Style Curator Messages (#4844 ) * Add showMessage fnc that shows BIS curator messages * Add documentation * Make function simpler * Modify to fir new syntax * Handle non-string args	2017-03-02 17:47:49 -06:00
Dedmen Miller	512592b79d	Prevent starting additional vital loops on full heal (#4885 )	2017-03-02 17:22:16 -06:00
J3aLeiNe	6ce9ede1b5	Update maps' latitude (#4961 ) - add Dingor - add MSKE 2017 - add G.O.S Leskovets - add Trung Si - add I44: Omaha v2 - add I44: Neaville and Neaville (Winter) - add I44: Battle of the Bulge	2017-03-02 14:00:18 -06:00
J3aLeiNe	dd76a91844	Update CfgWeapons.hpp (#4893 )	2017-02-28 19:14:01 -06:00
jonpas	b9fa3e404d	Require CBA v3.2.1 (#4954 )	2017-02-27 14:22:45 -06:00
jonpas	bc70571765	Use CBA Accessory Functions for Laser mode switching (#4855 ) * Use CBA Accessory Functions for Laser mode switching * Use CBA ACC EH to prevent switching to unusable lzr (#4860) * Use CBA ACC EH to prevent switching to unusable lzr * Re-call CBA_accessory_fnc_switchAttachment * Require CBA 3.2.0	2017-02-25 17:16:40 +01:00
PabstMirror	287d3b475b	Add RHS GREF compat for RKG-3 grenade (#4944 )	2017-02-24 19:21:42 -06:00
PabstMirror	0bc1e12775	Verify params in atragmx profile gunlist (#4917 )	2017-02-24 19:20:27 -06:00
PabstMirror	02ea214ade	Fix setVariablePublic reseting to old values (#4938 ) * Fix setVariablePublic reseting to old values * Don't drop delay time	2017-02-24 19:19:39 -06:00
PabstMirror	e41fbcb0fd	Fix lost magazines when restoring gunbag mags (#4942 )	2017-02-24 19:19:05 -06:00
jonpas	1590948b92	Fix multiple slideshows sub-actions, Add set name setting (#4904 ) * Fix all slides being in multiple slideshows setup, Use private keyword * Add setting for slides main interaction name * Update Slideshow documentation * Add not about new argument added in version	2017-02-24 14:08:18 +01:00
PabstMirror	97ec22bd9a	Switch heartbeat to waitAndExec, allow switching pain settings	2017-02-18 22:11:40 -06:00
PabstMirror	34f87f89bb	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-02-18 18:24:03 -06:00
PabstMirror	0d4aa8197a	Fix moved KR wounds strings	2017-02-18 18:22:23 -06:00
PabstMirror	c7b60d1777	Merge branch 'master' into medical-rewrite	2017-02-18 18:17:37 -06:00
Mark Ruffner	0900bf964b	Medical/Repair 3den Toolbox State Fix (Bug fix for #4902 ) (#4905 ) * Update medical/repair 3den away from missionNamespace * Simplify save	2017-02-18 12:27:36 -06:00
PabstMirror	9d128152a3	Hide earplug actions if setting disabled (#4913 ) * Hide earplug actions if setting disabled * Add lines that are new	2017-02-16 10:16:46 -06:00
Glowbal	19d5fa0a4e	Update CBA required version (#4899 ) * prep v3.9.0 * Update required CBA version	2017-02-14 16:53:35 -06:00
Glowbal	283c372291	Merge branch 'release'	2017-02-14 22:43:31 +01:00
Glowbal	df693d69b6	Prepare v3.9.0 release	2017-02-14 21:25:22 +01:00
PabstMirror	dfca4fdcf8	Pass functions by "reference" to bis event handlers (#4898 ) * Pass functions by "reference" to bis event handlers * Add Doc * Fix	2017-02-14 10:54:37 -06:00
PabstMirror	036bb0ecd4	Use createSimpleObject to create tags (#4892 )	2017-02-14 10:54:21 -06:00
NorXAengell	1be278fbda	French translation to "Advanced throwing" and "Advanced fatigue" (#4415 ) * French translation of "Advanced fatigue" and "Advanced throwing" Full translation of "Advanced fatigue" and "Advanced throwing". * New batch of translation/correction	2017-02-11 15:16:56 -06:00
PabstMirror	33b19f7b4c	Fix MUL macros (#4888 )	2017-02-11 15:07:10 -06:00
PabstMirror	f678f4a3b1	Fix getPos order (#4889 )	2017-02-10 21:23:33 -06:00
PabstMirror	159e762576	Handle changes to CBA_fnc_addPlayerEventHandler (#4878 ) * Handle changes to CBA_fnc_addPlayerEventHandler * Fix var spelling	2017-02-10 13:03:12 -06:00
PabstMirror	78a55d4436	Generic cycle attack profile key for missile guidance (#4787 ) * Generic cycle attack profile key for missile guidance * Add hint for weapons without huds * Fix Korean strings * Cleanup	2017-02-10 13:01:17 -06:00
PabstMirror	70f4dd3e6b	Fix passenger actions - Ensure order of MainActions (#4883 )	2017-02-10 12:49:10 -06:00
commy2	97a0624375	Optimize Laserpointer (#4859 ) * only process one unit every 0.1 seconds * exitWith to keep indentation low * use event to determine isIR and isTI * correctly remove units with turned on lights from their arrays * handle weaponAccessories command reporting nil	2017-02-10 12:47:08 -06:00
PabstMirror	3ce0865913	Add getInteractionDistance and fix VTOL refuel/arm (#4882 )	2017-02-10 12:34:51 -06:00
Ozan Eğitmen	d2ee1e987a	Frag Superanal Cleanup (#4803 ) * Minimal frag cleanup * Why did this even happen in the first place	2017-02-10 12:28:27 -06:00
Dedmen Miller	5351b43ff3	Cache Nametags onDraw3D flags. (#4847 ) * Cache Nametag flags * Remove unused privates * Fix fading, cursorOnly mode, improve cache reset * Fix header	2017-02-10 12:19:14 -06:00
PabstMirror	4433f6eb38	Merge branch 'master' into medical-rewrite	2017-02-08 10:32:22 -06:00
jonpas	b2986cea8a	Merge branch 'master' into armake	2017-02-07 03:51:29 +01:00
PabstMirror	231346a199	Fix Javelin for AI (#4857 )	2017-02-05 23:01:48 +01:00
commy2	10756ff02d	fix HK416 name, fix #4873 (#4874 )	2017-02-05 23:01:06 +01:00
jonpas	4d872b84b7	Fix double single quote to single double quote (#4876 )	2017-02-05 23:00:35 +01:00
Glowbal	c0c41667e7	prep v3.9.0	2017-02-05 13:48:09 +01:00
Dystopian	06f99f044c	Fix deprecated AW159 and CH-47I config (#4726 )	2017-02-02 17:45:32 -06:00
commy2	9d68fbf987	fix script error caused by new arguments passed to handleDamage (#4866 ) * fix script error caused by new arguments passed to handleDamage * Copy array to not break other handleDamage ehs * Resize to 7	2017-02-02 13:03:13 -06:00
BaerMitUmlaut	0c6eec8485	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-01-30 21:34:51 +01:00
BaerMitUmlaut	60c57a7f20	Fix unconscious state in cardiac arrest	2017-01-30 21:22:10 +01:00
BaerMitUmlaut	9d3807e7c2	Fixed div by zero	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	7ff753c3c2	Fixed missing semicolon	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	20cf30a7c6	Moved heart beat sounds to medical ui	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	ecbe429f9d	Fixed missing private	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	e447d5c222	Added bleeding effect	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	9cef8ea591	Save pain next tick in GVAR instead of on unit	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	1dc301e023	Added ACE2 like repeated eye opening when unconscious, fixed going into Zeus while waking up	2017-01-29 21:59:24 +01:00
ulteq	04b720f5bc	Make use of EFUNC(medical,getPainLevel)	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	57cacf63fa	Rewrote unconscious effect	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	26627a451e	Tweaked pain effect (longer flashes/pulses)	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	13ef6b0d29	Fixed blood volume effect	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	751c7ff959	Fixed default blood volume	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	9eba2bd448	Added visual effects	2017-01-29 21:59:24 +01:00
Dorbedo	aa393ccf92	typo in ace_interaction_fnc_getDoorAnimations (#4854 )	2017-01-28 13:43:42 -06:00
Dystopian	b30705661c	add real name for civilian kamaz trucks (#4851 )	2017-01-23 12:14:55 -06:00
Neviothr	9b36ccadcc	Aircraft cleanup (#4818 ) * Cleanup * Returned lines between classes * Add files via upload	2017-01-23 12:13:37 -06:00
PabstMirror	e9b5bde371	Add ace_setting for scaling cookoff effect length (#4842 ) * Add getVar for scaling cookoff effect length * Switch to ace_setting * Add notes about merging settings	2017-01-23 12:13:02 -06:00
Dystopian	7cdf2d75a3	fix win newline in repo (#4849 )	2017-01-23 00:56:52 +01:00
Dystopian	d5d8413ee9	fix kamaz medical can repair (#4850 )	2017-01-22 10:39:02 -06:00
ViperMaul	ba810a22e6	Tab clean up.	2017-01-19 18:38:51 -06:00
ViperMaul	ad2e3719b4	Adding Normal to Common stringtable	2017-01-19 17:31:29 -06:00
ViperMaul	567c9129b2	cleanup	2017-01-19 17:23:54 -06:00
ViperMaul	59c58b1269	Add settings function handler	2017-01-19 17:19:54 -06:00
ViperMaul	8db5d8f2ae	Change Setting from Basic to Normal and Stringtable moves	2017-01-19 15:46:44 -06:00
ViperMaul	6972af9d0b	Settings and string changes	2017-01-19 15:30:27 -06:00
ViperMaul	1078913d2a	Stringtable changes.	2017-01-19 15:29:33 -06:00
ViperMaul	69dc3ba12e	Add Settings to Medical Settings Module	2017-01-19 11:48:34 -06:00
jonpas	b7f36ffd12	Add orange map chemlight entry (#4839 )	2017-01-18 18:18:28 -06:00
PabstMirror	120ddd94de	Merge branch 'master' into medical-rewrite	2017-01-17 18:03:28 -06:00
ViperMaul	5deb305906	Fix ace_gunbag track named properties (#4838 )	2017-01-17 18:03:27 -06:00
Grzegorz	15f2e6b2fe	PL translation 3.9.0 (#4821 ) * translate/fix cookoff PL translation * translate/fix laser/map PL translation * fix/translate maptools PL translation * fix/translate medical_blood PL translation * fix scopes PL translation * fix zeus PL translation * translate overpressure	2017-01-17 15:33:22 -06:00
PabstMirror	4f3f847930	Fix ace_track named properties (#4837 ) * Fix ace_track named properties * Fix 4 more	2017-01-17 15:32:14 -06:00
jonpas	3ac00f2e21	Fix medical typo 'to' -> 'too' (#4824 )	2017-01-17 15:26:07 -06:00
PabstMirror	a32478adfb	Merge branch 'master' into medical-rewrite	2017-01-17 13:10:18 -06:00
Neviothr	ade87adf46	Modules Cleanup (#4813 ) * Cleanup * Added newlines	2017-01-14 15:47:03 -06:00
bux	3f00da7365	decrease concertina "dismount" time, use ace checks (#4812 ) IRL it’s just pushing them together again	2017-01-13 13:43:54 -06:00
Dedmen Miller	6c12444d85	Fixes #4814 (#4815 ) Doesn't fix the core issue behind #4814 but it fixes the issue that bothered me so much that i reported this.	2017-01-11 15:54:03 -06:00
PabstMirror	39181fdea5	Simplify huntIR configs using += (#4521 ) * Add huntIR magazine to GL_3GL_F via sub config * Cleanup RHS 40mm huntIR GL config * Add huntir to standalone m320 - #4199	2017-01-09 12:11:31 -06:00
PabstMirror	8752b03c12	Hearing - player only event handlers (#4727 )	2017-01-09 12:10:52 -06:00
PabstMirror	bce0913019	Cookoff - add function to get ammo (#4779 ) * Cookoff - add function to get ammo Fix #4565 - Function adds virtual ammo for rearm vehicles Remove FUNC(secondaryExplosions) - which duplicatd detonateAmunition Tweak timeBetweenAmmoDetonation calculation to use all ammo, not just the current mag Allow GVAR(enableAmmoCookoff) effect to work with GVAR(enable)=false * Fix header * Cleanup getting ammo from turrets	2017-01-04 15:35:54 -06:00
classic	0046ba4bbb	fix Japanese translation for #4785 (#4804 ) "j" is replace by a "J"	2017-01-04 16:37:00 +01:00
J3aLeiNe	2dcd79fd1d	Update MapData (#4786 ) * Update Map data - Add IFA3LITE maps - Add CSA38 map - Add Beketov map - Add Winter Panthera map - Add Nam and Mogadishu maps - Add Uhao island map * Update fnc_getMapData.sqf - Add X-Cam-Taunus map - Add Unsung 3.1 Delta maps	2017-01-02 21:32:58 -06:00
BaerMitUmlaut	0a05401e74	Fix cookoff locality issues (#4799 ) * Fix locality issue with box cookoff * Add grenade fired EHs on hcs and dedis	2017-01-02 17:55:44 -06:00
classic	9d37d91c71	Jpn translation for overpressure #4770 (#4785 ) Japanese translation for #4770	2017-01-02 17:54:51 -06:00
jtj5283449	d4855a7ff3	Korean Translation v1.0 (#4794 ) * Add files via upload * Add files via upload * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml. * Fix encoding	2017-01-02 17:52:01 -06:00
jonpas	e296c12b30	Remove duplicated Zeus strings	2017-01-02 16:16:37 +01:00
Skully71	9b22f94374	Ensure movingToInjured is false whenever _target no longer needs healing, fixes #4797 (#4800 )	2017-01-02 14:02:43 +01:00
markooff	0c069a6bd2	polish translations (#4734 ) * some extra polish translations for details see polish_translations_readme_markooff.txt * file was deleted as it wasn't the part of the mod (only for information reason)	2017-01-02 13:21:47 +01:00
PabstMirror	3cd80a42d7	Fix cruise heigh on close shots (#4795 )	2016-12-29 15:04:19 -06:00
PabstMirror	c22fce273f	Overpressure changes (#4770 ) * Add setting to overpressure * Change overpressure on 2a70 cannon Close #4691 Also fix gl smoke causing frag * Handle 2a28 cannon * Fix base class	2016-12-22 13:29:05 -06:00
bux578	886e23791f	Merge pull request #4774 from classicarma/fix-jpn-translate-v383 Fix jpn translate v383	2016-12-17 15:59:50 +01:00
classic	6a93f58b52	added missing localization in jpn translation added missing localization in jpn translation	2016-12-17 20:50:19 +09:00
classic	552e9ecd87	fix jpn translation for ballistics fix html tag in the japanese translation.	2016-12-17 20:39:57 +09:00
PabstMirror	988c5b0a25	Minor wind deflection optimization (#4762 )	2016-12-16 08:08:10 +01:00
bux578	d8fec7fbe3	improve german translation for entrenchment tool (#4769 )	2016-12-15 13:42:13 -06:00
ulteq	1e79f35e43	Always visualize bandaged wounds * Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled	2016-12-15 15:01:02 +01:00
ulteq	0ddfd5eb16	Disable wound reopening when advanced bandages are disabled	2016-12-15 14:51:24 +01:00
ulteq	70a2dc30e7	Refactored 'showPainInMenu' setting * showPainInMenu -> on/off switch * medicSetting_PainVisualization -> 3 way switch on who can see it	2016-12-15 14:45:58 +01:00
ulteq	cc19499e8f	fieldDressing -> FieldDressing	2016-12-15 14:06:09 +01:00
ulteq	9ddaa01462	Always allow the use of tourniquets * Even when advanced bandages are turned off	2016-12-15 14:05:08 +01:00
ulteq	91cbc0e4d4	Added new setting 'advancedDiagnose' * Which allows to choose between the old basic- and advanced diagnose actions	2016-12-15 14:00:09 +01:00
classic	0842481c2f	fix for jpn translate in medical_menu Delete unnecessary the HTML tags in line 134	2016-12-15 20:58:21 +09:00
ulteq	0de405fe2a	Fix morphine when advanced medication is disabled	2016-12-15 12:58:06 +01:00
Ozan Eğitmen	ef4d289836	Add Zeus Module for FRIES (#4597 ) * Initial commit * Revert unrelated changes * Add newline * Fix undefined var, localize text * Shorten strings, add missing parameters * Fix logical error * Fix capitalization, Update string, Only add EH on server * Add missing uses of the private command * Remove excess formatting * Add module category	2016-12-14 23:55:06 -06:00
Dedmen Miller	c009000bd9	Use new private syntax for winddeflection PFH (#4761 )	2016-12-14 23:29:07 -06:00
ulteq	65f0f56474	Implemented 'showPainInMenu'	2016-12-14 21:30:28 +01:00
ulteq	8146cb427e	Revert "Implemented 'showPainInMenu' logic" This reverts commit `964711a38b`.	2016-12-14 21:23:26 +01:00
ulteq	0d0cf38028	Fix bandage reopening classname/category lookup	2016-12-14 21:17:39 +01:00
PabstMirror	5379503772	Fix deadman range, fix clacker transfer, use setShotParents (#4689 )	2016-12-14 14:06:32 -06:00
ulteq	e817e13cfd	Only call 'handleIncapacitation' when it makes sense * Minor injuries should not trigger incapacitation	2016-12-14 21:02:24 +01:00
ulteq	964711a38b	Implemented 'showPainInMenu' logic	2016-12-14 20:55:03 +01:00
ulteq	196a3999a4	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-12-14 20:44:22 +01:00
ulteq	151d4a4bfe	Settings overhaul New settings: * allowSelfIV * showPainInMenu Converted CBA -> ACE Settings: * advancedBandages * advancedMedication * fatalInjuryCondition * cardiacArrestTime Fixed settings: * useLocation_Epi * medicSetting_Epi * painCoefficient	2016-12-14 20:44:06 +01:00
Dystopian	4f20d1f7c6	add rearm to Vehicle Ammo boxes (#4750 )	2016-12-14 13:18:04 -06:00
Dystopian	cc3b669fcd	Fix missing refuel menu on static fuel stations (#4533 ) * fix static fuel stations * Directly compile menus and remove XEH from buildings	2016-12-14 12:48:00 -06:00
PabstMirror	af4b3e31e1	Minor iv optimization	2016-12-14 11:50:31 -06:00
ulteq	dafefda04a	Fixed typo Closes: https://github.com/acemod/ACE3/pull/4697	2016-12-14 18:33:36 +01:00
ulteq	a2b964a993	Fixed bandage config lookup	2016-12-14 18:04:56 +01:00
ulteq	5d3f97ace7	Fix IV Bags work on limbs with a tourniquet applied	2016-12-14 12:36:51 +01:00
Glowbal	c8ef10341e	Merged branch release-v3.8.3 into master	2016-12-13 23:14:12 +01:00
Glowbal	0df98f794c	Prep 3.8.3	2016-12-12 19:50:16 +01:00
PabstMirror	06caea825b	AdvThrow - Make sure ammo setVar is not empty (#4743 )	2016-12-12 19:33:34 +01:00
commy2	757ab78191	fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742 )	2016-12-12 19:33:05 +01:00
PabstMirror	11b464b585	Fix blood drop selection if blood loss is high close #4739	2016-12-12 19:32:23 +01:00
PabstMirror	de34d57d5b	Update SMG_02 base class for 1.66 (#4718 )	2016-12-12 19:31:52 +01:00
PabstMirror	14c7e9af17	AF - Remove setVar when removing eh	2016-12-12 19:30:58 +01:00
Glowbal	b72541df23	Jpn translation v382 (#4710 ) * jpn scopes translation this is Japanese translation for scope * fix jpn weather translation Fix for Weather japanese translation * fix jpn Repair translation fix jpn Repair translation * jpn zeus translation Japanese localization for zeus	2016-12-12 19:29:58 +01:00
ulteq	6b611ffbbd	Cleanup: 'handleBandageOpening'	2016-12-10 16:36:36 +01:00
ulteq	a3fd916d21	Do not restore blood volume in partial heal	2016-12-10 16:30:05 +01:00
ulteq	1bc1865313	Minor cleanup: 'treatmentBandageLocal'	2016-12-10 15:39:03 +01:00
ulteq	852f78b801	Classify the perceived pain intensity on all patient information outputs Fixes: #2117	2016-12-10 15:24:20 +01:00
PabstMirror	a451ad356e	Close patient display when interaction menu closes	2016-12-09 21:35:26 -06:00
PabstMirror	c2f9010183	opps	2016-12-09 21:29:23 -06:00
PabstMirror	3907d2dc9f	Cleanup moved functions	2016-12-09 21:27:42 -06:00
PabstMirror	b87bdfe14a	Fix body-bag action / cleanup	2016-12-09 21:03:52 -06:00
PabstMirror	ee864b2c46	Fix medkit string, fix overpressure	2016-12-09 13:48:54 -06:00
ulteq	05b9208d3c	Change debug	2016-12-09 18:43:32 +01:00
ulteq	03f9ba1bad	Improved simulation of tourniquet pain: * Made use of the new pain level helper function	2016-12-09 17:48:27 +01:00
ulteq	ada43148e9	Removed deprecated revive settings	2016-12-09 17:07:05 +01:00
ulteq	bfda932384	Different max. bleeding rates for different body parts	2016-12-09 15:54:33 +01:00
ulteq	0a81baf498	Better and simpler bleeding rate calculation	2016-12-09 14:11:07 +01:00
ulteq	a809047ac4	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-12-09 12:57:42 +01:00
ulteq	82e88061fc	Added 'DEFAULT_HEART_RATE' constant	2016-12-09 12:57:27 +01:00
PabstMirror	cc6150303f	Add setting for blood bag flow rate (#4751 )	2016-12-09 11:33:01 +01:00
ulteq	31bc54ff33	Further improved the wound merging logic	2016-12-09 10:55:24 +01:00
PabstMirror	c431a7d236	Ignore UAV AI hitpoints	2016-12-08 15:53:52 -06:00
ulteq	c486f17539	Implemented Medkit (works like in ACE2)	2016-12-08 18:11:24 +01:00
BaerMitUmlaut	a48d271368	Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits Introduce small variation to length of cardiac arrest	2016-12-08 14:22:11 +01:00
ulteq	3b82510751	Merge new wounds into existing wounds whenever possible * Todo: separate 'amountOf' into two variables (wound count and bandage percentage)	2016-12-08 12:59:30 +01:00
ulteq	b81a5adcb9	Renamed 'healTime' calculation helper	2016-12-08 12:30:59 +01:00
ulteq	9dee5a9083	Don't remove wounds on partial heal	2016-12-08 12:16:11 +01:00
ulteq	beb1c7036c	Removed todo flag	2016-12-08 11:55:38 +01:00
ulteq	280943cb4d	Fixed occluded medication (tourniquet removal logic)	2016-12-08 11:54:59 +01:00
ulteq	78bfc0c26d	Simplified damage storage	2016-12-08 11:38:43 +01:00
ulteq	627ea0ebdc	Dynamically translate different wound types * Brings back minor, medium, large wounds	2016-12-07 21:56:13 +01:00
ulteq	89c68364ef	Fix pain suppression not affecting 'setCustomAimCoef'	2016-12-07 19:51:28 +01:00
ulteq	708ac207fd	Make Avulsions even less likely	2016-12-07 19:10:12 +01:00
ulteq	6ce1910a96	Fix partial heal	2016-12-07 18:53:12 +01:00
ulteq	66803a4b4d	Fix damage coloring	2016-12-07 18:53:04 +01:00
ulteq	8c5da66c43	Increase "basic medication" effectiveness of morphine	2016-12-07 18:41:42 +01:00
ulteq	74fefb6f69	New body part colors: * Red bleeding * Blue tourniquet * Yellow/Orange damage	2016-12-07 18:28:35 +01:00
ulteq	7f1678b7e6	Increased wake up chance	2016-12-07 18:19:35 +01:00
ulteq	0c8ebd6441	Slightly increase Tourniquet 'treatmentTime'	2016-12-07 17:56:59 +01:00
ulteq	4da07bd2a4	Attemp to reduce 'Avulsion' likelihood	2016-12-07 17:47:02 +01:00
ulteq	09f6f2284b	Tweaked morphine config	2016-12-07 17:46:16 +01:00
ulteq	45aa80bed7	Fix leg damage always counted as #vehiclecrash	2016-12-07 16:39:22 +01:00
ulteq	03f7451c99	Fixed incorrect debug output	2016-12-07 11:41:58 +01:00
ulteq	5db75ac746	Fixed check blood pressure did not always account for tourniquets	2016-12-07 11:32:01 +01:00
ulteq	ab7af04530	Overhauled the medication system: * Refactored the old code * Introduced 'timeTillMaxEffect' config entry for medication	2016-12-06 20:42:10 +01:00
ulteq	b2838557fa	Removed dead code 'hrCallback'	2016-12-06 18:55:54 +01:00
ulteq	02ac4c4084	Fixed minor bug in the heart rate calculation	2016-12-06 17:40:05 +01:00
ulteq	faa2b619ab	Removed overly verbose debug logs	2016-12-06 17:35:52 +01:00
ulteq	fa77fb7194	Various fixes: * Fixed medication (morphine, epinephrine, ...) * Fixed CPR * Improved heart rate simulation * Removed deprecated ace settings	2016-12-06 17:26:11 +01:00
ulteq	978a81fb0a	Removed dead code	2016-12-06 14:37:48 +01:00
ulteq	92da5c80a0	Partly fixed Medication * Brings the heart rate adjustment (due to medication) back to life * Restores the medication effect loop (needs testing)	2016-12-06 12:58:12 +01:00
ulteq	7d6edd6c41	Brought the SQF variant of the woundsHandler back (for linux servers)	2016-12-06 10:59:29 +01:00
ulteq	db547a53b7	Increased unconsciousness wake up interval	2016-12-06 10:58:43 +01:00
PabstMirror	c47772eddc	Fix stringtables	2016-12-05 19:40:26 -06:00
ulteq	46340fe8d8	Fixed accident	2016-12-05 23:03:25 +01:00
ulteq	a88be4f458	Fixed 'displayPatientInformation'	2016-12-05 23:00:02 +01:00
ulteq	624315524e	Fixed typo	2016-12-05 21:39:47 +01:00
ulteq	a5ce5b4a34	Medical Rewrite - Continued (#4744 )	2016-12-05 21:34:20 +01:00
commy2	9cba0baade	manual merge	2016-12-05 20:18:15 +01:00
commy2	a83267b2ff	manual merge	2016-12-05 20:15:16 +01:00
PabstMirror	8d1f988f5d	AdvThrow - Make sure ammo setVar is not empty (#4743 )	2016-12-02 12:44:39 -06:00
commy2	d75eeac1e4	fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742 )	2016-12-02 10:09:48 -06:00
PabstMirror	4eba77f328	Fix blood drop selection if blood loss is high close #4739	2016-12-01 20:36:10 -06:00
ulteq	3e0f85b4f1	RangeCard - Take bore height into account (#4715 )	2016-12-01 21:20:51 +01:00
PabstMirror	3566e6e7f5	Update SMG_02 base class for 1.66 (#4718 )	2016-12-01 12:05:28 -06:00
PabstMirror	321bb0bc57	Add frag definitions for remaining ammo (#4736 ) Remove rpt warning Close #342	2016-12-01 11:01:55 -06:00
ulteq	448dcddc55	ATragMX - cleanup and some fixes (#4714 ) * ATragMX - Improved the default gun profiles * Recalculated all muzzle velocities (based on 15 degrees Celsius) * Recalculated all scope base angle (based on the new muzzle velocities) * ATragMX - Removed lots of duplicate code * Introduced dynamic simulation interval (based on muzzle velocity) * ATragMX - Fixed simulation interval for the truing drop feature	2016-12-01 10:23:03 +01:00
ulteq	50e144672f	Ballistics - Cleanup (#4721 ) * Ballistics - Removed 'caliber', 'hit' and 'typicalSpeed' entries * from all vanilla ammo types * Removed all unused ammo types * Ballistics - Removed more unnecessary config entries	2016-12-01 10:21:59 +01:00
William Giokas	b9fbd2723a	Realisticweights: Updated cyrus weight Cyrus was set to weigh 300 units (~30lb?). The NATO equivalent, the Noreen Bad News (or MAR-10) weighed 130, or 13lbs, equivalent to it's real life counterpart. This just changes the weight to 140, similar to that of the SVDK, a possible real-life counterpart for this rifle.	2016-12-01 01:27:02 -06:00
BaerMitUmlaut	ac28bce578	Fixed state machine not running for units	2016-11-29 12:35:26 +01:00
PabstMirror	bc89a260ff	AF - Remove setVar when removing eh	2016-11-27 16:38:33 -06:00
ulteq	dff577d5d1	ATragMX - Simplified Coriolis calculation (#4716 )	2016-11-27 09:56:23 +01:00
classic	05ddca5b90	Jpn translation v382 (#4710 ) * jpn scopes translation this is Japanese translation for scope * fix jpn weather translation Fix for Weather japanese translation * fix jpn Repair translation fix jpn Repair translation * jpn zeus translation Japanese localization for zeus	2016-11-25 18:50:07 +01:00
ulteq	aaebdc3752	ATragMX - Minimize the integration error (#4703 ) * The goal is to keep the error below 0.1 MRAD	2016-11-25 10:29:49 +01:00
ulteq	7d22fce8da	Advanced Ballistics - New default simulation interval (#4707 )	2016-11-25 00:15:41 +01:00
ulteq	b2ba95913a	ATragMX - Truing Drop fix (#4704 ) * Fixes a bug in the truing drop feature that occurs when the zero range is greater than the truing range	2016-11-25 00:15:04 +01:00
Glowbal	050384e960	Merge branch 'release' Conflicts: docs/_config.yml docs/_config_dev.yml	2016-11-25 00:08:32 +01:00
ulteq	87b9671757	AdvancedBallistics - Abort after adjusting the muzzle velocity (#4700 ) * Always adjust the muzzle velocity when advanced ballistics is enabled	2016-11-24 00:11:25 +01:00
PabstMirror	a3c50a6c76	Add dev macro to quickly recompile functions (#4699 )	2016-11-23 13:35:25 -06:00
Glowbal	9d08ad8238	Prep 3.8.2 release	2016-11-22 18:38:58 +01:00
ulteq	dcd4137491	Fixed several bugs in the unit conversion code * Proper min, max capping for both metric and imperial units * Fixed unit conversion issues on the interpolation table input fields	2016-11-21 21:20:48 +01:00
ulteq	cb3693f664	ATragMX - Fixes possible divison through zero	2016-11-21 21:20:48 +01:00
ulteq	dbb59c8fd1	New 'overwriteZeroRange' setting	2016-11-20 09:05:42 +01:00
ulteq	bb71885b42	Added config settings to optic_Nightstalker, optic_NVS and optic_TWS	2016-11-20 09:05:42 +01:00
ulteq	273e603cad	Fix 'ACE_ScopeZeroRange' setting being ignored when placed in weapon classes * Only relevant for weapons with integrated scopes	2016-11-20 09:05:42 +01:00
ulteq	1f364da0df	Fix 'forceUseOfAdjustmentTurrets` affecting all scopes including iron sights	2016-11-20 09:05:42 +01:00
ulteq	f94b1a7a10	ATragMX - Improved gun list readability (#4674 ) * Reduced the gun list font size * Redesigned the listbox scrollbars (new colors, smaller width) * Added a negative offset for the horizontal text position in the gun list * Limited the max. allowed length of custom gun names to 14 characters	2016-11-19 18:05:26 +01:00
PabstMirror	491aaa89cb	Update laser code if laser is already on (#4677 )	2016-11-17 13:28:25 -06:00
PabstMirror	0137009060	Add RHS MELB fastrope, add 3d debuging of mem points Close #4683 Config from @Whigital	2016-11-17 20:11:18 +01:00
PabstMirror	3fc8774d49	Change mortar to ammo handling weapon on init (#4678 ) Fix #4649	2016-11-17 20:10:54 +01:00
BaerMitUmlaut	b08270742d	Tweaked fatigue in water	2016-11-17 20:10:06 +01:00
BaerMitUmlaut	60651fcb1e	Tweaked prone animation duty	2016-11-17 20:10:02 +01:00
BaerMitUmlaut	264fddd1c4	Fix AF for adjusted stances, fixes #4591	2016-11-17 20:09:10 +01:00
ulteq	f679b1d6bb	Ballistics - AmmoBox update (Apex magazines) (#4675 ) * Added 20Rnd 6.5mm Lapua Scenar / Creedmor magazines	2016-11-17 20:08:35 +01:00
PabstMirror	d14127ba4f	Use head direction for drawing microdag wp	2016-11-17 20:08:09 +01:00
PabstMirror	0669dd6568	spaces	2016-11-17 20:07:20 +01:00
PabstMirror	054831f370	Use vehicle eh to hide bar	2016-11-17 20:07:17 +01:00
PabstMirror	948442fafb	Hide bar when mounted	2016-11-17 20:07:14 +01:00
PabstMirror	8d9bd5005b	Hide advFatigue bar on map / spectator	2016-11-17 20:07:10 +01:00
PabstMirror	0909d5727e	Don't compile action menu for playable logics (#4666 ) Fix #4664	2016-11-17 20:06:19 +01:00
Daniel Jupp	fa36955ffb	Fix cargo find nearest vehicle (#4592 ) * Inital Commit * read function call change added object to exclude to function call * Removed TODO comment	2016-11-17 20:05:42 +01:00
PabstMirror	ed061d66ba	Invert logic for isRefueling	2016-11-17 20:04:53 +01:00
jonpas	c2e933355d	Prevent switching to weapon while carrying fuel nozzle - fix #4601	2016-11-17 20:04:43 +01:00
Broström.A \| Evul	e73d20f3c3	ACE_Chemlight_Shield not public (#4612 ) Changed `ACE_Chemlight_Shield` to `public` from `protected`	2016-11-17 20:03:50 +01:00
PabstMirror	1f6ce7ff81	Fix tagTestingThread error (#4662 ) Close #4659	2016-11-17 20:03:08 +01:00
SilentSpike	27cc4ed7c0	Clean some cook off code - Use unary `createVehicle` syntax - Removed some parenthesis - Simpify 3den property condition	2016-11-17 20:02:14 +01:00
SilentSpike	5976415b0d	Add cook off 3den setting to ammo boxes	2016-11-17 20:02:11 +01:00
SilentSpike	47e1444747	Fix #4630 Not all explosives detonate on destruction, so their ammo config must be checked to see if they will. ACE_Explosives adds a property to define the associated ammo which will detonate on destruction, which is used if present. Otherwise a generic small explosion happens.	2016-11-17 20:02:07 +01:00
ulteq	c756537d3d	ATragMX - Estimate bullet length instead of using a fixed value (#4651 )	2016-11-17 20:00:34 +01:00
PabstMirror	da85fc1be5	Add RHS MELB fastrope, add 3d debuging of mem points Close #4683 Config from @Whigital	2016-11-16 17:42:11 -06:00
PabstMirror	6fd561f1f0	Change mortar to ammo handling weapon on init (#4678 ) Fix #4649	2016-11-16 11:00:50 -06:00
ulteq	ba097e719f	Ballistics - AmmoBox update (Apex magazines) (#4675 ) * Added 20Rnd 6.5mm Lapua Scenar / Creedmor magazines	2016-11-16 10:49:48 +01:00
BaerMitUmlaut	14cf9817b4	Merge pull request #4672 from acemod/af-tweaks Advanced Fatigue swimming/diving/crawling tweaks	2016-11-16 06:05:48 +01:00
esteldunedain	4df561e13a	Fix airburst ammo when the ACE_FCS is not enabled (the code is not reached anyway)	2016-11-15 23:11:34 +01:00
ulteq	9641d306e6	Reused already calculated initSpeed	2016-11-15 23:11:34 +01:00
esteldunedain	4854b963db	Apply a correction to the FCS based on vanilla zeroing	2016-11-15 23:11:34 +01:00
ulteq	9fdf3ceb00	Refined the range card calculation abort conditions * Max. elevation now never exceeds 40 MRADs * Min. velocity now also depends bullet stability (e.g. lower for .408 CheyTac)	2016-11-15 23:11:22 +01:00
ulteq	16f3f2ca37	Optimized range card calculations * Removed dead code	2016-11-15 23:11:22 +01:00
ulteq	69cd53de2a	Optimized ATragMX solution calculations	2016-11-15 23:11:22 +01:00
ulteq	79d087e784	Reset scope adjustments when either the weapon or the scope change.	2016-11-15 23:11:22 +01:00
ulteq	8c49433b49	Added new ace_scopes module setting 'correctZeroing' (default on)	2016-11-15 23:11:22 +01:00
ulteq	2f23f1ca6c	Bugfix - Fixes ace_scopes affecting under-barrel grenade launchers	2016-11-15 23:11:22 +01:00
ulteq	7fa73744e9	Cleanup - partly merged #4658 * Removed getVariable QGVAR(Adjustment) boilerplate * Less calls to setVariablePublic * Removed vanilla zeroing element hiding (fixes warning in log file) * Moved settings evaluation into ace_settingsInitialized event handler	2016-11-15 23:11:22 +01:00
ulteq	10cc0ba951	Moved all zero angle calculations into the advanced_ballistics.dll * Speeds up ATragMX * Speeds up RangeCards * Speeds up Scopes	2016-11-15 23:11:22 +01:00
ulteq	789a169b0e	Allow using adjustment turrets on weapons with integrated scopes	2016-11-15 23:11:22 +01:00
ulteq	429bffd039	Moves the bore height calculation into FUNC(inventoryCheck)	2016-11-15 23:11:22 +01:00
ulteq	a687c49d2a	Adds settings module for ace_scopes * Interconnects the rangecard and scopes modules * Hides the zeroing text when the vanilla zeroing is overwritten * Makes the scopes module fully compatible with any 3rd party weapon pack without the need for addition compat pbos (though their use is still recommended)	2016-11-15 23:11:22 +01:00
ulteq	36c14c5dc4	Feature - Vanilla zeroing fix	2016-11-15 23:11:22 +01:00
BaerMitUmlaut	21502d7b7b	Merge pull request #4562 from acemod/mgCleanup Missile Guidance Overhaul	2016-11-15 19:16:04 +01:00
PabstMirror	b4315b6a65	Javelin overhaul (#4580 ) * Javelin overhaul * header spelling fix	2016-11-15 12:15:25 -06:00
SilentSpike	39582914f7	Add 10% variation to cardiac arrest time Gaussian distribution favours the average time setting. This introduces some unpredictability to cardiac arrest, but not enough to make users confused. Keeps the settings simple to again reduce confusion and improve overall UX.	2016-11-15 17:00:22 +00:00
ulteq	f0279726ce	Fixed typo (copy & paste remains) (#4673 )	2016-11-15 16:14:35 +01:00
Remco Speekenbrink	324bf68614	Add Zeus utility modules - Add categories to zeus modules to group them based on their functionality - Add new utility modules: 1. Toggle simulation 2. Update editable objects - Clean up some of the zeus module code (standardise function headers, camel case, etc.)	2016-11-15 12:07:48 +00:00
PabstMirror	4bb02a320b	Run attack profile even if no target	2016-11-14 20:19:24 -06:00
BaerMitUmlaut	1d8030d196	Tweaked fatigue in water	2016-11-14 21:55:26 +01:00
BaerMitUmlaut	e4a4d8f56d	Tweaked prone animation duty	2016-11-14 21:54:51 +01:00
ulteq	608f8bbfdc	ATragMX - Added 7.62x39mm ammo to gun profile	2016-11-14 21:01:04 +01:00
ulteq	2e81f7c104	Ballistics - Overworked .408 CheyTac based on new JBM Ballistics data * Added 419gr and 305gr variants (vanilla ammo == 419gr) * Muzzle velocities from http://www.cheytac.com * G7 BCs from http://www.jbmballistics.com/	2016-11-14 21:01:04 +01:00
BaerMitUmlaut	88596aaaf1	Merge pull request #4671 from acemod/fix-af-adj-stances Fix advanced fatigue for adjusted stances	2016-11-14 19:59:27 +01:00
BaerMitUmlaut	a4c6daef50	Fix AF for adjusted stances, fixes #4591	2016-11-14 19:24:21 +01:00
PabstMirror	95699f267c	Use head direction for drawing microdag wp	2016-11-14 12:13:41 -06:00
SilentSpike	24ada4dab3	Clarify the `maximumCardiacArrestTime` setting	2016-11-13 21:45:38 +00:00
SilentSpike	27728172ed	Clarify the `allowDeathMode` setting	2016-11-13 21:27:40 +00:00
BaerMitUmlaut	b4569f0a96	Fix bracket	2016-11-13 18:11:18 +01:00
BaerMitUmlaut	d40c3fd2bf	Merge pull request #4655 from acemod/fixStamBar Hide advFatigue bar on map / spectator / in vehicles	2016-11-13 18:06:34 +01:00
BaerMitUmlaut	27916e8455	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-11-13 18:03:12 +01:00
PabstMirror	6f640ddc45	spaces	2016-11-13 10:56:45 -06:00
PabstMirror	b3e313f52b	Use vehicle eh to hide bar	2016-11-13 10:55:57 -06:00
PabstMirror	e32bca3d14	Don't compile action menu for playable logics (#4666 ) Fix #4664	2016-11-12 19:39:40 -06:00
Daniel Jupp	3935299e3c	Fix cargo find nearest vehicle (#4592 ) * Inital Commit * read function call change added object to exclude to function call * Removed TODO comment	2016-11-12 17:52:17 -06:00
jonpas	d69b48bac5	Merge pull request #4629 from acemod/fixRefuelShooting Prevent switching to weapon while carrying fuel nozzle	2016-11-13 00:13:48 +01:00
PabstMirror	76eea8924f	Invert logic for isRefueling	2016-11-12 16:37:41 -06:00
Broström.A \| Evul	c4c98696e0	ACE_Chemlight_Shield not public (#4612 ) Changed `ACE_Chemlight_Shield` to `public` from `protected`	2016-11-12 16:19:50 -06:00
PabstMirror	ae0eab3a51	Use isEqualTo for checking seeker return	2016-11-12 16:15:42 -06:00
PabstMirror	26ae3b8075	Hide bar when mounted	2016-11-12 15:51:44 -06:00
PabstMirror	9e85508f0d	Fix tagTestingThread error (#4662 ) Close #4659	2016-11-12 15:46:29 -06:00
SilentSpike	c66f9e5144	Merge pull request #4638 from acemod/cookoff_fixes Fix ammo cook off with certain explosives	2016-11-11 17:41:42 +00:00
PabstMirror	e086a33e4d	Hide advFatigue bar on map / spectator	2016-11-10 17:49:18 -06:00
PabstMirror	5bf8b642f7	Add cargo configs for some planes (#4650 )	2016-11-10 12:05:08 -06:00
ulteq	f15522a88f	ATragMX - Estimate bullet length instead of using a fixed value (#4651 )	2016-11-10 18:35:57 +01:00
Glowbal	0394ea56b4	Increment build	2016-11-09 22:07:07 +01:00
Glowbal	3417c433fd	Prep v3.8.2	2016-11-09 22:06:48 +01:00
commy2	9e6ee0363d	fix tripflares script error (#4647 )	2016-11-09 21:56:57 +01:00
PabstMirror	0975a4f004	MedicalAI - Fix treatment animion with no weapon (#4633 )	2016-11-09 21:56:26 +01:00
ulteq	a43b70fe89	Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags * Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed	2016-11-09 21:55:39 +01:00
William Giokas	6a910e7fe4	ballistics: Added 20 round 6.5 Lapua and Creedmoor	2016-11-09 21:55:35 +01:00
ulteq	f2a85b63cf	Fixed a typo	2016-11-09 21:54:20 +01:00
ulteq	962a296710	Minor corrections in the ballistics module * Corrected AKS-U barrel length * Corrected .338 250gr BC * Corrected .338 API526 BC and muzzle velocity * Slightly reduced 5.8x42mm muzzle velocity	2016-11-09 21:54:16 +01:00
Dystopian	272ec37603	Fix Full Repair menu not shown when damage returns 0 (#4621 )	2016-11-09 21:53:21 +01:00
ulteq	c5322bff37	Fixes the ATragMX 'Done' button issue (#4617 )	2016-11-09 21:52:32 +01:00
PabstMirror	910f975276	Fix ubc	2016-11-09 21:51:11 +01:00
PabstMirror	76dbdaaecf	Add semi-colon	2016-11-09 21:51:08 +01:00
ulteq	298a90b68a	Updates the ATragMX gun list	2016-11-09 21:51:05 +01:00
ulteq	91def9396c	Updates the ballistics module to support Apex * Made the new ammo types ready for advanced ballistics * Made the new weapons ready for advanced ballistics * Recalculated all initSpeed coefficients * Updated the airFrictionAnalysis report	2016-11-09 21:51:01 +01:00
ulteq	eb6319641e	Fix Kestrel4500 wind speed calculation (#4609 )	2016-11-09 21:47:42 +01:00
PabstMirror	5463e9dff8	Merge branch 'master' into medical-rewrite	2016-11-09 13:12:42 -06:00
Dystopian	ff961a5bd6	Fix Full Repair menu not shown when damage returns 0 (#4621 )	2016-11-09 13:11:47 -06:00
Karan Singh	09b89a0bbc	Fix typo in Eden Options (#4615 ) * Fix typo in Eden Options This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp * Fix L13	2016-11-09 13:07:29 -06:00
commy2	370e746068	fix tripflares script error (#4647 )	2016-11-09 13:02:48 -06:00
PabstMirror	20f40f8c55	Use single queue for blood cleanup (#4586 )	2016-11-09 13:00:18 -06:00
BaerMitUmlaut	dac4a4dc42	Merged instant death and execution into one setting	2016-11-09 19:01:55 +01:00
BaerMitUmlaut	08a378bb2d	Added execution system, improved instant death	2016-11-08 19:37:56 +01:00
ulteq	0580bdcc8e	Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags * Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed	2016-11-08 09:34:48 +01:00
William Giokas	8c2b88da85	ballistics: Added 20 round 6.5 Lapua and Creedmoor	2016-11-08 09:34:48 +01:00
BaerMitUmlaut	928ded0e66	Fixed instant death and PREP	2016-11-07 23:46:10 +01:00
BaerMitUmlaut	ba9fc9240c	Removed traces of old state machine	2016-11-07 23:44:33 +01:00
BaerMitUmlaut	0427814961	Started transition to CBA state machine, removed revive in favour of extended cardiac arrest	2016-11-07 22:21:07 +01:00
BaerMitUmlaut	a65f1d19fa	Added state machine debug functionality	2016-11-07 22:19:55 +01:00
ulteq	51c12dba1d	Allow adding gun list entries via config	2016-11-07 16:40:34 +01:00
ulteq	3f4564605b	ATragMX - Implemented missing features * Muzzle Velocity vs. Temperature Interpolation * C1 Ballistic Coefficient vs. Distance Interpolation * Coriolis and Spin drift output * Options menu * Truing Drop --------------------------------- * Overworked default gun profiles --------------------------------- * Fixed the Cancel buttons on the gun-, atmosphere- and target columns. * Fixed some muzzle velocity entries in the default gun list. * Fixed divide by zero error in the target range estimator	2016-11-07 16:40:34 +01:00
SilentSpike	e399597678	Clean some cook off code - Use unary `createVehicle` syntax - Removed some parenthesis - Simpify 3den property condition	2016-11-06 12:29:37 +00:00
System98	6272b95acc	Update chemlight translations - Add missing commas to some chemlight-strings	2016-11-06 12:22:39 +01:00
System98	b0bf50c506	Unify and improve some german translations - unify and improve some german translations - fix a few typos	2016-11-06 10:10:36 +01:00
SilentSpike	5032619b9a	Add cook off 3den setting to ammo boxes	2016-11-05 14:48:48 +00:00
SilentSpike	7de56ad9b5	Fix #4630 Not all explosives detonate on destruction, so their ammo config must be checked to see if they will. ACE_Explosives adds a property to define the associated ammo which will detonate on destruction, which is used if present. Otherwise a generic small explosion happens.	2016-11-05 14:20:48 +00:00
System98	38be06c28c	Typo fix - fix another typo	2016-11-05 13:50:26 +01:00
System98	5376a3045b	Fix typo - Fiy typo in german translation	2016-11-05 13:43:57 +01:00
System98	7efe752f3c	Update german translation - Add missing german translations	2016-11-05 13:42:55 +01:00
PabstMirror	0746264905	MedicalAI - Fix treatment animion with no weapon (#4633 )	2016-11-04 00:01:58 +01:00
jonpas	14c9cffb6a	Prevent switching to weapon while carrying fuel nozzle - fix #4601	2016-11-02 18:44:39 +01:00
ulteq	aef7010d67	Fixes the ATragMX 'Done' button issue (#4617 )	2016-11-02 18:05:19 +01:00
ulteq	71fe9bde7d	Fixed a typo	2016-11-02 14:27:26 +01:00
ulteq	6a60770470	Minor corrections in the ballistics module * Corrected AKS-U barrel length * Corrected .338 250gr BC * Corrected .338 API526 BC and muzzle velocity * Slightly reduced 5.8x42mm muzzle velocity	2016-11-02 13:54:22 +01:00
ulteq	510622dfc9	Adds realistic names for the QBZ-95 camo variants Green Hex and Hex variants of: * QBZ-95-1 * QBZ-95-1 GL * QBZ-95-1 LSW	2016-10-31 20:35:38 +01:00
ulteq	b91c4acca8	Merge pull request #4613 from acemod/realisticnames-apex-update Adds realistic names for the QBZ-95 camo variants	2016-10-31 19:58:46 +01:00
ulteq	22ce12ec57	Merge pull request #4609 from acemod/kestrel4500-typo-fix Fix Kestrel4500 wind speed calculation	2016-10-31 12:57:24 +01:00
ulteq	2e94c40a46	Merge pull request #4616 from acemod/apex-weapon-ballistics Updates the ballistics module to support Apex	2016-10-31 12:57:02 +01:00
PabstMirror	ebd31168f4	Fix bleeding hit logic for enabledFor = 1	2016-10-30 20:45:02 -05:00
PabstMirror	866612b974	Merge branch 'master' into medical-rewrite Conflicts: addons/medical_blood/XEH_postInit.sqf	2016-10-30 20:38:30 -05:00
PabstMirror	ace24d0282	Fix ubc	2016-10-30 18:46:55 -05:00
PabstMirror	9f56ba50c1	Add semi-colon	2016-10-30 18:43:43 -05:00
jonpas	657c790ee3	Allow checking dogtags inside vehicles and when sitting (#4619 ) * Allow checking dogtag inside and when sitting * Remove redundant format	2016-10-30 21:53:14 +01:00
jonpas	2222834c43	Allow checking dogtags inside vehicles and when sitting (#4619 ) * Allow checking dogtag inside and when sitting * Remove redundant format	2016-10-30 18:54:54 +01:00
Rebel	9ac12aaee8	Blocks AI getting back into the vehicle on cookoff (#4587 ) * no message * Header. * Typo. * Less code. * New getPos syntax. * leaveVehicle seems to work. * Removed the second waypoint. * Clear previous waypoints. * Run away waypoint before others. * Use arr select code * Revert select. Use doMove.	2016-10-30 18:11:17 +01:00
commy2	357d5c119b	remove scrollbars from javelin scope (#4618 )	2016-10-30 18:10:40 +01:00
commy2	18e5fa2849	remove scrollbars from javelin scope (#4618 )	2016-10-30 14:46:31 +01:00
Rebel	e84cdef817	Blocks AI getting back into the vehicle on cookoff (#4587 ) * no message * Header. * Typo. * Less code. * New getPos syntax. * leaveVehicle seems to work. * Removed the second waypoint. * Clear previous waypoints. * Run away waypoint before others. * Use arr select code * Revert select. Use doMove.	2016-10-30 13:33:28 +01:00
ulteq	c3f967e365	Updates the ATragMX gun list	2016-10-30 12:26:15 +01:00
ulteq	14af5577c6	Updates the ballistics module to support Apex * Made the new ammo types ready for advanced ballistics * Made the new weapons ready for advanced ballistics * Recalculated all initSpeed coefficients * Updated the airFrictionAnalysis report	2016-10-30 09:02:55 +01:00
jonpas	07ebb83281	Fix PlasticCase drag direction	2016-10-29 21:37:50 +02:00
jonpas	7c4a7c2328	Fix header	2016-10-29 21:32:49 +02:00
jonpas	c08d15151e	Fix error, Set disabled collision objects to object variable	2016-10-29 21:31:54 +02:00
ulteq	0e364b0d48	Adds realistic names for the QBZ-95 camo variants Green Hex and Hex variants of: * QBZ-95-1 * QBZ-95-1 GL * QBZ-95-1 LSW	2016-10-29 13:49:24 +02:00
ulteq	7b2d736ba3	Fix Kestrel4500 wind speed calculation * Cosine was applied twice (on some screens)	2016-10-28 22:25:47 +02:00
PabstMirror	e1900d81bc	Fix bleeding hit logic for enabledFor = 1 (#4585 ) * Fix bleeding hit logic for enabledFor = 1 * Handle RC * fix	2016-10-28 22:12:38 +02:00
PabstMirror	70439aaa9d	Fix bleeding hit logic for enabledFor = 1 (#4585 ) * Fix bleeding hit logic for enabledFor = 1 * Handle RC * fix	2016-10-28 22:12:37 +02:00
commy2	eb38290aaf	cookoff ammo selections default values (#4604 ) * cookoff ammo selections default values * Add missing subTurret cache for Wheeled APCs	2016-10-28 22:10:40 +02:00
commy2	416ab31610	cookoff ammo selections default values (#4604 ) * cookoff ammo selections default values * Add missing subTurret cache for Wheeled APCs	2016-10-28 22:10:31 +02:00
PabstMirror	7a95d66085	Remove repair locization warning (#4607 )	2016-10-28 19:25:38 +02:00
PabstMirror	2df4a28145	Remove repair locization warning (#4607 )	2016-10-28 12:16:23 -05:00
jonpas	8bfcb5a1b1	Reenable collision on drop, Update function headers	2016-10-28 14:20:39 +02:00
jonpas	e400a68427	Disable collision with nearby players while carrying	2016-10-28 00:11:38 +02:00
jonpas	e83791c246	Fix carrying direction for Land_WoodenBox_F	2016-10-27 23:30:40 +02:00
jonpas	4868aacb42	Move objects with disabled simulation to ground In addition to simulation type house, disabled simulation objects will also be floating - this is usually done to prevent clipping or falling of small objects objects through objects they are placed on	2016-10-27 23:23:03 +02:00
BaerMitUmlaut	60d98df5fc	Fix makeJerryCan locality issues (#4600 )	2016-10-27 22:19:55 +02:00
BaerMitUmlaut	945adf8fef	Fix makeJerryCan locality issues (#4600 )	2016-10-27 22:19:51 +02:00
PabstMirror	8c700cfd17	Cleanup map gesture sync / color mapping (#4486 ) * Cleanup map gesture sync / color mapping - Adds ace_common_fnc_setPlayerOwner which syncs player's owner var - Redo publicVarClient with CBA's ownerEvent - Remove old ace_settings - Make color module run globaly - Ad public ace_map_gestures_fnc_addGroupColorMapping * fix return	2016-10-27 19:55:08 +02:00
PabstMirror	aeb0614e7e	Cleanup map gesture sync / color mapping (#4486 ) * Cleanup map gesture sync / color mapping - Adds ace_common_fnc_setPlayerOwner which syncs player's owner var - Redo publicVarClient with CBA's ownerEvent - Remove old ace_settings - Make color module run globaly - Ad public ace_map_gestures_fnc_addGroupColorMapping * fix return	2016-10-27 19:54:58 +02:00
Ozan Eğitmen	49b5a0ea86	Cleanup Frag Component (#4581 ) * Cleanup frag component * Optimize fnc_addTrack * Add additional cleanup * Please work? * Add more cleanup * Fix script errors * Fix/optimize spalling * Add missing changes	2016-10-27 00:16:31 +02:00
Ozan Eğitmen	029b68526f	Cleanup Frag Component (#4581 ) * Cleanup frag component * Optimize fnc_addTrack * Add additional cleanup * Please work? * Add more cleanup * Fix script errors * Fix/optimize spalling * Add missing changes	2016-10-27 00:16:28 +02:00
Glowbal	a13441fa85	Merge branch 'release' Conflicts: addons/main/script_version.hpp	2016-10-25 20:33:25 +02:00
Glowbal	e1aa5b4292	Increment build	2016-10-25 20:27:34 +02:00
Glowbal	27eb30bdd8	Prep 3.8.1	2016-10-25 20:16:16 +02:00
Glowbal	d2f485329f	Update make.py to 0.8 (#4579 )	2016-10-25 20:11:57 +02:00
jonpas	ffd1f0aff2	Update make.py to 0.8 (#4579 ) * Update make.py to 0.8 * Remove redundant extras folder obsolete handling * Fix version updating in files when version changes number of digits * Satisfy bux	2016-10-25 20:11:05 +02:00
PabstMirror	eeb482eb7e	#4557 - Fix warning about bad func type (#4582 )	2016-10-22 10:57:49 +02:00
PabstMirror	fc15ab9cf0	#4557 - Fix warning about bad func type (#4582 )	2016-10-22 10:56:26 +02:00
PabstMirror	23568609a6	Faster, non movment blocking gesture for tap shoulder (#4578 ) Close #4577	2016-10-20 23:44:34 +02:00
Glowbal	1390b845d4	Prep 3.8.1 patch	2016-10-20 19:45:40 +02:00
PabstMirror	89d6fefff1	Sanatize damage value used for blood creation (#4574 ) Fix #4571	2016-10-20 19:44:16 +02:00
PabstMirror	f2746891af	Sanatize damage value used for blood creation (#4574 ) Fix #4571	2016-10-20 19:43:52 +02:00
commy2	347be3c222	handle vehicle crashes and add wounds for fall damage	2016-10-20 15:02:24 +02:00
commy2	576a63c27e	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite	2016-10-20 13:56:56 +02:00
commy2	fc39ac14b7	don't knock out if pain is removed	2016-10-20 13:49:52 +02:00
commy2	be56b4d806	knock out due to pain	2016-10-20 13:46:28 +02:00
commy2	370faf9b48	cleanup	2016-10-20 13:38:26 +02:00
commy2	0370a34672	remove some debug	2016-10-20 12:43:57 +02:00
commy2	7e498ab762	setting for basic/advanced syringes	2016-10-20 02:14:11 +02:00
Glowbal	b150f440e6	Prep 3.8.0 Release	2016-10-18 21:57:40 +02:00
Glowbal	d867805406	Prepare v3.8.0 RC3	2016-10-18 20:25:45 +02:00
jonpas	877944ddce	Fix 3rd party air and sea vehicle fuel capacity (#4554 ) * Fix fuel capacity for air vehicles * Sea vehicles as well, minor empty classes cleanup	2016-10-18 20:21:27 +02:00
classicarma	19fe4016e5	Japanese translations (#4553 )	2016-10-18 20:19:29 +02:00
PabstMirror	63f3673a65	Missile Guidance Overhaul	2016-10-17 16:08:23 -05:00
PabstMirror	5ae8145234	Don't show dogtag ID in action menu (#4558 ) #4476	2016-10-17 10:55:42 +02:00
commy2	519ea25fc7	cleanup	2016-10-15 13:48:13 +02:00
Glowbal	d9a199b942	Increment build number	2016-10-15 11:44:43 +02:00
Glowbal	8afb3c7279	Update CBA required version	2016-10-15 11:44:26 +02:00
PabstMirror	6fce923783	Fix mortar changes for laser shootRay changes Ref #4478	2016-10-15 11:42:09 +02:00
PabstMirror	fe35e64696	Reset animation speed when not swimming (#4546 )	2016-10-15 11:41:03 +02:00
commy2	633c6f0ce4	formating	2016-10-13 21:21:42 +02:00
commy2	6b84bd1ff6	fix misc. treatment actions	2016-10-13 21:11:13 +02:00
commy2	e03614757e	fix misc. treatment actions	2016-10-13 21:08:41 +02:00
commy2	03fe2826dd	remove some debug	2016-10-13 20:31:39 +02:00
commy2	f2dfc6dc0e	fixes, tweaks	2016-10-13 20:17:21 +02:00
commy2	bc4c1787f9	show tourniquets in 3d menu	2016-10-13 19:05:29 +02:00
commy2	ba2d6fda8a	treatment tweaks	2016-10-13 17:39:01 +02:00
commy2	fe2c6e8d85	basic <-> advanced	2016-10-13 17:14:43 +02:00
commy2	68d75beae6	manual merge	2016-10-13 16:56:57 +02:00
commy2	2d243d45f3	fix tourniquets	2016-10-13 10:28:28 +02:00
commy2	e1cbeeea16	fix tourniquets	2016-10-13 10:12:28 +02:00
commy2	18907adcd5	increase medical item mass to at least 100 grams	2016-10-13 09:48:58 +02:00
commy2	5965326ca1	merge basic and adv. bandage actions	2016-10-13 09:47:52 +02:00
commy2	b1f0af7e1c	merge basic and adv. bandage actions	2016-10-13 09:10:08 +02:00
commy2	68d199c5b2	merge basic and adv. bandage actions	2016-10-13 02:05:14 +02:00
commy2	4a06d19ce4	merge basic and adv. bandage actions	2016-10-13 01:55:10 +02:00
commy2	fd6e46b622	make waking up rocket soldier kneel not stand	2016-10-13 01:42:32 +02:00
commy2	71884778dd	animation fixes	2016-10-13 01:16:51 +02:00
commy2	e38845bf45	add ace_kill event handler	2016-10-12 23:20:22 +02:00
commy2	92fc4ec14b	add a setting for 'basic' blood bags	2016-10-12 22:38:58 +02:00
commy2	a5d070f829	blood and unconsciousness fixes	2016-10-12 21:59:32 +02:00
commy2	be71e6fa7b	Merge branch 'medical-rewrite-blood' into medical-rewrite	2016-10-12 04:05:50 +02:00
commy2	41dde51e8e	Merge branch 'medical-rewrite-pain' into medical-rewrite	2016-10-12 03:19:48 +02:00
commy2	b0b9037f24	simplify lost some/much blood macros	2016-10-11 19:44:20 +02:00
commy2	d1df47919d	support neg numbers to remove pain in addPain	2016-10-11 19:36:04 +02:00
commy2	1ea2a72f20	don't play scream by addPain function	2016-10-11 19:29:44 +02:00
commy2	ed6688c899	Merge remote-tracking branch 'origin' into medical-rewrite	2016-10-11 19:14:13 +02:00
Glowbal	84cbd50582	Merged branch master into release	2016-10-11 19:04:14 +02:00
commy2	8822cb1b90	emulate frag grenade ai behaviour for incendiaries (#4534 )	2016-10-11 19:04:08 +02:00
jonpas	b8cc10fecb	Fix #4523 - fuel nozzle disconnect at maximum hose distance	2016-10-11 18:57:58 +02:00
PabstMirror	5d610cf148	Always create namespace at preInit	2016-10-11 18:57:34 +02:00
commy2	130265fd9f	add function to disable dogtags for factions, and disable for civilians	2016-10-11 18:57:34 +02:00
Glowbal	a98013c36e	Merge branch 'master' into release	2016-10-11 18:51:05 +02:00
PabstMirror	cd79ebe3ce	Bump REQUIRED_VERSION to 1.64	2016-10-11 18:49:31 +02:00
BaerMitUmlaut	2ba0137a1e	Fix going unconscious while fastroping (#4531 )	2016-10-11 18:48:20 +02:00
commy2	c390b6c1fc	increase red laser alpha, close #4535	2016-10-11 18:47:52 +02:00
commy2	4fb5d230ac	remove civilian rank icons from nametags (#4538 )	2016-10-11 18:44:27 +02:00
commy2	d0df141cf7	add comment explaining why 6.0 were chosen	2016-10-10 18:22:46 +02:00
commy2	e2d174837a	move IV transufsion rate macro to blood config	2016-10-10 18:20:58 +02:00
commy2	c2f7366d32	blood volume unit vitals	2016-10-10 17:46:17 +02:00
commy2	3438ea0946	use liters for blood volume variable	2016-10-10 17:30:42 +02:00
commy2	fc079abd46	function header	2016-10-10 16:53:25 +02:00
commy2	2ad7c4c4ea	add addPain function, cap pain	2016-10-10 16:44:03 +02:00
commy2	3521bca00b	change blood texture threshold	2016-10-10 15:22:59 +02:00
commy2	0f43829b63	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite	2016-10-10 14:29:50 +02:00
PabstMirror	a3bbc848a7	Fix ammo box cookoff strings (#4528 )	2016-10-09 11:57:29 +02:00
Glowbal	8e72d89ef6	Prepare 3.80 RC1	2016-10-08 13:10:34 +02:00
Nicolás Badano	ab6fc8efca	Laser guidance for all designators (#3308 ) * Fix laser and missileguidance over water * Return a normalized vector in EFUNC(common,getTurretDirection) * Make laser dispersion simulation optional, default off * Prototype for ace_laser_designate * Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate * Simplify laser into one module Rewrite large parts of laser Merge laser_designate Delete lase_selfDesignate * Cleanup missile guidance * Headers, fix laser over water * Cleanup * Test * Change setting to scalar, more cleanup * Add seeker debug drawing	2016-10-08 12:55:30 +02:00
commy2	74dfa6ca33	avoid PCTW error on certain vehicles (#4463 ) fix #4413	2016-10-08 12:45:40 +02:00
commy2	4c96278bb4	fix fatigue when diving while sprinting, fix #4481	2016-10-08 12:44:37 +02:00
commy2	842279af9a	setup hit-points LODs	2016-10-08 12:43:28 +02:00
commy2	d1db8899c1	fix damage materials of repair items	2016-10-08 12:43:28 +02:00
PabstMirror	de1c4bc4d9	Draw Straight Lines with maptool (#4410 ) * Draw Straight Lines * Fix roamer sides, handle closing map mid-draw * Add missing privates / formula notes	2016-10-07 17:21:19 -05:00
PabstMirror	ef9fd92898	Show correct elev for mortar with no ammo (#4478 ) Fix #3757	2016-10-07 17:06:04 -05:00
commy2	b0c0156d75	reduce some overhead	2016-10-07 05:10:43 +02:00
commy2	4bc1c1db56	handle blood visuals	2016-10-07 04:21:01 +02:00
commy2	b698a88dc1	move modifyAction func to menu component	2016-10-07 01:58:40 +02:00
commy2	d4dd1626a5	delete some unused/moved functions from medical main component	2016-10-07 00:19:51 +02:00
commy2	50eeebd30d	add weapon sway by pain	2016-10-07 00:09:58 +02:00
commy2	f004504a53	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-10-06 23:44:31 +02:00
commy2	56c77fed94	prep for new pain aim sway method	2016-10-06 23:44:14 +02:00
PabstMirror	198f6c93e4	Fix FRIES attach point for unarmed wildcat (#4518 ) Close #4490	2016-10-06 15:58:45 -05:00
commy2	673f3b4f9f	implement arithmetic source for fatigue system (#4517 )	2016-10-06 22:46:46 +02:00
commy2	e9586ebccc	use common header file for medical components	2016-10-06 22:40:36 +02:00
Glowbal	059980b1a5	Add ammo cookoff (#4376 ) * Add Ammo cookoff * Remove tabs * Add initial ammo box cook-off Does not include a fire effect, mostly just a proof of concept. Should probably also add further potential cook-off conditons (if hit by tracer for example). * Add burning effects to ammo box cook off - Add burning effect while ammo box is cooking off - Add setting to enable/disable ammo boxes cooking off - Clear magazine cargo while box is burning Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended. * Improve ammo cookoff * Integrate ammo cookoff with the incendiary grenade * Disable ammo cook off underwater * Optimize fnc_detonateAmmunition I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though! * Improve ammo box cook off - Remove unnecessary light source (fire particles provide lighting) - Add randomness to cook off time - Cook off begins with fire effect rather than smoke * Add tracer induced ammo box cook off Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway. * Decrease amount of explosions from ammo cookoff * Add is local check for remote event	2016-10-06 22:37:38 +02:00
commy2	853c7db1dc	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-10-06 10:20:10 +02:00
PabstMirror	dfa09d3161	Functions to perform arithmetic ops on sets (#4514 ) * Functions to perform arithmetic ops on a set * fix spelling	2016-10-06 10:18:14 +02:00
commy2	5613ec5d5a	treatment functions and unconsciousness rework	2016-10-06 00:54:57 +02:00
commy2	2e147b37f0	fix formating of CBA version check (#4511 )	2016-10-05 13:06:21 -05:00
PabstMirror	1779099b71	Cleanup old common macros (#4507 )	2016-10-04 05:29:37 +02:00
commy2	bad01c3126	simplify blood splatter by using woundReceived event	2016-10-02 19:13:56 +02:00
commy2	6082020056	simplify blood splatter by using woundReceived event	2016-10-02 18:35:40 +02:00
commy2	5875f58604	use new macro	2016-10-02 17:50:17 +02:00
commy2	feac296f9c	use a new macro	2016-10-02 13:06:47 +02:00
commy2	56882a9bcb	manual merge	2016-10-02 13:04:20 +02:00
commy2	f4d4c521d7	manual merge	2016-10-02 13:02:17 +02:00
commy2	05d30c5573	convert log macros to cba versions (#4282 ) * convert log macros to cba versions * Add changes to AB * remove obsolete macro	2016-10-02 12:55:31 +02:00
commy2	f185742e68	manual merge	2016-10-02 12:51:29 +02:00
commy2	5da11d5f79	remove obsolete macro	2016-10-02 12:17:48 +02:00
commy2	9942518a53	Merge remote-tracking branch 'origin/master' into cba-log-macros	2016-10-02 12:11:52 +02:00
Pawel W	ddd036f5bd	Removed aiDispersionCoef for vanilla weapons (#4484 ) When merged this pull request will restore default aiDispersionCoef for vanilla weapons.	2016-10-01 10:27:34 +02:00
PabstMirror	95da004370	Fix Ambient Sounds (#4470 ) Fix #4418 - Remove leading `\` for configfile sounds - Cleanup randomized location code	2016-10-01 10:27:00 +02:00
PabstMirror	bfc5af32f3	Add model.cfg for medical blood (#4489 )	2016-09-30 16:29:48 -05:00
PabstMirror	6ad15e02c7	Fix spotting rifle loudness (#4488 )	2016-09-30 15:10:20 -05:00
commy2	a54aec72bc	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-09-30 21:19:16 +02:00
PabstMirror	1bc5669c95	Merge branch 'master' into cba-log-macros	2016-09-30 11:18:58 -05:00
jonpas	8458cb2339	Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace (#4222 ) * Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's * Use QFUNC * Bump required CBA version * Change remove version to 3.110.0	2016-09-30 15:51:03 +02:00
commy2	c93e9e3f3b	fix playSoundInjured wrong args	2016-09-30 13:03:43 +02:00
commy2	6ae57e991f	delete obsolete	2016-09-30 12:28:34 +02:00
commy2	490155270b	QEGVAR vs QGVAR	2016-09-30 12:18:59 +02:00
commy2	bd98e44a94	simplify	2016-09-30 11:52:05 +02:00
commy2	77f21e9441	add some more functions to engine component	2016-09-30 11:23:07 +02:00
commy2	1196cbb210	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-09-30 10:39:06 +02:00
commy2	96a1e74c85	synch anim speed acceleration	2016-09-30 10:38:27 +02:00
PabstMirror	a5d106c116	Fix cookoff event calling (#4487 )	2016-09-29 18:44:48 -05:00
jonpas	dad4293216	Revert "Update showHud setter for Squad Radar" (#4485 )	2016-09-29 17:53:17 -05:00
PabstMirror	60a7490b7e	Fix some moved funcs/strings	2016-09-29 15:08:36 -05:00
commy2	03e24d8fd9	improve checkItems function	2016-09-29 21:32:54 +02:00
jonpas	1bd7a66888	Merge pull request #4085 from acemod/apexShowHud Update showHud setter for Squad Radar	2016-09-29 21:11:15 +02:00
commy2	f53d324c0d	simplifications in the treatment config	2016-09-29 20:29:44 +02:00
commy2	20a544e549	remove debug mode	2016-09-29 19:45:03 +02:00
commy2	ef8ad21446	fix inconsistencies in treatment time between basic and adv, fix item usage	2016-09-29 19:43:50 +02:00
commy2	e418cc05e9	cleanup, fix headers treatment has/use item functions	2016-09-29 19:31:48 +02:00
commy2	d3f6f040cd	fix some problems with transitions from lowered weapon animations	2016-09-29 19:15:16 +02:00
commy2	2c7864c02b	implement custom treatment sounds	2016-09-29 18:45:18 +02:00
commy2	ecd77630f5	some more animation time tweaks	2016-09-29 18:12:51 +02:00
PabstMirror	3c7ac5a3e4	Fix medical blood locality / bleeding in vehicles (#4469 ) * Fix medical blood locality / bleeding in vehicles - Fix ace_setting - Don't run on headless if enabledFor = 1 - Don't create blood for non-local units - Don't create blood when mounted (except static weapons) * Add readme	2016-09-29 10:42:56 -05:00
PabstMirror	85c4a1f021	Fix frag - reflectionsEnabled (#4475 ) PFEH never exited	2016-09-29 10:42:21 -05:00
commy2	36d244a868	'modernize' primary treatment functions, fix animation issues, add anim speed scaling	2016-09-29 16:00:19 +02:00
Nicolás Badano	0fda1b0c3d	Fix #4476	2016-09-28 19:37:54 -03:00
commy2	410c5f1d5f	treatment debug	2016-09-28 20:46:46 +02:00
commy2	4484a36f25	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-09-28 18:33:16 +02:00
commy2	1219d3df23	remove deprecated sitting module (#4458 ) * remove deprecated sitting module * Update sitting documentation for removal * Remove ACE3 sitting doc, redirect to ACEX and add note * Fix wording	2016-09-28 13:14:50 +02:00
commy2	0decd72063	manual merge	2016-09-28 08:37:39 +02:00
commy2	3d67de6fc1	fix a missing	2016-09-27 22:33:29 +02:00
commy2	035e8017cc	Merge remote-tracking branch 'origin/medical-rewrite-interactions' into medical-rewrite	2016-09-27 21:38:30 +02:00
commy2	20d00d7cd9	make units scream when they're hit	2016-09-27 21:21:44 +02:00
KoffeinFlummi	72899643bd	Merge branch 'master' into japanesestringtables	2016-09-27 20:54:17 +02:00
commy2	a913054b57	fix error with out of bounds blood loss	2016-09-27 20:00:58 +02:00
commy2	5a19d4884b	disable debug medical_damage	2016-09-27 19:22:54 +02:00
commy2	09c5fbde15	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-09-27 18:59:43 +02:00
classicarma	1fe8cc03db	translate realisticnames	2016-09-28 01:38:19 +09:00
classicarma	3f79d47fb4	translate zeus	2016-09-28 01:27:05 +09:00
classicarma	30a62b1337	translate yardage450	2016-09-28 01:26:50 +09:00
classicarma	b2e1432c2b	translate winddeflection	2016-09-28 01:26:42 +09:00
classicarma	c4038970f2	translate weather	2016-09-28 01:26:31 +09:00
classicarma	5a2f92613d	translate weaponselect	2016-09-28 01:26:17 +09:00
classicarma	e1b1a9cfec	translate viewdistance	2016-09-28 01:26:08 +09:00
classicarma	de60b9fdbf	translate vehicle	2016-09-28 01:25:57 +09:00
classicarma	d1c2c5be2e	translate vehiclelock	2016-09-28 01:25:47 +09:00
classicarma	8f86482a86	translate vector	2016-09-28 01:25:36 +09:00
classicarma	ff4464370c	translate ui	2016-09-28 01:25:23 +09:00
classicarma	04e3a5f92e	translate tripod	2016-09-28 01:25:14 +09:00
classicarma	2f2c426e97	translate trenches	2016-09-28 01:25:06 +09:00
classicarma	eed1f50ae0	translate tagging	2016-09-28 01:24:58 +09:00
classicarma	4ee9ffba3f	translate tacticalladder	2016-09-28 01:24:47 +09:00
classicarma	95da6b471c	translate switchunits	2016-09-28 01:24:37 +09:00
classicarma	2b4bcfc585	translate spottingscope	2016-09-28 01:24:28 +09:00
classicarma	038e7775a3	translate spectator	2016-09-28 01:24:21 +09:00
classicarma	4cfa3d95cc	translate slideshow	2016-09-28 01:23:18 +09:00
classicarma	6bcdaae866	translate sitting	2016-09-28 01:23:04 +09:00
classicarma	686b534701	translate scopes	2016-09-28 01:22:56 +09:00
classicarma	953ba0ff98	translate sandbag	2016-09-28 01:22:49 +09:00
classicarma	ae82c41a1b	translate safemode	2016-09-28 01:22:40 +09:00
classicarma	775a6a5bc9	translate respawn	2016-09-28 01:22:33 +09:00
classicarma	cb842a4e1c	translate repair	2016-09-28 01:22:20 +09:00
classicarma	3935a1b781	translate reloadlaunchers	2016-09-28 01:22:08 +09:00
classicarma	52d9c080cb	translate reload	2016-09-28 01:21:58 +09:00
classicarma	feebd8e1b8	translate refuel	2016-09-28 01:21:49 +09:00
classicarma	45486fa843	translate rearm	2016-09-28 01:20:20 +09:00
classicarma	31229ffa0d	translate rangecard	2016-09-28 01:18:10 +09:00
classicarma	ae69ec9338	translate parachute	2016-09-28 01:18:03 +09:00
classicarma	f61c54ad91	translate overheating	2016-09-28 01:17:56 +09:00
classicarma	de0f944013	translate opitionsmenu	2016-09-28 01:17:49 +09:00
classicarma	a25bc3b42b	translate optics	2016-09-28 01:17:40 +09:00
classicarma	d0d826350b	translate nightvision	2016-09-28 01:17:28 +09:00
classicarma	a778240d0e	translate nametags	2016-09-28 01:17:07 +09:00
classicarma	1b39e6428b	translate mx2a	2016-09-28 01:17:00 +09:00
classicarma	6f0c860aab	translate movement	2016-09-28 01:16:50 +09:00
classicarma	6084b81e51	translate mk5motar	2016-09-28 01:16:42 +09:00
classicarma	a7b6d45f45	translate missionmodules	2016-09-28 01:16:34 +09:00
classicarma	2f86ed9a1c	translate missileguidance	2016-09-28 01:16:21 +09:00
classicarma	33fde9ea72	translate minedetector	2016-09-28 01:16:13 +09:00
classicarma	60e57709cf	translate microdagr	2016-09-28 01:16:06 +09:00
classicarma	188a1bf02b	translate medical_ai	2016-09-28 01:15:59 +09:00
classicarma	a35e50e6af	translate medical_menu	2016-09-28 01:15:51 +09:00
classicarma	eaf00c8340	translate medical	2016-09-28 01:15:38 +09:00
classicarma	0ced153e53	translate markers	2016-09-28 01:15:26 +09:00
classicarma	4afd71d293	translate map_gestures	2016-09-28 01:15:19 +09:00
classicarma	530946180b	translate maptools	2016-09-28 01:14:58 +09:00
classicarma	4c2692c2ba	translate map	2016-09-28 01:14:38 +09:00
classicarma	a6ae9047f6	translate main	2016-09-28 01:14:28 +09:00
classicarma	ef6ea019c9	translate magazinerepack	2016-09-28 01:14:15 +09:00
classicarma	c1fb635add	translate logistics_wirecutter	2016-09-28 01:14:07 +09:00
classicarma	0f6b15e569	translate logistics_uavbattery	2016-09-28 01:13:45 +09:00
classicarma	d0d52b5604	translate laser_selfdesignate	2016-09-28 01:13:33 +09:00
classicarma	4dbdb8bd93	translate laserpointer	2016-09-28 01:13:20 +09:00
classicarma	f3b3105f01	translate laser	2016-09-28 01:13:12 +09:00
classicarma	7b4582d8e0	translate kestrel4500	2016-09-28 01:12:56 +09:00
classicarma	f2cbe233ab	translate javelin	2016-09-28 01:12:46 +09:00
classicarma	10484e696c	translate inventory	2016-09-28 01:12:32 +09:00
classicarma	fd069c48d4	translate interact_menu	2016-09-28 01:12:22 +09:00
classicarma	fda61324c8	translate interaction	2016-09-28 01:12:05 +09:00
classicarma	a44c26efb8	translate huntir	2016-09-28 01:11:47 +09:00
classicarma	e59c93988b	translate hearing	2016-09-28 01:11:40 +09:00
classicarma	5453b15dd8	translate common	2016-09-28 01:11:27 +09:00
classicarma	c6806872c9	translate ballistics	2016-09-28 01:11:19 +09:00
PabstMirror	257f1a1b4c	Fix interaction addActionToX return values (#4461 ) * Fix interaction addActionToX return values Fix #4460 Fix returning number from pushBack * Retrun empty array on error	2016-09-27 11:09:06 -05:00
commy2	5e35204811	woundHandler(SQF), fixes, improvements, more consistent variable naming	2016-09-27 17:29:49 +02:00
commy2	72e2bc72c0	don't exit loop prematurely	2016-09-27 11:57:37 +02:00
commy2	f90a91dfb5	add todo	2016-09-27 11:14:22 +02:00
commy2	7470d1f0f5	cleanup/improve parseConfigForinjuries	2016-09-27 11:05:38 +02:00
commy2	cae5196656	fix wound translations being lost in limbo	2016-09-26 21:09:32 +02:00
commy2	0637a7401e	travis pls	2016-09-26 20:52:08 +02:00
commy2	c21323f9ed	travis	2016-09-26 20:45:29 +02:00
commy2	2bfa1370a5	port injury parse fnc to medical damage	2016-09-26 20:30:45 +02:00
commy2	9f6baca424	port injury parse fnc to medical damage	2016-09-26 20:25:14 +02:00
commy2	8fd7e8335a	simplify and fix medical engine damage	2016-09-26 19:59:00 +02:00
PabstMirror	055c6d23f3	Fix passanger interaction (#4467 )	2016-09-26 12:09:20 -05:00
commy2	80232c39cc	add todo note	2016-09-26 19:07:14 +02:00
commy2	4b9873d304	fix various issues with handleDamage engine component	2016-09-26 18:30:39 +02:00
PabstMirror	11b6370e8f	Fix undefined var in paradrop (#4465 )	2016-09-25 21:25:11 +02:00
commy2	033c7c7eec	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-09-25 18:11:48 +02:00
commy2	7f07d4e4b8	fix broken parachutes, fix #4437 (#4462 )	2016-09-25 09:45:55 +02:00
commy2	e7bc2e9d62	remove deprecated code for 3.8.0 (#4457 ) * remove deprecated scroll wheel event handler * remove deprecated ace hash functions * remove deprecated execNextFrame * remove deprecated insertionSort * remove deprecated getConfigType * remove deprecated binocularMagazine * remove deprecated wait(Until)AndExecute * remove old ass and deprecated alternative syntax setHitPointDamage * remove deprecated event handlers (#4459) * remove deprecated event handlers# * remove ACE_newEvents * Remove old ACE PlayerEventHandler wrappers	2016-09-24 22:31:10 +02:00
PabstMirror	9451716a44	Show damage on repair items interaction point (#4448 ) * Show damage on repair items interaction point * Fix dot size * Change scaling	2016-09-24 15:15:02 -05:00
commy2	bc520c7fe7	add dmg materials to spare tracks and wheel (#4450 ) * add dmg materials to spare tracks and wheel * attempt to fix damage rvmats by making FIRE GEO components convex * get materials to work	2016-09-24 22:08:56 +02:00
commy2	c1ead851cb	Add 3den attribute to disable bft (#4452 ) * add 3den object attribte to disable BFT on the object * delay setVariable public on group * fix tooltip	2016-09-24 21:46:03 +02:00
PabstMirror	0b3d38a72f	Use waitAndExecute for fatigue loop (#4453 ) * Use waitAndExecute for fatigue loop Close #4379 - Will use CBA_missionTime so it repsects pause and time accl - Possible performance improvment over using a PFEH * Rename main loop function	2016-09-23 16:40:52 -05:00
PabstMirror	a7c75a3bf6	Handle RHS impact grenades (RGN/RGO) (#4447 )	2016-09-23 16:38:24 -05:00
PabstMirror	f23e5d33fc	Fix throwing from map screen - global XEH (#4449 ) * Fix throwing from map screen - global XEH * Fix Capitalization	2016-09-23 12:48:25 -05:00
PabstMirror	b7dfdc6c84	End path drawing when passing through Geom/Fire (#4385 ) * End path drawing when passing through Geom/Fire * Add Advanced Throwing colored circles documentation	2016-09-23 12:48:15 -05:00
PabstMirror	4abf969abf	Update for newest JR / 1.64 UBC (#4208 ) * Update flashsuppressor JR configs for pistols * Update for newest JR / 1.64 UBC	2016-09-23 12:48:04 -05:00
commy2	26ae575d4a	fix broken ace menu in main menu (#4451 )	2016-09-22 23:55:52 +02:00
PabstMirror	f6941b29bf	Add changes to AB	2016-09-22 15:12:07 -05:00
PabstMirror	3c53a314d4	Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros	2016-09-22 15:10:30 -05:00
PabstMirror	39fa0b5d0e	#4366 - Fix treatment animion with no weapon equiped	2016-09-21 15:55:29 -05:00
PabstMirror	c7afae88f7	Fix base interaction nodes	2016-09-21 10:55:19 -05:00
BaerMitUmlaut	7d2d40ee55	Added 3D treatment actions	2016-09-21 14:36:00 +02:00
commy2	03d83b633f	more immersive dogtag interaction (#4446 ) * more immersive dogtag interaction * fix indent and macro usage * move dogtag interaction point to neck	2016-09-21 09:07:45 +02:00
PabstMirror	58bd6467b2	Debugging tool to watch variables on main display (#4408 ) * Debugging tool to watch variables on main display * Fix error when called from scheduled code * Remove demo code	2016-09-20 12:18:44 -05:00
BaerMitUmlaut	b1f6973772	Filter player medics (#4444 )	2016-09-20 16:01:54 +02:00
Glowbal	c7e16210c3	fix pboprefix path	2016-09-19 23:17:10 +02:00
commy2	236d1f9669	Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite	2016-09-19 18:23:37 +02:00
commy2	729ba9178b	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-09-19 18:23:26 +02:00
commy2	8937a27b96	port litter settings to treatment, stringtable fixes	2016-09-19 18:20:56 +02:00
commy2	c2f8007d36	port litter settings to treatment	2016-09-19 18:05:49 +02:00
commy2	10d4047b4c	fix problems with ported treatment	2016-09-19 17:52:16 +02:00
commy2	3d422021ef	Merge pull request #4377 from acemod/sys-blood-port Add ace2 sys blood port	2016-09-19 17:35:32 +02:00
commy2	5b42dd8616	remove deleted models	2016-09-19 15:47:51 +02:00
commy2	9a9d547893	this variable was meant to be used here...	2016-09-19 15:38:03 +02:00
commy2	226742088b	remove unused variables	2016-09-19 15:36:08 +02:00
commy2	00964bd007	add a comment	2016-09-19 15:31:53 +02:00
commy2	d9b670f45f	switch to SuperShader for SMDI and NoHQ, rename blood textures	2016-09-19 15:30:12 +02:00
commy2	b1f726a1fe	get rid of config and use namespace for blood models	2016-09-19 15:08:38 +02:00
commy2	f60b368c65	precompile and cache functions at game start	2016-09-19 14:41:02 +02:00
commy2	a2805fad53	fix undefined variable, synch splat direction correctly	2016-09-19 14:38:47 +02:00
commy2	70512db0e3	simplifying and fixing offset	2016-09-19 13:26:32 +02:00
commy2	bc3260c8fc	convert magic numbers into macros, simplify a waitAndExecute	2016-09-19 12:27:02 +02:00
commy2	d86ceef484	use ASL instead of ATL when z isn't used anyway	2016-09-19 12:18:24 +02:00
commy2	4de8ed0f10	delete unused blood splat configs and models	2016-09-19 12:11:37 +02:00
commy2	edfc33d297	simplify serverEvent call	2016-09-19 12:06:13 +02:00
commy2	86f6a5db73	move model files into data folder	2016-09-19 12:03:05 +02:00
commy2	022e8b52d0	remove unused CBA macro from blood config, disable A3 canBeShot	2016-09-19 11:38:29 +02:00
commy2	0cf6094875	rename spawnBlood to createBlood for consistency	2016-09-19 11:21:05 +02:00
commy2	26caafdab3	fix wrong function used in a example/header	2016-09-19 11:19:16 +02:00
commy2	158b1eed69	add server only event handler only on server machine	2016-09-19 10:05:16 +02:00
commy2	81d962f0d5	port litter to treatment	2016-09-19 09:55:30 +02:00
Glowbal	27314c34b1	fix treatment functionality	2016-09-18 22:58:56 +02:00
PabstMirror	616ec642da	Add AB Terrain Extension Logging (#4391 )	2016-09-18 22:00:34 +02:00
BaerMitUmlaut	7388892dac	Fixed weather for inherited CfgWorlds (#4360 ) * Fixed weather for inherited CfgWorlds * toLower for inArray - check all configs exist	2016-09-18 22:00:27 +02:00
Grzegorz	a63dcb49d0	PL Translation 3.7.1 (#4395 ) * translate advanced fatigue * translate advanced throwing * translate cargo * translate chemlights * translate cookoff * translate explosives * translate fastroping * translate gforce * translate googles * translate grenades * translate gunbag * translate maptools * translate medical * translate medical_ai * translate minedetector * translate nametags * translate overheating * translate repair * translate tagging * translate ui * translate zeus	2016-09-18 22:00:13 +02:00
PabstMirror	fbb054dec4	Merge pull request #4422 from acemod/incindNull Skip incindinary effects if projectile is null	2016-09-18 14:54:18 -05:00
Glowbal	b74245c323	Merged branch medical-rewrite into medical-rewrite	2016-09-18 19:48:58 +02:00
Glowbal	1c1e47c039	Enable treatmnet actions	2016-09-18 19:48:49 +02:00
BaerMitUmlaut	a8b490bfca	Merge pull request #4358 from acemod/tweakFatigueDuty Tweak fatgiue duty factors	2016-09-18 16:31:21 +02:00
commy2	6cc960aacc	fix nocrosshair being in addons and optionals	2016-09-18 15:19:17 +02:00
commy2	031bb1ec91	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-09-18 15:17:01 +02:00
commy2	0ff4c20861	Merge pull request #4168 from acemod/nocross optional pbo to disable cross hair	2016-09-18 15:08:43 +02:00
commy2	a5dcdf102f	use TRACE macros for parseConfig function	2016-09-18 14:17:18 +02:00
Glowbal	9263cb0f7d	Fix handleDamage not working	2016-09-18 14:05:05 +02:00
Glowbal	7691af47f3	Further clean up	2016-09-18 13:33:22 +02:00
commy2	1c4cd81680	add displayName to blown off turret object	2016-09-18 12:19:29 +02:00
Glowbal	811e1cd598	First set up clean up for medical rewrite	2016-09-18 12:05:36 +02:00
Glowbal	0c43c83b3d	Merge branch 'master' Conflicts: addons/medical/ACE_Settings.hpp addons/medical/XEH_postInit.sqf addons/medical/XEH_preInit.sqf addons/medical/functions/fnc_actionDiagnose.sqf addons/medical/functions/fnc_actionLoadUnit.sqf addons/medical/functions/fnc_addDamageToUnit.sqf addons/medical/functions/fnc_createLitter.sqf addons/medical/functions/fnc_displayPatientInformation.sqf addons/medical/functions/fnc_handleCreateLitter.sqf addons/medical/functions/fnc_handleDamage.sqf addons/medical/functions/fnc_handleDamage_advanced.sqf addons/medical/functions/fnc_handleDamage_airway.sqf addons/medical/functions/fnc_handleDamage_caching.sqf addons/medical/functions/fnc_handleDamage_internalInjuries.sqf addons/medical/functions/fnc_handleDamage_wounds.sqf addons/medical/functions/fnc_isBeingCarried.sqf addons/medical/functions/fnc_isBeingDragged.sqf addons/medical/functions/fnc_litterCleanupLoop.sqf addons/medical/functions/fnc_moduleAssignMedicRoles.sqf addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf addons/medical/functions/fnc_setCardiacArrest.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf addons/medical/functions/fnc_treatmentBasic_epipen.sqf addons/medical/functions/fnc_treatmentIV.sqf addons/medical/functions/fnc_treatmentIVLocal.sqf	2016-09-18 11:51:21 +02:00
commy2	2b4c5f9c49	auto add blown off turrets to curator	2016-09-18 11:31:28 +02:00
PabstMirror	32b7ef7b85	Skip incindinary effects if projectile is null	2016-09-17 13:09:03 -05:00
commy2	95409f6772	Merge pull request #4383 from acemod/support-disable-cookoff Add object attribute to disable cookoff for individual vehicles	2016-09-17 18:50:34 +02:00
commy2	d5edc5a1f5	Merge pull request #4411 from acemod/burn-wheels incendiary and cookoff improvements	2016-09-17 18:30:08 +02:00
commy2	e02516e5b5	invert reverted inverted	2016-09-17 18:08:08 +02:00
commy2	3d18374747	add object 3den setting for disabling cook off effects	2016-09-17 17:47:29 +02:00
Glowbal	e8f55348d8	Add ACE2 sys_Blood port	2016-09-17 16:52:25 +02:00
SilentSpike	e3d26c535a	Merge pull request #4368 from 654wak654/delete-teleport-module Delete "Teleport Players" module after use	2016-09-17 11:52:38 +01:00
Glowbal	48a198fea4	Add support for disabling cookoff for individual vehicles	2016-09-17 12:13:43 +02:00
Ozan Eğitmen	56751eff0e	Revert "Delete "Group Side" module after use" This reverts commit `2880c6152a`.	2016-09-17 01:01:37 +03:00
classicarma	0d4a0a52ba	translate gunbag	2016-09-17 01:47:01 +09:00
classicarma	7f208e094d	translate grenades	2016-09-17 01:46:51 +09:00
classicarma	5c160db023	translate goggles	2016-09-17 01:46:34 +09:00
classicarma	3605778d60	translate gforces	2016-09-17 01:46:19 +09:00
classicarma	1e28c16ba2	translate gestures	2016-09-17 01:46:09 +09:00
classicarma	5fc3b05c21	translate frag	2016-09-17 01:46:00 +09:00
classicarma	f9e44a2820	translate flashsuppressors	2016-09-17 01:45:47 +09:00
classicarma	32939571e5	translate flashlights	2016-09-17 01:45:34 +09:00
classicarma	6312a19dd6	translate finger	2016-09-17 01:45:24 +09:00
classicarma	d1e57f9678	translate fcs	2016-09-17 01:45:14 +09:00
classicarma	47bd4e9991	translate fastroping	2016-09-17 01:44:56 +09:00
classicarma	4fabf8b1f1	translate exolosives	2016-09-17 01:44:45 +09:00
classicarma	647ad8c681	translate dragging	2016-09-17 01:44:37 +09:00
classicarma	4827a18aa0	translate digtags	2016-09-17 01:44:30 +09:00
classicarma	99c5122120	translate disarming	2016-09-17 01:44:22 +09:00
classicarma	dfa5a745a0	translate dagr	2016-09-17 00:58:02 +09:00
classicarma	24d365fa5d	translate cookoff	2016-09-17 00:57:49 +09:00
classicarma	83a18e84de	translate concertina_wire	2016-09-17 00:57:40 +09:00
classicarma	e767d65cfb	translate common	2016-09-17 00:57:27 +09:00
classicarma	e6b2cc8a74	translate chemlights	2016-09-17 00:57:17 +09:00
classicarma	78ee33b46f	translate cargo	2016-09-17 00:57:09 +09:00
classicarma	fb48edb667	translate captives	2016-09-17 00:57:00 +09:00
classicarma	53bee76f8d	translate ballistics	2016-09-17 00:56:53 +09:00
classicarma	23d70fb6f0	translate attach	2016-09-17 00:56:45 +09:00
classicarma	1e1c202f96	translate atragmx	2016-09-17 00:56:36 +09:00
classicarma	4003b1486b	translate advanced_throwing	2016-09-17 00:56:25 +09:00
classicarma	892af25bac	translate advanced_fatigue	2016-09-17 00:56:13 +09:00
classicarma	4fd92b534a	translate advanced_ballistics This reverts commit 65bfee0f9481313599c654b69ca2a0370077f3ea. translate advanced_ballistics	2016-09-17 00:55:53 +09:00
commy2	3cea9e727d	fix a comment	2016-09-16 14:00:43 +02:00
commy2	a487c5e89f	offset for quad engine smoke, delete destroyed RepairItem s	2016-09-16 13:51:41 +02:00
commy2	d200eadb46	incendiary and cookoff improvements	2016-09-16 13:08:19 +02:00
classicarma	524312dce3	translate aircraft	2016-09-16 19:49:08 +09:00
classicarma	53e50f4f91	translate disposable	2016-09-16 12:01:26 +09:00
Ozan Eğitmen	2880c6152a	Delete "Group Side" module after use	2016-09-16 01:34:32 +03:00
PabstMirror	bbcc82acf6	Tweak fatgiue duty factors	2016-09-13 16:56:06 -05:00
PabstMirror	b81ccca3f7	Captives - rewrite findEmptyNonFFVCargoSeat (#4348 ) Simplify func using `fullCrew` Fix #4339 also switch hard `ERROR(` macro to `WARNING(`	2016-09-13 16:52:51 -05:00
Glowbal	65cdf200fb	Merged branch release into master	2016-09-13 21:28:22 +02:00
Glowbal	4ae4fca852	Prep 3.7.0 release	2016-09-12 19:47:31 +02:00
jonpas	0400a857e6	Fix Advanced Throwing vanilla throw block for primed throwables (#4370 ) * Fix vanilla throwing block failing after priming, simplify muzzle ammo (can only be 1 or 0, 1 doesn't influence anything if no appliccable throwable in inventory) * Disable select grenade keys when advanced throwing is active * Fix #4375 - select next grenade cycles between first 2 grenade muzzles due to setAmmo	2016-09-12 19:21:04 +02:00
BaerMitUmlaut	1601f6a7b7	Disable medical AI for remote controlled AI	2016-09-12 17:06:14 +02:00
PabstMirror	9844ae32c9	Exit fatiuge loop when dead (don't play breathing sound)	2016-09-11 22:03:20 -05:00
commy2	bfb88efe9a	Fix script error in cargo drop function (#4369 )	2016-09-10 21:21:09 +02:00
Ozan Eğitmen	d533bd1663	Delete "Teleport Players" module after use	2016-09-10 15:33:19 +03:00
Glowbal	04dd0412ff	Prepare 3.7.0 RC6	2016-09-09 11:43:40 +02:00
jonpas	062f6deec8	Fix Advanced Throwing floating IR grenades and block vanilla throwing (#4365 ) * Fix #4362 - floating primed IR grenades * Fix #4363 - block vanilla throwing while prepared * Respect last thrown time with vanilla throwing and dropping primed throwable,	2016-09-09 11:00:30 +02:00
BaerMitUmlaut	b1f91f8cf5	Use directCall on tripflare effect	2016-09-08 21:22:32 +02:00
Glowbal	ebdc883855	Prepare 3.7.0 RC5	2016-09-07 21:35:58 +02:00
PabstMirror	0d81ce34e2	Fix stop gesture keybind (#4354 )	2016-09-07 21:07:51 +02:00
PabstMirror	1caea46d60	Medical - Fix adv wound not stacking (#4353 )	2016-09-07 20:54:54 +02:00
jonpas	13df3efce2	Prepare 3.7.0 RC4	2016-09-06 22:56:22 +02:00
commy2	6e99e8a951	don't let tripod fall over as easily (#4352 )	2016-09-06 21:55:23 +02:00
PabstMirror	1a4ed7b7b4	Grenades - disable throw mode / keybind if advThrow (#4350 )	2016-09-06 21:54:42 +02:00
commy2	5cd9b56866	don't let tripod fall over as easily (#4352 )	2016-09-06 21:53:38 +02:00
PabstMirror	a320a56813	Fix blood bags not showing in medical menu (#4351 ) fix #4306	2016-09-06 21:52:22 +02:00
PabstMirror	4781903be6	Add setting for medical ai	2016-09-06 21:48:46 +02:00
PabstMirror	ec4c2276a5	Add setting for medical ai	2016-09-05 22:35:01 -05:00
Glowbal	89a5f28772	Merge pull request #4192 from acemod/medical-rewrite-engine-component merge medical engine component into medical rewrite branch	2016-09-05 22:31:37 +02:00
Glowbal	f3dc1afdbf	Prepare 3.7.0 RC3	2016-09-05 22:27:30 +02:00
PabstMirror	4fd5d6be6c	Fix handleDamage params for addDamageToUnit (#4344 )	2016-09-05 22:27:00 +02:00
BaerMitUmlaut	a096439f36	Moved particles component to optionals (#4341 )	2016-09-05 20:50:30 +02:00
PabstMirror	a585a36ced	Add ace mags to 7.62 SPAR_03 (#4340 )	2016-09-05 20:33:12 +02:00
jonpas	2034234940	Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337 ) * Prevent taking or disconnecting a nozzle if already carrying one * Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled	2016-09-05 20:23:28 +02:00
jonpas	2474da36b3	Fix pick up delay and IR chemlights, prevent picking up GL and mortar smoke shells (#4336 ) * Fix pick up interaction not rendering right after throw, Prevent GL rounds from being picked up * Prevent picking up GL and mortar smoke shells * Fix pick up delay properly, Add separate define for quick throwing (for use when debugging) * Fix forgotten rename in IR chemlight handling	2016-09-05 20:23:03 +02:00
Glowbal	be8b4468af	Increment build number	2016-09-05 08:27:58 +02:00
PabstMirror	7055b242e4	Fix AF author String (#4330 )	2016-09-04 22:34:48 +02:00
PabstMirror	f21d45392f	SPAR use ACE Magazines - Fix #4207 (#4329 )	2016-09-04 21:56:05 +02:00
Glowbal	849a2cd475	Prepare 3.7.0	2016-09-04 21:51:36 +02:00
Glowbal	5034dffec8	Fix build error with make	2016-09-04 21:51:13 +02:00
BaerMitUmlaut	cc414de8d1	Add Advanced Fatigue component (#4321 ) * Initial commit advanced fatigue * Added animation changes * Fixes, rewrites * Broadcast 3den attribute and fix UBC * Further animation tweaks * Added Eden attribute and CBA settings * Switch to CBA events * Add beautified component name * Rewrites, fixes, tweaks * Move setVars to GVARs * Add setting to disable * Switch to status effect handler for sprint and jog blocking * Add component name * Failsafe for early unit player EH * Removed raised weapon penalty for pistols * Added respawn compatibility * Tweaked side jog animation speed * Added support for virtual load * Added stamina bar * Remove debug flags * Added custom duty factor functions and values * Added structural comments * Disabled CBA settings, added ACE settings * Fixed config * Added readme * Remove leftover debug diag_logs * Improved stringtable	2016-09-04 21:33:07 +02:00
PabstMirror	7314f863f6	Add spare barrel to VA in 1.64 (#4328 ) Close #4325	2016-09-04 21:26:15 +02:00
PabstMirror	0848b6d1de	Fix script errors (#4327 )	2016-09-04 21:03:52 +02:00
BaerMitUmlaut	8a47d7a9b6	Add fade nametags towards screen border (#4316 ) * Fade nametags towards screen border * Use distance2D instead of vector commands * Don't calculate fade when off screen * Made fade on border optional	2016-09-04 20:50:12 +02:00
Glowbal	b0fa1a32d9	Fix params	2016-09-04 20:37:25 +02:00
Glowbal	b489750d5b	Minor optimizations using private, params, and isEqualType (#4323 ) * Optimizations with private, params, and isEqualType * Fixed tab being used instead of space * Fixed tabs inserted by notepad++ * More usage of new private syntax and params - changed a few checks for an array being empty to `_arr isEqualTo []` rather than `count _arr == 0` - added more uses of `private` on the same line as the variable is declared - added more uses of params to assign variables passed as parameters - removed unnecessary parentheses - removed several unnecessary variable declarations with private array syntax * clean up and formatting	2016-09-04 16:44:22 +02:00
BaerMitUmlaut	278e7fa800	Add Medical AI implementation for basic medical (#4311 ) * Initial commit medical AI * Finished non-healing functions * Initial work on self healin * AI healing * Finished medical AI for basic medical * Finito * Fix for dead units, medic not being close enough * Make ace_medical required * Fixed double systemChat * Made AI units able to heal players * Fixed wound treatment * Fixed medic movement * Made units heal themselves earlier	2016-09-04 11:25:03 +02:00
BaerMitUmlaut	c3222bdf0c	Add realistic weights (#3868 ) * Adjusted weapon weights - Vanilla * Adjusted weapon weights - Marksmen DLC * Adjusted weight of SIG 556 to SIG 550	2016-09-04 11:07:36 +02:00
PabstMirror	1c5761f845	Bundle fire damage into larger chunks (#4223 )	2016-09-03 22:00:45 +02:00
J3aLeiNe	7220d0ee5d	compat RHS US : Change for default ACE_12.7x99 (#4184 ) * Change for default ACE_12.7x99 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp * Default ACE3 12.7x99 and recheck bullets values - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing) - recheck all bullets values * Accurate M249s' barrel length * Little add and fix for Atragmx "GunList" (#1) - add 12.7x99 API - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp - Typo Mod0, Mod1 for a better reading on the Atrag's panel - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp - add .308 Mk316	2016-09-03 22:00:15 +02:00
PabstMirror	2b29dcadc3	Merge pull request #4310 from acemod/voiperr-flashlight_housekeeping Map + Flashlights Cleanup (merge conflicts + fixes)	2016-09-02 18:57:48 -05:00
jonpas	0e1f2828a9	Rename Advanced Throwing component to be in-line with other advanced_ components (#4318 ) * Rename Advanced Throwing component to be in-line with other advanced_ components * Rename wiki page as well * Add redirect from old wiki page	2016-09-03 01:39:34 +02:00
PabstMirror	12de3265b8	Fix INFO Macro not in CBA 3.0 (#4320 )	2016-09-02 12:50:23 -05:00
jonpas	d3ee125d5e	Fix Advanced Throwing IR Chemlight and in-hand pick up (#4313 ) * Fix IR Chemlights pick up * Fix attached throwable pick up interaction condition * Fix in hand pick up locality	2016-09-02 14:57:20 +02:00
PabstMirror	c4d2383005	Increase blood bag flow rate for basic medical (#4306 ) * Change blood bags - Increase flow rate for basic medical - Don't queue bags * change to ivBags, reset var on init / fullHeal	2016-09-01 12:46:08 +02:00
jonpas	eb007973c1	Merge pull request #4315 from acemod/fixChemlightShieldDescriptions Fix Chemlight Shield Green and Red descriptions	2016-09-01 01:20:04 +02:00
jonpas	cbdabfb78d	Fix Chemlight Shield Green and Red descriptions	2016-08-31 23:14:12 +02:00
PabstMirror	62bb1db705	Fix chemlight supplyCreate UBC (#4314 )	2016-08-31 16:10:40 -05:00
PabstMirror	41d758567e	Chemlights cleanup (#4304 )	2016-08-31 22:12:40 +02:00
Glowbal	df66b0876f	Minor private variable fixes (#4300 )	2016-08-27 17:35:45 +02:00
PabstMirror	d448ea8916	Improve interaction position for air units. (#4285 ) Fix #4233	2016-08-27 10:37:58 +02:00
[OMCB]kaban	64cf8aa95a	Russain Translations Update (#4286 )	2016-08-27 10:36:00 +02:00
PabstMirror	df7aa38a7a	Allow inheritance for addActionToClass (#4272 ) * Allow inheritance for addActionToClass * Update Headers * Use inline code for inheritance example	2016-08-27 10:35:21 +02:00
Glowbal	1366a6f15f	Merge pull request #4289 from acemod/earlyAddPlayerEventHandler Fix null ace_player from early call to addPlayerEH	2016-08-27 10:32:12 +02:00
Grey-Soldierman	dae3d8d682	Definable classname for Spare Barrel (#4121 ) * Added definable barrel classname through weapon config * Improved condition for player carrying spare barrel	2016-08-27 10:21:15 +02:00
voiperr	fedad7f8f7	Ace_Chemlights (Chemlight Enhancements) (#3921 ) * Add ace_chemlights. Make chemlight intensity and dropoff more realistic. Add orange, white, IR chemlights. Add chemlight shields. Make chemlight impact sounds more realistic. * Moved impact sound changes to a different branch. * Used QPATHTOF. Fixed scopes. Used initServer. Reduced lifetime duration. Checked privates. * Stringtable: 5 minute. * Blue lifetime. Removed ref to deprecated function * Use proper magazine macro. Add new chemlights to Misc box.	2016-08-27 10:19:39 +02:00
commy2	9ef24d25ba	paradrop crates from helicopter or plane cargo (#2468 )	2016-08-27 10:14:54 +02:00
commy2	602d074898	integrate medical-engine handledamage into medical-damage component	2016-08-27 09:39:24 +02:00
commy2	2ac52fb430	remove static fix from vmedical component	2016-08-27 08:50:55 +02:00
PabstMirror	c9f9b89ea2	Fix merge (was moved to XEH_postInitServer) Use short circuit for loadout change and add note	2016-08-25 18:56:57 -05:00
PabstMirror	fd6bd7f794	Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping	2016-08-25 15:50:11 -05:00
Joko	927d8ead8f	add Hiddenselection camo to bodybag for Retexturing (#4276 ) * add Hiddenselection camo to bodybag * Add default texture * Use macro	2016-08-24 12:42:32 -05:00
PabstMirror	3f343086dc	ad fix for noradio	2016-08-23 22:43:37 -05:00
PabstMirror	18153b0451	Fix null ace_player from early call to addPlayerEH	2016-08-23 22:24:59 -05:00
PabstMirror	5a83659136	Don't cookoff when commander turret is hit (#4280 )	2016-08-23 09:57:54 +02:00
commy2	f76457f48f	convert log macros to cba versions	2016-08-22 21:06:52 +02:00
jonpas	f8dfa4f933	Add Advanced Throwing (#3477 ) * Add Advanced Throwing * Add feature documentation	2016-08-22 15:09:08 +02:00
commy2	cda100c9e7	Remove superfluous requiredAddons in hearing	2016-08-20 21:10:37 +02:00
Glowbal	d911dab5a7	Merge pull request #4191 from acemod/fix-4181 add explosive devices to missing units, close #4181	2016-08-20 12:25:56 +02:00
Glowbal	83e78f1021	Merge pull request #4258 from acemod/reviveTimer Clear reviveState when calling setUnconscious	2016-08-20 11:57:51 +02:00
Glowbal	47d17c49dc	Merge pull request #4245 from acemod/eject-ai-crew-cookoff eject ai during cookoff	2016-08-20 11:56:40 +02:00
Glowbal	167dc7735d	Merge pull request #4197 from acemod/litterSimpleObject Use createSimpleObject for medical litter	2016-08-20 11:53:43 +02:00
Glowbal	1f8f463f32	Merge pull request #4267 from acemod/fix-object-event fix FUNC(objectEvent)	2016-08-20 11:49:53 +02:00
PabstMirror	7f9a697dca	Update CBA_DEBUG_SYNCHRONOUS macro for new CBA (#4271 )	2016-08-19 16:33:27 -05:00
commy2	1c6825bcab	skip DLL check on non-windows machines, close #4253	2016-08-19 16:01:59 +02:00
commy2	91e4f50ba0	fix FUNC(objectEvent)	2016-08-19 15:23:47 +02:00
jonpas	ff0dcd3152	Use pushBackUnique in Tags cache (#4249 ) * Use pushBackUnique in tagging * Use configProperties, Add maintainers * Fix header * Revert to configClasses	2016-08-18 20:52:28 +02:00
jonpas	986ac43a68	Cache config UI (#4234 ) * Cache config UI * Use configClasses to prevent reading entries in base class * Fix header not containing return value * One more count * More lazy eval	2016-08-18 19:07:05 +02:00
PabstMirror	b02e91e02e	Clear reviveState when calling setUnconscious #4250	2016-08-18 01:59:40 -05:00
freghar	9fa247398f	add BlueForceTracking filtering via an object variable (#4196 ) There's no good workaround for this: * creating a dummy unit on [0,0,0] and making it leader prevents grp members from entering vehicles * joining group of a different side prevents grp members from seeing blueforce tracking markers of their original side Usage (_obj can be group or unit, depending on BFT_ShowPlayerNames): _obj setVariable ["ACE_map_hideBlueForceMarker", true]; The inverse, hiding of markers of other groups/units for a particular player, can be already done by 'ace_map_BFT_Enabled = false' locally, as the Update function checks for it every time. Signed-off-by: freghar <freghcz@gmail.com>	2016-08-16 19:28:21 -05:00
PabstMirror	24d13e525f	Add ACE_isBelt for DLC/Expansion magazines Fix #4094	2016-08-14 13:35:00 -05:00
commy2	7d2f2023ee	eject ai during cookoff	2016-08-14 13:51:33 +02:00
commy2	2231464087	fix bug which would cause unecessary echo network traffic (#4242 )	2016-08-13 16:45:50 +02:00
Lukas	84a370d0f2	Czech translation (#4241 )	2016-08-13 15:44:48 +02:00
Glowbal	fdfe672491	Merge pull request #4166 from acemod/glasses-hearing Make hearing component compatible with glasses	2016-08-13 14:17:47 +02:00
Glowbal	ba8c8bb5b0	Merge pull request #4109 from acemod/port-incendiary-grenades Port ACE2 incendiary grenades	2016-08-13 14:16:39 +02:00
commy2	58539a0949	Merge branch 'master' of https://github.com/acemod/ACE3 into glasses-hearing	2016-08-13 13:03:23 +02:00
commy2	5b3d424509	always destroy engine, effect only requires cookoff	2016-08-13 12:44:38 +02:00

... 21 22 23 24 25 ...

10878 Commits