9399 Commits

Author	SHA1	Message	Date
VKing	6b62436cfb	Delete unused animation files	2016-06-12 16:29:00 +02:00
VKing	fe18107077	Fix cfgPatches entries	2016-06-12 16:28:42 +02:00
commy2	3c6de5ad6f	remove misc box from gunbag CfgPatches	2016-06-12 14:00:55 +02:00
commy2	000e4a68e6	gunbag improvements	2016-06-12 13:51:23 +02:00
VKing	7f3aacb4d6	Add mass to metal detectors ... Based on values from the manufacturer's pamphlet (vallon.de)	2016-06-12 12:41:59 +02:00
commy2	7a0b9a1a16	Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into ir0n1e-gunbag	2016-06-12 11:02:23 +02:00
commy2	7b49855e89	Merge pull request #3902 from acemod/tanoaWindDAta ... Tanoa Weather Data	2016-06-12 10:26:56 +02:00
VKing	12130c8c3a	Add description string	2016-06-12 10:19:06 +02:00
VKing	3c85398d87	Clean up the sound config	2016-06-12 10:17:02 +02:00
commy2	813b584acf	Merge pull request #3900 from acemod/pipFlicker ... Optics - Create PIP camera only when needed	2016-06-12 10:11:04 +02:00
PabstMirror	8aa5e53bdd	movement - Handle objNull in virtualMass	2016-06-12 02:01:49 -05:00
PabstMirror	5e3d4866a6	Prepare camera when optic equipped	2016-06-12 01:53:03 -05:00
bux578	a2124a6b45	add tanoa wind dir data, add comments	2016-06-12 07:30:38 +02:00
bux578	68e2531af3	Merge remote-tracking branch 'origin/master' into tanoaWindDAta	2016-06-12 07:01:14 +02:00
PabstMirror	d14392c35c	Optics - Create PIP camera only when needed	2016-06-11 23:08:55 -05:00
commy2	ec01ae0d0b	Merge pull request #3897 from acemod/tanoaMapData ... Tanoa map data	2016-06-11 23:03:22 +02:00
SilentSpike	931ccf8a46	Merge pull request #3796 from acemod/zeusModuleUiExample ... Add more zeus modules	2016-06-11 21:41:55 +01:00
bux578	2a667a322d	init WindData --- missing directions	2016-06-11 22:37:03 +02:00
SzwedzikPL	0e247bdb00	CBA events	2016-06-11 22:13:39 +02:00
SzwedzikPL	acdfa52a89	Merge branch 'acemod/master' into dogtags	2016-06-11 22:07:57 +02:00
bux578	950cdb1ee3	fix missing values ... was using an incomplete regex	2016-06-11 22:05:44 +02:00
SilentSpike	242876fa83	Merge remote-tracking branch 'origin/master' into zeusModuleUiExample	2016-06-11 21:02:16 +01:00
PabstMirror	ddf9e0b5cc	CBA Events	2016-06-11 14:57:04 -05:00
Glowbal	e8ba309765	Merge pull request #3887 from gpgpgpgp/patch-2 ... add a line to get rid of 4 first aid kits in the invisible fast roping helper	2016-06-11 21:53:34 +02:00
Glowbal	1632cb9105	Merge pull request #3878 from acemod/fastroping-sounds-fix ... Only play fastroping sounds for player	2016-06-11 21:53:00 +02:00
PabstMirror	00e5cef145	Merge remote-tracking branch 'refs/remotes/origin/master' into add-mine-detector	2016-06-11 14:49:12 -05:00
commy2	250e27bfd2	Merge pull request #3864 from acemod/removeLineDrawing ... Remove line drawing	2016-06-11 21:38:56 +02:00
Butt4cak3	151d13244b	Improved misleading translation of german bandages (#3810) ... * Improved misleading translation of german bandages * Further improved german bandage names	2016-06-11 21:35:22 +02:00
PabstMirror	d57754a7cd	Private/Formatting	2016-06-11 14:34:14 -05:00
PabstMirror	4f73ead80c	Fix alt/lat for maps not defined in getMapData	2016-06-11 14:32:36 -05:00
bux578	c268572649	add Tanoa mapData	2016-06-11 21:14:05 +02:00
bux578	18d864e950	split mapData into separate function	2016-06-11 21:13:51 +02:00
Glowbal	7f9257716e	Merge pull request #2331 from acemod/323bloodyoverlay ... remove BI blood overlay	2016-06-11 20:49:54 +02:00
VKing	589ad4d2e7	Remove attachments from mine detectors ... When WeaponSlotsInfo was added, rifle attachments could be added to the mine detectors.	2016-06-11 20:47:53 +02:00
commy2	a4bd6ea80f	Merge pull request #3893 from acemod/virtualMasDiv0 ... virtualMass - Fix div0 error when naked	2016-06-10 10:27:36 +02:00
commy2	e55881e1ef	Merge pull request #3894 from acemod/fixNametagsUAV ... Fix nametag error when assignedTeam is nil	2016-06-10 10:20:16 +02:00
PabstMirror	dc6d5f1367	Temp fix for change to handleDamage in dev branch ... Fix #3892	2016-06-09 21:26:50 -05:00
PabstMirror	5ecc09d78c	Fix nametag error when assignedTeam is nil	2016-06-09 20:42:30 -05:00
PabstMirror	e8f7f6ea24	virtualMass - Fix div0 error when playing as rabbit	2016-06-09 20:30:45 -05:00
PabstMirror	d7d87be32b	Merge remote-tracking branch 'refs/remotes/origin/master' into removeLineDrawing	2016-06-09 17:20:39 -05:00
SzwedzikPL	5313672e4c	dogtag picture	2016-06-09 17:10:46 +02:00
jonpas	f1ae73967d	Normalize leftovers	2016-06-09 14:28:31 +02:00
jonpas	b97ba4990d	Normalize 2 more files	2016-06-09 14:25:57 +02:00
jonpas	bd5f6107a0	Merge branch 'master' into eol-lf	2016-06-09 14:24:45 +02:00
Glowbal	8c9b31b1c7	Merge pull request #3815 from acemod/cbaEventSystem ... Deprecate ACE events framework	2016-06-09 14:20:26 +02:00
SzwedzikPL	aa407a469a	Merge branch 'acemod/master' into dogtags	2016-06-08 18:13:22 +02:00
gpgpgpgp	0c28cd4413	add a line to get rid of 4 first aid kits in the invisible helper ... The helper "ace_fastroping_helper" inherits from Helicopter_Base_F, and here's chain of inheritance. class CfgVehicles { class AllVehicles; class Air: AllVehicles { class TransportItems { class _xx_FirstAidKit { name = "FirstAidKit"; count = 4; }; }; }; class Helicopter: Air { }; class Helicopter_Base_F: Helicopter { }; class ace_fastroping_helper: Helicopter_Base_F { class TransportItems {}; // now overrides the first aid kits }; }; Was a happy and funny surprise to pick up some decent medical supplies from one end of a cut rope.	2016-06-08 17:26:23 +08:00
voiper	38b98802de	Add grenade, chemlight, and handflare priming sounds. ... Remove default clinking sounds.	2016-06-07 17:22:48 -07:00
BaerMitUmlaut	5dbe99b740	Adjusted single and double dogtag renders	2016-06-07 20:40:26 +02:00
commy2	24ce8b7753	Merge pull request #3880 from acemod/spotting_scope_animated_reticle ... Update Spotting Scope	2016-06-07 19:41:09 +02:00
commy2	5d0e257cd8	center interaction point, add gunner shadows	2016-06-07 19:36:03 +02:00
PabstMirror	1be926f3db	Make rotation key a client setting ... Improve compatibility with other addons	2016-06-07 11:52:28 -05:00
PabstMirror	aea086b75e	Merge branch 'cbaEventSystem' into removeLineDrawing	2016-06-07 11:12:52 -05:00
BaerMitUmlaut	bce92e8d42	Merge pull request #3567 from BaerMitUmlaut/microdagr-microoverhaul ... MicroDAGR Microoverhaul	2016-06-07 09:58:18 +02:00
commy2	f14a1b990b	simplify optics config	2016-06-07 07:38:01 +02:00
Nicolás Badano	527db2bd07	Merge pull request #3884 from acemod/fixShowWindInfoControlsText ... Fix wind info keybind string	2016-06-06 21:39:54 -03:00
jonpas	89db8bef5a	Fix wind info keybind string	2016-06-07 02:22:53 +02:00
jonpas	9287214781	Move Defuse action to main action	2016-06-07 00:51:06 +02:00
commy2	5135d3bedd	delete duplicate files	2016-06-07 00:36:41 +02:00
commy2	3ee10a8c2f	add gunner proxy to FIRE GEO LOD and add it to a component	2016-06-07 00:28:09 +02:00
commy2	f5a96ac2fc	add editor stuff for spotting scope	2016-06-07 00:17:04 +02:00
commy2	12ab4e9fa6	match controls at boarder	2016-06-06 23:33:00 +02:00
commy2	6a5c9cfca7	black periphery	2016-06-06 23:14:19 +02:00
commy2	36d0b78811	coeficient handling interface sizes was inverted	2016-06-06 21:36:29 +02:00
commy2	cd43c17f80	animate the scope	2016-06-06 19:22:24 +02:00
commy2	be260e896b	animated reticle for spotting scope	2016-06-06 17:22:17 +02:00
commy2	a61e4b3a4e	remove BI blood overlay	2016-06-06 14:14:45 +02:00
commy2	fe03272dc6	Merge pull request #3874 from acemod/cleanup_nightvision ... code cleanup fnc_blending	2016-06-06 12:23:42 +02:00
BaerMitUmlaut	27c347eec8	Only play fastroping sounds for player	2016-06-05 19:39:12 +02:00
jonpas	e779bc0cb2	Merge pull request #3877 from acemod/fixUIerror ... Fix selective UI in FFV slots	2016-06-05 14:04:49 +02:00
jonpas	021a123fc6	Fix selective UI in FFV slots, Properly fix config name check	2016-06-05 14:02:55 +02:00
Glowbal	2ad3f57414	Merge pull request #3872 from acemod/fixUIerror ... Fix selective UI script error when changing certain other settings	2016-06-05 13:44:22 +02:00
commy2	e776306295	Merge pull request #3876 from acemod/cleanupMovement ... Cleanup movement and improve debugging	2016-06-05 12:57:34 +02:00
jonpas	2cc1252f81	Remove unused CfgInventoryGlobalVariable in movement and improve debugging	2016-06-05 12:45:53 +02:00
commy2	0424f5db73	cleanup fnc_blending	2016-06-05 10:12:05 +02:00
commy2	8ed2dd11d2	Merge pull request #3871 from acemod/magRepackImprovements ... Add size parameter to displayTextPicture, Improve parameter checking …	2016-06-05 00:05:07 +02:00
commy2	a9a0cfc001	Merge pull request #3873 from voiperr/nvgthrowfix ... Fix NVG overbright when player throws grenades	2016-06-04 23:43:53 +02:00
voiper	354e84e058	Cleanup.	2016-06-04 12:26:38 -07:00
jonpas	b541b0b4f0	Fix selective UI script error when changing certain other settings	2016-06-04 21:20:10 +02:00
jonpas	3124270254	Quote the unquoted	2016-06-04 21:07:24 +02:00
voiper	a10b6ee8e2	Fix thrown blink.	2016-06-04 12:05:47 -07:00
jonpas	5a20f1286b	Change internal event framework names to contain prefix and be as short as possible	2016-06-04 21:05:26 +02:00
jonpas	8ff4a2ecaf	Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style)	2016-06-04 20:40:55 +02:00
jonpas	03a56b1f7d	Fix goKneeling changing animation inside vehicle (1.60)	2016-06-04 19:58:53 +02:00
SilentSpike	90ebf9638b	Update common event names to meet new standard	2016-06-04 11:12:56 +01:00
SilentSpike	1b6bbff139	Revert event names for synced events framework ... Keeping these names as short as possible for network traffic purposes.	2016-06-04 09:46:50 +01:00
Jonathan Pereira	b64b7e431e	Translated remaining strings	2016-06-03 23:11:40 -03:00
SilentSpike	9e4fd77745	Update common event names to meet new standard	2016-06-03 22:39:43 +01:00
SilentSpike	5b8fa4d4f1	Update common status effect framework ... Instead of changing the event names to match the new standards and also changing every single call to `FUNC(statusEffect_set)`/`FUNC(statusEffect_get)` I figured it made sense to only change the event names and the internal workings of `FUNC(statusEffect_sendEffects)` to automatically add the appropriate prefix.	2016-06-03 20:53:43 +01:00
SilentSpike	bd985d57ff	Run event renaming script for new additions	2016-06-03 20:53:43 +01:00
Glowbal	694503c01b	Fix medical events	2016-06-03 20:57:21 +02:00
Glowbal	fa2cf55156	Fix medical related events	2016-06-03 20:22:34 +02:00
PabstMirror	39456003ee	Merge branch 'cbaEventSystem' into removeLineDrawing	2016-06-03 12:55:37 -05:00
BaerMitUmlaut	11f1518220	Fix spottingscope interaction point, add to misc. box (#3862)	2016-06-03 10:21:47 -05:00
jonpas	f90b3b5c54	Merge pull request #3770 from tbeswick96/IRAttachLeftShoulder ... Moved IR Strobe to left shoulder when attached.	2016-06-03 16:33:57 +02:00
jonpas	46b12bd6c3	Merge pull request #3861 from acemod/unify-deployables ... Unify deployables	2016-06-03 16:32:52 +02:00
PabstMirror	77baeda976	Merge branch 'master' into huehuehue	2016-06-03 00:01:13 -05:00
PabstMirror	4915637601	Few more in common	2016-06-02 20:13:09 -05:00
PabstMirror	59ffff406e	Fix missing ;	2016-06-02 20:05:03 -05:00
PabstMirror	240cf4f0b5	Fix merge	2016-06-02 20:02:16 -05:00
PabstMirror	db78dd53a8	Cleanup Merge and remoteFnc events	2016-06-02 19:59:18 -05:00
PabstMirror	d7f9c52c2f	Merge branch 'master' into cbaEventSystem	2016-06-02 19:29:30 -05:00
PabstMirror	7970979a18	Fix removed var in Map Gestures	2016-06-02 15:04:03 -05:00
PabstMirror	73215b707d	Remove Line Drawing from MapTools ... And change map tools key to ALT from CTRL	2016-06-02 14:36:25 -05:00
jonpas	c110121b1a	Merge pull request #3811 from acemod/abolishExecRemoteFnc ... Replace execRemoteFnc with events	2016-06-02 17:08:01 +02:00
jonpas	b0352fdeb9	Merge branch 'master' into eol-lf	2016-06-02 17:02:09 +02:00
PabstMirror	b6aaba7f90	Integrate 1.60 marker shape color map interface (#3860) ... 1.60 adds ability to set color and marker type from the map interface Luckily they use the same values and indexes as ACE, This PR connects the two systems, Selecting a color from the 1.60 map display will set the color in the ace marker display and vice versa	2016-06-02 09:28:52 -05:00
PabstMirror	637b5e02e9	Update 3den attributes to use 1.60 scaling (#3857)	2016-06-02 09:26:57 -05:00
PabstMirror	675214cfb9	Allow drivers of vehicles to show microDagr (#3808)	2016-06-02 09:26:43 -05:00
PabstMirror	68d6c1969b	Cleanup transistion to CBA's waitAndExec (#3858)	2016-06-02 09:22:40 -05:00
jonpas	4c995d4c5c	Improve selective UI API (#3805) ... * Improve selective UI API, Disable ammo count when reload component is loaded, Fix stance UI * Upgrade Selective UI framework for controls that share IDCs for gunner and soldier * Separate more soldier and gunner settings sharing same IDCs, Remove vehicle gunner weapon which has no effect anymore * Separate more soldier and gunner IDC sharing elements, Fix typo, Fix API setting not being respected in case where selective type is not the same on load * Rework Selective UI using ACE_UI config, Cleanup, Add ACE_UI to FCS component to mark it (is already disabled due to other necessary settings for FCS to function) * Do location check in function, Rename condition to location, change to number * Use macros in ACE_UI location	2016-06-02 14:32:39 +02:00
jonpas	590d4fa70b	Merge branch 'master' into abolishExecRemoteFnc	2016-06-02 14:28:43 +02:00
Glowbal	603d07ddc2	Fix incorrect indentation ... Should be using 4 spaces instead of a tab. Quick, before flummi sees this.	2016-06-02 10:53:09 +02:00
Glowbal	2e54310ff4	Merge pull request #3844 from acemod/fixShowHud ... Fix showHud if set before display loaded	2016-06-02 10:39:46 +02:00
Glowbal	5c7148de1f	Merge pull request #3851 from acemod/huntIR-multipara-fix ... Fixed HuntIR deployment	2016-06-02 10:38:37 +02:00
BaerMitUmlaut	cc83bf64d6	Moved all deployables to equipment submenu	2016-06-02 10:35:33 +02:00
BaerMitUmlaut	9d4bd0f8dd	Added custom dogtag model and images	2016-06-02 00:59:15 +02:00
PabstMirror	b949440eb1	Goggles - Fix script error from CBA_fnc_waitAndExecute	2016-06-01 17:27:55 -05:00
jonpas	95573ee711	Stringtable URL (#3855) ... * Move url into stringtable to display it properly, Add some missing author and url entries * Fix main * Remove duplicate author	2016-06-01 23:45:51 +02:00
jonpas	ba27c8f914	Fix WEB_URL end of line error (#3854) ... * Fix WEB_URL end of line error * Change location of quote macro * Fix medical_menu VERSION_CONFIG error	2016-06-01 14:41:33 +02:00
commy2	9d61dd6159	Merge pull request #3850 from acemod/fixCfgPatchesAuthor ... Fix CfgPatches author/ is not a value	2016-06-01 14:24:17 +02:00
jonpas	1354826d56	Put semi-colon to the correct place	2016-06-01 14:11:32 +02:00
commy2	e6000807ee	Merge pull request #3849 from acemod/fix160ubc ... Fix 1.60 UBC (slingloads)	2016-06-01 13:57:07 +02:00
jonpas	1331265e65	Move url into a macro	2016-06-01 13:49:10 +02:00
jonpas	6730d016c2	Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility	2016-06-01 13:27:02 +02:00
BaerMitUmlaut	7a8506cefd	Update handleFired header comment	2016-05-31 23:12:57 +02:00
jonpas	26fbc36cab	Merge branch 'master' into cbaEventSystem	2016-05-31 22:36:08 +02:00
BaerMitUmlaut	f3fbb6cbdd	Fixed HuntIR deployment	2016-05-31 22:13:01 +02:00
jonpas	fa9384ffb4	Fix vanilla CCIP on A-10	2016-05-31 20:35:38 +02:00
Glowbal	d7b239f487	Merge pull request #3795 from acemod/deprecate-components ... Add Deprecate components support	2016-05-31 10:40:24 +02:00
PabstMirror	6905e6f97f	Fix showHud if set before display loaded	2016-05-31 01:53:28 -05:00
PabstMirror	598c3dc181	Fix 1.60 UBC (slingloads)	2016-05-30 17:11:06 -05:00
commy2	fd26e2e44e	Merge pull request #3516 from acemod/cbamissiontime ... replace timePFH with CBA_missionTime	2016-05-30 21:23:57 +02:00
commy2	7512c4e52e	manual merge	2016-05-30 21:14:34 +02:00
jonpas	7a307393a4	Merge branch 'master' into useQuotedPathMacros	2016-05-30 21:14:17 +02:00
commy2	e7fa02d0d9	Merge pull request #3812 from acemod/cbaDelayedExecFnc ... Use new CBA delayed execution functions and deprecate ACE functions	2016-05-30 21:02:29 +02:00
commy2	94b5cea3cf	Merge pull request #3814 from acemod/cbaBinocularMagazineFnc ... Use new binocular magazine CBA functions and deprecate ACE functions	2016-05-30 21:00:43 +02:00
commy2	272775445f	Merge pull request #3670 from acemod/useQuotedFuncMacros ... Use new quoted function macros	2016-05-30 21:00:23 +02:00
commy2	882aa26ab2	Merge pull request #3813 from acemod/cbaGetItemObjectConfig ... Use new CBA get config functions and deprecate ACE functions	2016-05-30 21:00:05 +02:00
PabstMirror	4df30327ac	Flashsuppressors - use next CBA's JM configs (#3709) ... #3700	2016-05-30 13:49:08 -05:00
jonpas	816da2aef1	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
PabstMirror	3163b53710	gforces - Fix missing ace_settings.hpp include (#3837)	2016-05-29 11:54:44 -05:00
bux578	b4cb49ffec	Merge pull request #3836 from acemod/fix_null_rallypoint ... fix rallypoint being objNull, when created via 'createvehicle'	2016-05-29 13:57:44 +02:00
commy2	bc6f756df4	fix rallypoint being objNull, when created via 'createvehicle'	2016-05-29 13:22:49 +02:00
commy2	1bd44e562a	replace a comma with semi colon	2016-05-29 11:44:00 +02:00
Grey-Soldierman	9f588d283c	Fixed indentation again	2016-05-27 19:10:44 +01:00
Grey-Soldierman	d92b5fb459	Fixed indentation	2016-05-27 19:08:34 +01:00
Grey-Soldierman	b0363d4ba9	Removed Valon from any vest configured for holsters	2016-05-27 18:52:30 +01:00
voiperr	52ea640c4b	ace_map: More realistic flashlight glow + minor fix (#3824) ... * -Converted flashlight glow object to chemlight type (emits light without sprite) -Fixed issue where glow object was being deleted without being first detached * Cleanup of temp classes. * Spaces before and after = * Moved effects into Effects.hpp.	2016-05-27 19:16:15 +02:00
jonpas	4f515ec4e1	QGVAR captives, interaction	2016-05-25 20:23:53 +02:00
jonpas	5d36f84eb1	qGVAR overheating and reloadlaunchers	2016-05-25 20:13:36 +02:00
gpgpgpgp	cfb3d7f0a9	add a line to support JSRS Eden (getting rid of JSRS explosion sound effect) ... JSRS Eden defines a SoundSetExplosion[] on ShellBase to define explosion sounds, which gives huntir unexpected exploding sound when used together. Adding SoundSetExplosion[] = {}; shall fix the problem.	2016-05-25 09:17:19 +08:00
PabstMirror	87ee34ba35	vehicleLock - Use QGVAR	2016-05-24 19:37:24 -05:00
PabstMirror	fef50ae48f	Fix duplicate event	2016-05-24 19:25:38 -05:00
jonpas	c4999c13e4	QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus	2016-05-25 02:19:50 +02:00
jonpas	7ede53bbdd	QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics	2016-05-25 02:09:11 +02:00
jonpas	b54d1985f1	QGVAR and fix gforces, goggles, grenades, hearing, interact_menu	2016-05-25 01:57:41 +02:00
jonpas	99675417c6	QGVAR and fix events in concertina_wire, disarming and explosives	2016-05-25 01:51:58 +02:00
jonpas	dd2e9140ae	Q(E)GVAR rangefinderData event	2016-05-25 01:44:56 +02:00
jonpas	da4c08fb6c	QGVAR all reload events	2016-05-24 20:51:10 +02:00
jonpas	30b15ee3d3	Fix quotes in cargo	2016-05-24 19:22:48 +02:00
jonpas	331c3c70cb	Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's	2016-05-24 18:58:27 +02:00
SilentSpike	207d6612da	Remove duplicate ACE_newEvents entries	2016-05-24 15:06:17 +01:00
SilentSpike	c4b75160a4	Run event renaming script	2016-05-24 14:13:11 +01:00
PabstMirror	ccbd52e811	Fix Can't toggle safemode in FFV seats #3819 ... Also block safemode when no weapon	2016-05-23 15:51:09 -05:00
PabstMirror	84eca899a9	Add event renaming system ... Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0	2016-05-23 14:03:55 +01:00
PabstMirror	86b9022322	Fix VehLock Macros	2016-05-22 23:13:15 -05:00
SilentSpike	108ff4f644	Replace ACE event system calls with CBA counterparts ... Regex used: \[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\) [$1,$3,$2] call CBA_fnc_targetEvent E?FUNC\((common,)?(server|global|local)Event\) CBA_fnc_$2Event E?FUNC\((common,)?(add|remove)EventHandler\) CBA_fnc_$2EventHandler	2016-05-22 16:47:39 +01:00
SilentSpike	f0b8da33c4	Deprecate ACE events framework ... CBA 2.4.0 entirely replaces the ACE events framework. Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.	2016-05-22 16:09:49 +01:00
jonpas	bd0e05d7d6	Use CBA config functions, return correct value	2016-05-22 16:18:24 +02:00
jonpas	38b48390b5	Call CBA binocular functions - leave as wrapper	2016-05-22 16:03:41 +02:00
jonpas	bbd96f9e71	Call CBA delayed execution functions, remove ACE's PFH for handling them	2016-05-22 16:01:12 +02:00
jonpas	4b121480bb	Use new binocular magazine CBA functions, deprecate ACE functions	2016-05-22 15:48:03 +02:00
jonpas	d35e89892c	Use new get item and object config CBA functions, deprecate ACE functions	2016-05-22 15:36:31 +02:00
jonpas	e7dbcd7b58	Replace delayed execution functions with new CBA counterparts	2016-05-22 15:29:01 +02:00
jonpas	472e4631d6	Deprecate delayed execution functions	2016-05-22 15:25:59 +02:00
jonpas	d902d1182a	Replace ace_common_fnc_execRemoteFunc with events	2016-05-21 23:55:48 +02:00
SilentSpike	a7c1d0e5bf	Remove erroneous tabs	2016-05-21 17:45:50 +01:00
SilentSpike	3e16142ff6	Merge branch 'master' into zeusModuleUiExample	2016-05-21 17:37:49 +01:00
SilentSpike	b3192adbb7	Add support for a zeus module position attribute ... Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present. Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group. I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708	2016-05-21 17:29:53 +01:00
commy2	c9ea5676ea	travis test	2016-05-21 13:29:42 +02:00
commy2	e40c814b04	Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX	2016-05-21 13:27:51 +02:00
commy2	d395fcd792	travis pls	2016-05-21 13:22:13 +02:00
commy2	aee4d23bdb	fullCrew new parameter to improve FUNC(getTurretX)	2016-05-21 13:07:17 +02:00
Glowbal	dd60ac8170	Remove isEnabled check in sitting ... IsEnabled check is not necessary here. It should not have been included, as it was a left over from testing for migrating sitting to ACEX.	2016-05-21 00:41:49 +02:00
PabstMirror	f69142dd45	Hearing - New XEH, Fix dead effects, Medical var (#3802) ... * Hearing - New XEH, Fix dead effects, Medical var * Use setHearingCapability * Cleanup dead player vol update * Don't change global hearing in medical * Fix exitWith	2016-05-20 11:23:14 -05:00
PabstMirror	d464a23d21	Use the lovely CBA_fnc_canUseWeapon function	2016-05-20 01:10:12 -05:00
PabstMirror	0d5385ffaf	Update FCS hud when manually setting range.	2016-05-19 21:50:51 -05:00
PabstMirror	508b71e7ba	Scopes - Allow Scope Adjust from FFV	2016-05-19 21:39:15 -05:00
SilentSpike	adaa10aea5	Adjust center of zeus AI task modules ... The tasks should center on the logic rather than the group leader. The search nearby module is also deleted after it's processed.	2016-05-19 22:32:05 +01:00
SilentSpike	3a1dba4486	Add zeus defend, patrol and search modules ... Using a shared `radius` attribute for all of these displays so a generalized method of initializing and retrieving the value associated that was implemented.	2016-05-19 01:24:08 +01:00
SilentSpike	e05f2ca637	Add search nearby building zeus module	2016-05-19 01:24:07 +01:00
SilentSpike	600b71817f	Update zeus module logic deletion behaviour ... The teleport players module is reusable, while the global AI skill and group side modules should be deleted appropriately once the display is closed.	2016-05-18 16:30:14 +01:00
SilentSpike	8a70cfbcd8	Clean new zeus module config and functions ... Adds function headers, stringtables and renames some display control classes.	2016-05-18 16:16:35 +01:00
commy2	25876d82ca	manual merge	2016-05-18 12:21:53 +02:00
commy2	230f0ab85e	manual merge	2016-05-18 12:20:33 +02:00
commy2	08bafd535f	deleted to much	2016-05-18 12:00:13 +02:00
commy2	655277cc17	remove previously deleted block	2016-05-18 11:58:42 +02:00
commy2	d93132dac8	more replacing	2016-05-18 11:57:40 +02:00
commy2	da70854568	manual merge	2016-05-18 11:48:27 +02:00
SilentSpike	81d854c56a	Add group side zeus module ... The module is placed on a unit in order to switch the side of that unit's group. A "simple" dialog is used to select the new side. The dialog code is a little ugly to say the least.	2016-05-17 23:44:17 +01:00
SilentSpike	4cbded1811	Fix zeus cargo display for empty vehicles ... The cargo wasn't displaying for empty vehicles because they use a different display.	2016-05-17 23:44:16 +01:00
ir0n1e	4a7f5529f6	added gunbag to ACE_Box_Misc	2016-05-17 12:56:48 +02:00
ir0n1e	3e9cf73b0d	added readme	2016-05-17 12:24:18 +02:00
ir0n1e	1302ccb3fe	clean up	2016-05-17 12:19:17 +02:00
ir0n1e	7ef02400dc	adapted to #3378 and added support for UGL	2016-05-17 12:14:57 +02:00
ir0n1e	c89163316c	fixed idention tabs are 4 spaces now	2016-05-17 11:21:48 +02:00
ir0n1e	6d988524d3	Merge branch 'master' of https://github.com/acemod/ACE3 into gunbag	2016-05-17 11:03:57 +02:00
ir0n1e	1a14634b41	dissolved some edges	2016-05-17 10:57:24 +02:00
SilentSpike	d90d5a7ac1	Rewrite global AI skill zeus module ... Remove the use of ace settings and makes the module more zeus specific. It might be worth adding a similar module or mission settings to ace_ai for mission editing.	2016-05-16 15:16:53 +01:00
commy2	473149b8ca	revert changes from other PR to make it compatible	2016-05-16 15:22:37 +02:00
commy2	cac7b9c0c3	optional param to skip deprecated warning	2016-05-16 15:15:51 +02:00
Glowbal	32055401d3	Add backwards compatability for InventoryChanged ... The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.	2016-05-16 00:09:53 +02:00
SilentSpike	5b460205a9	Add teleport player zeus module	2016-05-15 21:02:40 +01:00
Glowbal	487400b142	Add different warning messages based on current version of component	2016-05-15 20:13:10 +02:00
Glowbal	7a7e930024	Add deprecate sitting component	2016-05-15 19:38:37 +02:00
Glowbal	3d74c25c97	Add deprecate component solution	2016-05-15 19:38:24 +02:00
SilentSpike	4d028be876	Cleanup zeus display modules ... Replaces display size and position defines with macros for readability and compactness. Changes naming convention of functions and displays to distinguish categories and make more readable. Converts the global set skill module to use display events rather than waiting in a loop for the module to be set and confirmed.	2016-05-15 18:08:54 +01:00
SilentSpike	77de1ec6eb	Update vanilla zeus functions ... Merges the changes introduced by arma updates to vanilla functions with our overwrites. I also reverted some of the command capitalization since it makes the process of going through differences quicker in future.	2016-05-15 12:48:32 +01:00
Glowbal	da3f6113d6	Merge branch 'master' into add-mine-detector	2016-05-15 00:20:46 +02:00
commy2	07caf1b0bd	fix for null player	2016-05-14 20:33:33 +02:00
PabstMirror	7628f9a4ab	Fix nils in array	2016-05-14 13:08:58 -05:00
commy2	e4c86a8af5	don't do 'playerInventoryChanged' just because ammo decreased after firing	2016-05-14 19:50:08 +02:00
commy2	cc9e128e74	Merge pull request #3792 from acemod/useGetUnitLoadout ... use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it	2016-05-14 13:04:35 +02:00
commy2	c5275813a4	use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it	2016-05-14 10:49:09 +02:00
Glowbal	04b61ff32e	Fix missing semicolon	2016-05-14 10:37:29 +02:00
Glowbal	180a0f9d84	Merge pull request #3462 from acemod/medicalLoops ... Cleanup medical PFHs	2016-05-14 09:39:14 +02:00
Glowbal	36e48554c2	Merge pull request #3787 from acemod/motorcycleInteraction ... Add interaction support to Motorcycle class	2016-05-14 09:33:41 +02:00
Glowbal	4e109ae93b	Merge pull request #3781 from acemod/specTree ... Fix spectator unit tree refreshing	2016-05-14 09:26:42 +02:00
Glowbal	e867db3a24	Merge pull request #3780 from acemod/lighter-bodybags ... Adjusted weight of bodybag	2016-05-14 09:24:25 +02:00
Glowbal	eb8390741b	Change round down mass of body bag ... Mass is an integer.	2016-05-14 09:23:29 +02:00
Glowbal	57e83f8b35	Merge pull request #3791 from acemod/dropTestMission ... Remove old test-mission	2016-05-14 09:18:06 +02:00
PabstMirror	d48bd3ca83	Remove old testmission addon	2016-05-13 19:54:14 -05:00
PabstMirror	895bf2580a	Merge pull request #3773 from J3aLeiNe/master ... fnc_getMGRSdata.sqf update3	2016-05-13 15:59:24 -05:00
jonpas	a950b2c2fe	Add canPush config entry to enable pushing on boats with mass higher than 2600	2016-05-13 16:33:15 +02:00
SilentSpike	ce3787b3c3	Merge pull request #3768 from acemod/add-zeus-objects-setting ... Add zeus objects setting	2016-05-13 10:39:20 +01:00
jonpas	e984fcf715	Fix part name for Tank class	2016-05-12 21:56:12 +02:00
jonpas	2d2d5bc828	Readd mistakenly removed spare part adding	2016-05-12 21:52:06 +02:00
jonpas	58cc686aac	Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts	2016-05-12 21:49:45 +02:00
jonpas	f6e4bd7a6b	Remove redundant spare part adding	2016-05-12 21:37:54 +02:00
jonpas	c591c7af64	Add interaction support to Motorcycle class	2016-05-12 21:30:32 +02:00
Glowbal	721b161161	Remove useless if statement	2016-05-12 19:56:07 +02:00
Glowbal	7ba02a21ec	Merge remote-tracking branch 'refs/remotes/origin/add-mine-detector' ... Conflicts: addons/minedetector/functions/fnc_detectorLoop.sqf	2016-05-12 19:49:32 +02:00
Glowbal	7cc423d48f	Change mindetector sound	2016-05-12 19:44:43 +02:00
jonpas	5147f366a5	Execute take nozzle actions only on progress bar success (#3783) ... * Execute take nozzle actions only on progress bar success - fix #3739, Prettify params * Fix animation on holster	2016-05-12 17:11:35 +02:00
PabstMirror	09371bce96	Merge pull request #3776 from acemod/cleanupFastRopeSounds ... FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution	2016-05-11 22:29:28 -05:00
commy2	7304bd3fda	Merge pull request #3779 from acemod/showvirtualloadingearmenu ... show virtual load in inventory menu	2016-05-11 22:57:37 +02:00
commy2	dd6241e376	Merge pull request #3778 from acemod/fixGetWeaponState ... fix getWeaponState, fix #3777	2016-05-11 22:57:25 +02:00
BaerMitUmlaut	f9c643b941	Modified fastroping thud sound	2016-05-11 21:05:59 +02:00
SilentSpike	1b1329b350	Increase spectator unit tree refresh rate ... Reduce the time between automated refreshing of the unit tree. Also makes an initial call to the tree populating code upon first opening to remove the initial delay.	2016-05-11 16:01:07 +01:00
SilentSpike	9364ae60df	Fix spectator unit tree refreshing ... - Account for decrement in node index when culling the tree of sides/groups/units - Fix non-zero-based index `to` value when navigating the units in the tree	2016-05-11 13:30:17 +01:00
J3aLeiNe	078c1d585f	Add Kerama Islands by "Les Vétérans" ... add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)	2016-05-11 00:01:35 +02:00
BaerMitUmlaut	38bb4f6c29	Adjusted weight of bodybag	2016-05-10 23:40:03 +02:00
commy2	f738b17db7	show virtual load in inventory menu	2016-05-10 22:32:40 +02:00
commy2	53c9a96c77	fix getWeaponState, fix #3777	2016-05-10 22:14:01 +02:00
J3aLeiNe	c619bcb5a3	Fix "jacobi" latitude and elevationOffset	2016-05-10 19:39:01 +02:00
PabstMirror	518a873efd	Add module readme	2016-05-10 10:14:15 -05:00
PabstMirror	980da16826	FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution	2016-05-10 10:09:52 -05:00
J3aLeiNe	29e7dbf757	fnc_getMGRSdata.sqf update3	2016-05-10 12:39:56 +02:00
commy2	be99d4b3d7	Merge pull request #3772 from acemod/fixmissingmags ... add missing magazines, fix #3685	2016-05-10 11:57:32 +02:00
commy2	505fa0d773	add missing magazines, fix #3685	2016-05-10 11:50:59 +02:00
Tim Beswick	19df821ff5	Moved IR Strobe to left shoulder when attached.	2016-05-09 11:51:28 +01:00
BaerMitUmlaut	3f96e11cbb	Made icons grey	2016-05-08 18:52:33 +02:00
Glowbal	74fd4b4b52	Add run at settings initialized auto add objects	2016-05-08 13:47:35 +02:00
Glowbal	a526d33aba	Fix inconsistent name for module setting	2016-05-08 13:44:51 +02:00
Glowbal	b08af3fea6	Add read auto add objects setting from module	2016-05-08 13:42:45 +02:00
Glowbal	220b8b6352	Merge pull request #3767 from alganthe/zeus_fix ... Add new zeus addObjects setting to settings module (#2451)	2016-05-08 13:41:13 +02:00
jonpas	a0bd521a40	Remove difficulties component	2016-05-07 23:48:31 +02:00
PabstMirror	2a5ec42148	Repair - Improve wheel detection for RHS (#3760) ... * Repair - Improve backup wheel detection Fix #3759 * Cleanup	2016-05-07 16:04:27 -05:00
Glowbal	dbe70a7094	Merge pull request #3761 from acemod/cleanupExplosiveSync ... Fix explosive sync on dedicated server	2016-05-07 22:46:35 +02:00
Glowbal	ed9d05d6dd	Merge pull request #3753 from acemod/blockEngine-statusEffect ... Add blockEngine status effect	2016-05-07 22:40:05 +02:00
J3aLeiNe	d79cbe0844	Getmgrsdata update2 (#3736) ... * correct mildot reticle LRPS/AMS/KHS correct mildot reticle LRPS/AMS/KHS * replace 1 tab with 1 space replace 1 tab with 1 space * fix tab * ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes, same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ (4meter for 1000meter), LRPS : variable magnification / SOS : 2 magnifications * fnc_getMGRSdata.sqf update2 fnc_getMGRSdata.sqf update2 * fnc_getMGRSdata.sqf update2 add new maps, in alphabetic order now	2016-05-07 22:37:58 +02:00
PabstMirror	9f6661f4db	Make 40mm Grenades Frag (#3679) ... * Make 40mm Grenades Frag * Just use existing force cfg instead of adding new Add RHS compat entries	2016-05-07 15:35:39 -05:00
BaerMitUmlaut	4eb2ecb0b6	Fixed getting stuck on rope whilst fastroping (#3734)	2016-05-07 22:35:18 +02:00
BaerMitUmlaut	82f8eb758c	Removed remaining usage of player (#3710)	2016-05-07 22:27:33 +02:00
PabstMirror	1742629045	Add NonSteerable Reserve Parachute (#3689) ... * Add NonSteerable Reserve Parachute Close #3364 * Use params	2016-05-07 22:26:02 +02:00
Rebel	8bd4afed6b	Drag and carry icons. (#3676)	2016-05-07 22:23:38 +02:00
J3aLeiNe	fd8167b7e7	AB - correct mildot reticle LRPS/AMS/KHS (#3664) ... * correct mildot reticle LRPS/AMS/KHS correct mildot reticle LRPS/AMS/KHS * replace 1 tab with 1 space replace 1 tab with 1 space * fix tab * ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes, same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ (4meter for 1000meter), LRPS : variable magnification / SOS : 2 magnifications	2016-05-07 22:20:50 +02:00
commy2	4a8e727ba5	end spectator by global mission end event from server (#3659) ... * end spectator by global mission end event from server * add ;	2016-05-07 22:17:21 +02:00
Ozan Eğitmen	b8abec0c61	Fix Capitalization of ACE Settings classes. (#3627)	2016-05-07 22:14:56 +02:00
Glowbal	f34d890e7a	Merge pull request #3612 from SzwedzikPL/trenchestweaks ... Add remove trench and continue digging trench actions	2016-05-07 22:12:15 +02:00
Glowbal	1ad348d415	Merge pull request #3517 from gruppe-adler/master ... Added fastroping sounds	2016-05-07 22:01:21 +02:00
Glowbal	5ff91484ed	Merge pull request #3438 from acemod/spareBarrelSimulation ... AAR actions + track temperatures of spare barrels	2016-05-07 21:48:03 +02:00
PabstMirror	dd858c7e6b	Stringtables, Add Detector Pos Deubg	2016-05-07 12:08:36 -05:00
PabstMirror	dd049a9699	Merge pull request #3762 from acemod/toggleWindDisplay ... Add key to toggle wind info display	2016-05-07 10:58:43 -05:00
PabstMirror	71b86a7525	Merge pull request #3746 from acemod/fixTacLaderModelCfg ... Tactical Ladder - Update model cfg	2016-05-07 10:58:29 -05:00
PabstMirror	9b46e77f66	Add key to toggle wind info display	2016-05-06 12:47:59 -05:00
PabstMirror	28c65c4bed	Fix explosive sync on dedi	2016-05-05 14:36:56 -05:00
jonpas	59e412032e	Merge pull request #3756 from acemod/uiShowHud ... UI - Don't overwrite other showHud indexes	2016-05-04 21:50:42 +00:00
PabstMirror	cf92ba9c46	Overheating - Add Master Enabled Setting (barrelPR)	2016-05-04 14:59:04 -05:00
ir0n1e	13dc56c435	added opening sounds	2016-05-04 20:06:56 +02:00
PabstMirror	bc584b4c95	Merge remote-tracking branch 'refs/remotes/origin/master' into spareBarrelSimulation	2016-05-04 13:00:34 -05:00
commy2	01cf551aba	Merge pull request #3730 from acemod/cleanupReloadLaunchers ... Cleanup reload launchers	2016-05-04 16:18:37 +02:00
Glowbal	83a8c488d9	Merge pull request #3751 from acemod/wipeoutWhitespace ... Cleaned up excessive whitespace	2016-05-04 11:46:56 +02:00
Glowbal	59d101ea75	Merge pull request #3754 from acemod/removeLegacy ... Removed old occurances of AGM and CSE	2016-05-04 11:46:11 +02:00
ir0n1e	9af55d741b	added new load handling	2016-05-04 09:56:33 +02:00
ir0n1e	cbabae9253	Merge branch 'master' into gunbag	2016-05-04 06:39:26 +02:00
ir0n1e	ad7bd3efc1	Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into gunbag	2016-05-04 06:32:17 +02:00
ir0n1e	ffbc5ca07d	fixed idention and code style	2016-05-04 06:31:35 +02:00
PabstMirror	398b76f30b	Get reload time from QGVAR(buddyReloadTime)	2016-05-03 23:13:43 -05:00
PabstMirror	98a74aca6e	UI - Don't overwrite other showHud indexes	2016-05-03 22:49:05 -05:00
Glowbal	0652978c86	Merge branch 'master' into add-mine-detector	2016-05-03 22:44:16 +02:00
Glowbal	b4fca958aa	Add mine detector port from ACE2	2016-05-03 22:37:02 +02:00
BaerMitUmlaut	012ce9fb16	Removed old occurances of AGM and CSE	2016-05-03 21:38:36 +02:00
BaerMitUmlaut	b6324e61e9	Improved params formatting	2016-05-03 21:24:10 +02:00
BaerMitUmlaut	304f1a22b4	Use blockeEngine status effect in refuel	2016-05-03 21:08:22 +02:00
BaerMitUmlaut	e125911c3b	Added blockEngine status effect	2016-05-03 20:52:43 +02:00
Cuel	66c2bf0506	Fix dead bodies removal, when forced = 1 ... - Removed unused(?) GVAR(Module) - Removed "white space alignment" in module.sqf	2016-05-03 20:10:28 +02:00
commy2	736807f994	fix typo, make variable global	2016-05-03 18:16:39 +02:00
commy2	8585ea5688	add framework to add virtual mass to containers	2016-05-03 18:12:47 +02:00
ir0n1e	cd58eaf974	wrong command (removeAllPrimaryWeaponItems)	2016-05-03 12:52:06 +02:00
ir0n1e	def1d46152	remove weapon items player	2016-05-03 12:49:16 +02:00
ir0n1e	920b9b8e62	Update script_component.hpp	2016-05-03 12:44:58 +02:00
ir0n1e	a34490aca8	added missing }	2016-05-03 10:58:01 +02:00
ir0n1e	d3500d4bee	ACE syntax	2016-05-03 10:51:41 +02:00
ir0n1e	9567b587c6	added gunbag	2016-05-03 10:21:21 +02:00
BaerMitUmlaut	7fcbe93b71	Cleaned up excessive whitespace	2016-05-03 02:32:44 +02:00
PabstMirror	33b624c896	Tactical Ladder - Update model cfg ... #3745	2016-05-02 12:10:44 -05:00
PabstMirror	7cc2da2bb1	Fix self swap action	2016-04-29 23:38:01 -05:00
ProfessorCZ	7d0fcde9fa	CZ Translate - Update ... 04/30/2016	2016-04-30 00:57:24 +02:00
PabstMirror	4eb657bfc7	Merge pull request #3718 from acemod/vehLockACRE ... vehicle inventory lock - compatibility with acre	2016-04-29 13:10:21 -05:00
PabstMirror	7665935641	Use constant reload time value instead of config	2016-04-29 13:00:35 -05:00
commy2	ab09e0989b	Merge pull request #3722 from acemod/fixmacro ... fix wrong macro names	2016-04-28 07:48:25 +02:00
PabstMirror	d826c91c99	Cleanup reload launchers	2016-04-28 00:43:33 -05:00
jonpas	3389bc5e1b	Add cargo to Taru pods	2016-04-28 04:44:57 +02:00
PabstMirror	d40735d5c2	Improve synced event error logging	2016-04-25 15:48:24 -05:00
commy2	5c3f5f5751	fix wrong macro names	2016-04-25 21:34:25 +02:00
PabstMirror	27c5598135	vehicle inventory lock - compatibility with acre	2016-04-24 11:26:13 -05:00
jonpas	b06659a2e4	Fix params error	2016-04-23 00:29:58 +02:00
jonpas	dbe4c6ae26	Merge branch 'master' into uiSettings	2016-04-23 00:17:16 +02:00
PabstMirror	efc956eb99	Merge pull request #3692 from acemod/unloadOnSlopes ... Better handle unloading on slopes	2016-04-22 10:40:16 -05:00
PabstMirror	7366133629	Merge pull request #3699 from acemod/cWireFixes ... Concertina Wire - Don't recoil broken wire, fix killer	2016-04-22 10:40:04 -05:00
PabstMirror	71ff7e9d8a	Merge pull request #3682 from acemod/javelinCursorTargetFix ... Javelin - Verify player has LOS to cursorTarget	2016-04-21 19:50:23 -05:00
PabstMirror	72aa0fffea	Merge pull request #3713 from acemod/gesturesFixBIS ... Fix BIS gesture keybinds	2016-04-21 19:48:26 -05:00
PabstMirror	d7e3f51ec2	Merge pull request #3705 from acemod/gforceSetting ... Gforces - Add ace_setting to only run in aircraft	2016-04-21 19:47:29 -05:00
PabstMirror	9bd66bc40f	Cleanup scopeCurator	2016-04-21 15:07:13 -05:00
PabstMirror	c432ce714e	Make explosives helpers hidden in eden.	2016-04-21 13:56:32 -05:00
PabstMirror	097bba9b68	Spaces	2016-04-21 13:21:55 -05:00
PabstMirror	4214e31678	Fix BIS gesture keybinds ... - From #3635 - FUNC(playSignal) needs "BIgesture" prefix - Interaction conditions are checked on parent, don't need on every child	2016-04-21 13:15:35 -05:00
Glowbal	392012bb4b	Merge pull request #3702 from acemod/dayVector ... Add day (non night vision) version of the vector 21	2016-04-20 18:01:59 +02:00
PabstMirror	c2126c3bd4	Simplify binocular check	2016-04-20 10:48:25 -05:00
PabstMirror	cf9479efab	Non-hardcoded binocular / vector detection	2016-04-20 10:40:00 -05:00
PabstMirror	3adbb59f04	Geforce - Change default to aircraft only	2016-04-19 23:04:51 -05:00
PabstMirror	236ad912af	Gforces - Add ace_setting to only run in aircraft	2016-04-19 12:59:41 -05:00
Glowbal	db5d1d42b7	Merge pull request #3703 from acemod/fix-redundant-privates ... Fixed redundant privates in setCardiacArrest	2016-04-18 15:39:35 +02:00
BaerMitUmlaut	65ccf66d00	Fixed redundant privates in setCardiacArrest	2016-04-18 15:23:04 +02:00
PabstMirror	23632281cf	Add day (non night vision) version of the vector 21	2016-04-17 23:22:41 -05:00
jonpas	0762e13816	Merge pull request #3655 from acemod/improveCargoXEH ... Improve cargo initialization XEH	2016-04-17 11:29:09 +00:00
jonpas	10cadb535f	Merge pull request #3631 from acemod/customTaggingTextureSupport ... Add support for custom textures in tagging	2016-04-17 11:28:14 +00:00
PabstMirror	7bd2378c41	Concertina Wire - Don't recoil broken wire, fix killer ... Close #3695 - Don't recoil broken wire - Use midpoint to search for nearby cars, and ensure the veh was moving.	2016-04-16 12:54:33 -05:00
Glowbal	f8fb75247d	Merge pull request #3693 from acemod/fixShipViewDistance ... Fix ship view distance using foot instead of vehicle setting	2016-04-16 12:45:58 +02:00
PabstMirror	32cd23076f	Merge pull request #3690 from acemod/engineRepairMsg ... Clarify repair while engine is running	2016-04-15 15:56:52 -05:00
jonpas	d90fc3dd06	Fix variable name and header examples	2016-04-14 18:58:01 +02:00
PabstMirror	d523ef1fcd	Try to use cursorObject first	2016-04-14 10:57:36 -05:00
jonpas	839d067797	Exclude base FRIES class	2016-04-14 17:38:11 +02:00
jonpas	300d069e78	Exclude FRIES from repair interactions	2016-04-14 13:59:31 +02:00
jonpas	04831267f2	Use lazy evaluation	2016-04-14 13:55:15 +02:00
jonpas	dec266a546	Fix ship view distance using foot instead of vehicle setting, Cleanup view distance component	2016-04-14 13:52:20 +02:00
PabstMirror	3360047204	Better handle unloading on slopes ... Close #3667	2016-04-13 13:05:32 -05:00
PabstMirror	f16a65f381	Fix default	2016-04-12 20:05:56 -05:00
PabstMirror	4f6b11c2a6	Clarify repair while engine is running ... #3348 - Show action, but exit and show warning when selected - Optional (default off) setting to auto shut off engine to keep compatibility with missions	2016-04-12 20:04:12 -05:00
PabstMirror	d7b0bde1ca	Fix Wildcat attach point	2016-04-12 12:28:48 -05:00
PabstMirror	5d70db3d9b	LoadPerson - Only try vehicles that have room ... Fix #2965 The FRIES is a "Helicopter" so we were trying to load into it, because it was closest. Also disable Cargo system on it so we don't load other things into it And remove all interactions on it as well.	2016-04-12 12:12:49 -05:00
PabstMirror	3744b980f4	Javelin - Verify player has LOS to cursorTarget ... Fix #3668	2016-04-12 02:14:06 -05:00
PabstMirror	2869a53e6d	Googles - Only play wipe anim for primary weapon ... Close #3638 Animation only makes sense for primary weapon, so skip for others.	2016-04-12 00:19:24 -05:00
James McCartney	153cd28f94	Change event name to weaponJammed	2016-04-11 23:09:45 +01:00
James McCartney	121c45eb84	Raise a local event when a weapon is jammed	2016-04-11 22:29:33 +01:00
jonpas	ccaec31a90	Use new QFUNC and QEFUNC macros	2016-04-08 20:43:26 +02:00
jonpas	014421e8ed	Remove redundant quoted function macro defines	2016-04-08 20:41:54 +02:00
jonpas	0c124a2af0	Remove redundant macro define	2016-04-08 20:35:50 +02:00
jonpas	85b4366368	Use new QPATHTOF and QPATHTOEF macros	2016-04-08 20:34:50 +02:00
Glowbal	f409ce8248	Add config style validation	2016-04-07 19:55:10 +02:00
PabstMirror	f8b46e859c	Wait until postInit to install playerChanged event	2016-04-03 23:36:38 -05:00
jonpas	d931eb4e15	Improve XEH adding in cargo	2016-04-03 14:17:16 +02:00
jonpas	357045a0ed	Merge pull request #3518 from ColdEvul/CargoAndInteractionCase ... Carry, drag and load metal and plastic cases	2016-04-03 11:43:11 +00:00
jonpas	3abb3d321c	Merge branch 'master' into customTaggingTextureSupport	2016-04-03 13:41:26 +02:00
jonpas	f4074e981a	Merge pull request #3529 from acemod/tagEvents ... Throw a globalEvent when a tag is created.	2016-04-03 11:38:24 +00:00
jonpas	caf06f58c8	Add map altitude to GPS - fix #3650	2016-04-02 18:53:34 +02:00
nomisum	5c87161118	fixed logic problem	2016-04-02 15:53:39 +02:00
nomisum	02e3e1c7ec	Merge remote-tracking branch 'refs/remotes/acemod/master'	2016-04-02 15:39:44 +02:00
nomisum	fed4662884	changed suggested lines to ace standards	2016-04-02 15:36:21 +02:00
Nicolás Badano	ec2c331bd9	Merge pull request #3644 from J3aLeiNe/master ... fnc_getMGRSdata update1	2016-04-02 09:23:29 -03:00
commy2	a7cf010f7a	Merge pull request #3648 from acemod/fixtagging_master ... fix script error in tagging	2016-04-02 10:12:38 +02:00
J3aLeiNe	4576ea0194	abbottabad altitude fix ... altitude 0 for altitude 1256	2016-04-02 09:50:50 +02:00
PabstMirror	84c5a0d266	FCS - Minor firedEH optimization	2016-04-01 21:51:22 -05:00
jonpas	31953c5d52	Merge pull request #3635 from acemod/fixInvertedGestureStopFreeze ... Fix inverted gestures Stop and Freeze and minor gestures cleanup	2016-04-01 19:30:48 +00:00
jonpas	723d27fc99	Rename tagging action classes	2016-04-01 21:29:03 +02:00
jonpas	fbaae2beb3	Fix stringtable casing	2016-04-01 21:25:00 +02:00
jonpas	9f7f176b1f	Merge branch 'master' into customTaggingTextureSupport	2016-04-01 21:24:31 +02:00
J3aLeiNe	d4a7d864aa	fnc_getMGRSdata update1	2016-04-01 11:53:33 +02:00
J3aLeiNe	093da2badf	Merge branch 'master' into master	2016-03-31 22:22:50 +02:00
PabstMirror	e104b0ac55	Merge pull request #3640 from acemod/fixZeusAutoAdd ... Delay calling addCuratorEditableObjects for a frame	2016-03-31 10:04:44 -05:00
J3aLeiNe	c998ab622e	fnc_getMGRSdata update1 ... fnc_getMGRSdata update1	2016-03-31 14:41:09 +02:00
bux578	076803951d	Merge pull request #3628 from alef/translation/15bn/alef ... Italian translation	2016-03-31 06:54:31 +02:00
commy2	92af6ffe2e	add cargo space to csat attack heli (can transport 8 troops)	2016-03-31 01:03:40 +02:00
commy2	28468bec82	specify helicopter cargo spaces, fix #3591	2016-03-31 00:57:04 +02:00
Joko	6038ab89c9	improve Code to String	2016-03-30 23:02:52 +02:00
PabstMirror	6f412c312a	Delay calling addCuratorEditableObjects for a frame ... Fixes createVehicle not always being added on dedicated server.	2016-03-30 10:26:33 -05:00
PabstMirror	a83c3b5219	Merge pull request #3623 from acemod/fixAbTerrainProcessor ... Fix AB Terrain Extension	2016-03-29 13:08:14 -05:00
commy2	89428dc55c	Merge pull request #3624 from acemod/compatPboWarnings ... Compat pbo warnings	2016-03-29 17:01:53 +02:00
commy2	a4c848a090	formating	2016-03-29 17:00:54 +02:00
jonpas	ec2be36e81	Use boolean	2016-03-29 16:25:55 +02:00
jonpas	2d22b06150	Add README.md to gestures and update author URL	2016-03-29 16:08:33 +02:00
jonpas	330977a709	Remove including DIK KeyCodes definitions, use decimal codes, Improve BI gesture handling even further	2016-03-29 16:03:41 +02:00
jonpas	3489dd48bb	Remove unused gestures, Improve stringtabling and remove duplicate	2016-03-29 15:51:51 +02:00
commy2	49f6904f9e	Merge pull request #3634 from acemod/fixerrornoname ... fix FUNC(setName) for Zeus and alive spawned units	2016-03-29 15:48:19 +02:00
jonpas	c24c1b9dc0	Fix inverted Stop and Freeze - prone Stop will still be freeze due to BI animation being wrong	2016-03-29 15:39:32 +02:00
commy2	4e1b2dd24a	just delay setName one frame	2016-03-29 15:32:05 +02:00
commy2	1f6f90a5b2	fixerrornoname	2016-03-29 13:59:07 +02:00
commy2	666a4030b5	make FUNC(scriptedExplosive) work in scheduled env, ref #3621	2016-03-29 13:21:13 +02:00
jonpas	6469b11f3c	Cleanup tagging, use internal getTexture for getting texture from color, move tag size definition	2016-03-28 20:07:02 +02:00
jonpas	dc1af390cd	Allow custom texture for tagging (only direct function call)	2016-03-28 18:44:30 +02:00
PabstMirror	bcde9f8ed6	Filter minor falling damage to non-leg hitpoints	2016-03-28 01:15:58 -05:00
Alessandro Foresi	e97c7c0f65	Translation: IT completed (with BOM)	2016-03-27 21:22:15 +02:00
Alessandro Foresi	e5a7578f92	Translation: IT completed (no BOM)	2016-03-27 21:20:15 +02:00
PabstMirror	e90609d043	Fix AB Terrain Extension	2016-03-24 12:23:48 -05:00
PabstMirror	86ad2ab415	Only warn for weapon compat if AB is on	2016-03-24 11:53:55 -05:00
PabstMirror	b0df31783d	Merge branch 'master' into compatPboWarnings	2016-03-24 11:23:29 -05:00
SzwedzikPL	174e69c3a5	move dogtag macros to CfgWeapons	2016-03-23 17:33:08 +01:00
SzwedzikPL	9b1b4a46fa	better polish translation	2016-03-23 17:17:16 +01:00
SzwedzikPL	cdcde46a7d	Fix double displayName in medical settings	2016-03-22 13:05:47 +01:00
SzwedzikPL	10d20472d3	Remove grass behind the trench	2016-03-22 11:26:40 +01:00
SzwedzikPL	203c059cc1	move placement data to config, setTrenchPlacement fnc, cleanup	2016-03-22 08:10:37 +01:00
Nicolás Badano	b4f6dbbc18	Merge pull request #3568 from acemod/settingsNameDescp ... Ace_Settings - add name,descption,categories	2016-03-21 21:24:22 -03:00
SzwedzikPL	d6e9890b1b	Add remove trench and continue digging trench actions	2016-03-21 18:25:38 +01:00
esteldunedain	ec2920ed35	Improve protractor accuracy. Close #3606	2016-03-20 22:24:30 -03:00
commy2	5aeb19312b	fix script error in tagging	2016-03-20 17:09:03 +01:00
commy2	a841839aa6	don't overwrite helicopter sub class self actions	2016-03-19 19:37:26 +01:00
SzwedzikPL	1cdecf75da	double dogtag support, fix addDogtagItem event in mp, unconscious units support, little cleanup	2016-03-19 18:12:18 +01:00
SzwedzikPL	ca3171a33a	Initial commit dogtags	2016-03-19 16:17:26 +01:00
SzwedzikPL	8555f00889	remove needless tolower from mortarinit	2016-03-18 17:26:37 +01:00
Thomas Kooi	daceaa9dd8	Merge branch 'master' into settingsNameDescp	2016-03-18 14:48:11 +01:00
Thomas Kooi	e8b26a7a14	Merge pull request #3593 from BaerMitUmlaut/release ... Fixed fastroping race condition	2016-03-18 12:07:43 +01:00
BaerMitUmlaut	fc06782256	Fixed broken ropeDetach	2016-03-18 00:16:31 +01:00
BaerMitUmlaut	b25ffdb54f	Fixed network race condition	2016-03-18 00:15:57 +01:00
commy2	5e52e22e81	Merge branch 'release' into fixNametagsRank	2016-03-17 20:14:40 +01:00
PabstMirror	218d333738	Fix nametag error when rank is empty string	2016-03-17 11:56:20 -05:00
Glowbal	485900dce8	increment patch version	2016-03-16 22:59:28 +01:00
Thomas Kooi	559d111e66	Merge pull request #3584 from SzwedzikPL/fixmk6mortarinit ... Fix mortar ammo handling init on dedicated	2016-03-16 22:48:49 +01:00
commy2	0c42bb5345	Merge branch 'release' into revc65656a0	2016-03-16 22:44:19 +01:00
jonpas	72c9e9da39	Replace usage of filter to select in tagging	2016-03-16 20:17:23 +01:00
jonpas	c568c18865	Add module icon	2016-03-14 19:14:52 +01:00
jonpas	89924e927a	Disable debug	2016-03-14 17:25:20 +01:00
Nicolás Badano	8ff4fb8851	Merge branch 'release' into revc65656a0	2016-03-14 12:21:11 -03:00
esteldunedain	14183470bc	Revert "Improved rope glitchyness" ... This reverts commit c65656a016.	2016-03-14 12:16:23 -03:00
SzwedzikPL	32846014a1	fix ammo handling init on dedicated	2016-03-14 14:21:02 +01:00
PabstMirror	2ab169eb73	Merge branch 'release' into FixTrue	2016-03-12 13:46:44 -06:00
PabstMirror	1985e7e20a	Fix versioning true when compiled	2016-03-12 13:42:52 -06:00
Thomas Kooi	61f1959109	Fix morphine increasing viscosity ... Morphine should decrease viscosity instead of increase. Closes #3579	2016-03-12 18:55:42 +01:00
commy2	fca8b51bb2	reset interaction menu time variables on save game load	2016-03-12 17:08:08 +01:00
esteldunedain	aad79eda85	The dead shouldn't interact (it's not TWD)	2016-03-12 10:06:45 -03:00
jonpas	32c32b6cc5	Add stamina bar selective UI	2016-03-09 18:58:46 +01:00
PabstMirror	ad3a03a9c7	versioning - Add warnings for missing compat PBOs	2016-03-08 13:52:34 -06:00
PabstMirror	94adcf4ccb	MicroDagr Scalar Values	2016-03-08 13:17:20 -06:00
esteldunedain	3122542814	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2016-03-08 15:25:04 -03:00
esteldunedain	69bd858167	Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes ... Conflicts: addons/fastroping/CfgMoves.hpp addons/fastroping/CfgVehicles.hpp	2016-03-08 15:24:23 -03:00
BaerMitUmlaut	3710c04da4	Use head instead of body direction for compass	2016-03-08 19:22:04 +01:00
Thomas Kooi	bfe738ba80	Merge pull request #3513 from acemod/cbaVersioning ... Add CBA 2.3.1 to versioning check	2016-03-08 19:21:36 +01:00
BaerMitUmlaut	f18094e7e4	MicroDAGR OS Upgrade	2016-03-08 19:21:28 +01:00
Thomas Kooi	ddd8187b19	Merge pull request #3534 from GitHawk/refuel_isEngineOn ... Disallow refueling with running engine	2016-03-08 19:20:28 +01:00
esteldunedain	2b33dd7686	Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy ... Conflicts: addons/fastroping/XEH_preInit.sqf	2016-03-08 15:13:50 -03:00
esteldunedain	88f4c49c08	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2016-03-08 15:08:53 -03:00
esteldunedain	afe835816f	Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes ... Conflicts: addons/fastroping/CfgVehicles.hpp	2016-03-08 15:07:45 -03:00
commy2	4ceb1b34b8	Merge pull request #3566 from acemod/removeDragCarryFromCannons ... Disable drag and carry for StaticCannon	2016-03-08 19:05:04 +01:00
jonpas	70100825cf	Fix params in clientInit	2016-03-08 18:49:19 +01:00
PabstMirror	1a77b0fcd4	Disable drag and carry for StaticCannon ... #3528	2016-03-08 11:43:35 -06:00
jonpas	e90ef30904	Add return value to public setElementVisibility function	2016-03-08 18:42:37 +01:00
jonpas	23e2617db8	Change params order and improve clientInit	2016-03-08 18:40:23 +01:00
Thomas Kooi	60af0d3162	Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR ... Standardize GVAR array brackets in configs.	2016-03-08 18:19:50 +01:00
jonpas	64fe944b0f	Add public setter function, Optimize some checks	2016-03-08 18:12:01 +01:00
PabstMirror	3232654e13	Close #3565 -Fix spelling of local var _woundEffectiveness	2016-03-08 11:02:54 -06:00
PabstMirror	b5e95f3945	Add some names/descriptions to settings configs	2016-03-08 01:17:40 -06:00
commy2	e605ede04a	execute addActionEvents in unscheduled env	2016-03-08 01:19:32 +01:00
BaerMitUmlaut	35857f4523	Cleanup canPrepareFRIES	2016-03-07 20:42:13 +01:00
Thomas Kooi	d86f58f418	Merge pull request #3525 from acemod/sandbag3den ... Set sandbag side to civ to show in 3den	2016-03-07 19:30:24 +01:00
Thomas Kooi	8946779c1a	Merge pull request #3527 from acemod/fixHrCallbackVar ... Fix empty callback for hr adjustment	2016-03-07 12:51:23 +01:00
BaerMitUmlaut	c65656a016	Improved rope glitchyness	2016-03-06 20:33:23 +01:00
BaerMitUmlaut	84af4b7676	Force open ramps on helicopters	2016-03-06 19:53:37 +01:00
commy2	a85c5b14cf	Merge pull request #3547 from acemod/fixsavegamecrashmaybe ... Store Interact Menus on CBA Namespaces	2016-03-06 19:28:26 +01:00
commy2	a9578ab473	Merge pull request #3524 from acemod/fixCancelAction ... Fix Cancel (RMB) Action	2016-03-06 19:16:40 +01:00
commy2	81c29d8120	Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint ... Disable only action menu on mouse hint and modifier where unnecessary	2016-03-06 19:13:10 +01:00
commy2	391aaeba89	Merge pull request #3548 from acemod/namespaceforcargofilters ... use namespace for cargo filters, fixes problem with save games	2016-03-06 19:10:53 +01:00
commy2	c90775091e	Merge pull request #3549 from acemod/fixmagincompat ... remove obsolete fix, fix #3545	2016-03-06 19:10:45 +01:00
jonpas	858c68f8d7	Don't use modifier for rotation where not needed	2016-03-06 16:54:27 +01:00
jonpas	c378cd9f12	Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands	2016-03-06 16:47:46 +01:00
jonpas	f956675d35	Merge pull request #3542 from acemod/refuelGlobalEvents ... Replace execRemoteFnc with events and increase fuel update delay in refuel	2016-03-06 16:23:02 +01:00
jonpas	b47b887a21	Fix event name already being used	2016-03-06 16:20:16 +01:00
jonpas	9b46e8856e	Merge modules, Add base allow client settings toggle, Add requires descriptions	2016-03-06 15:41:17 +01:00
jonpas	a064c0c98d	Modernize code	2016-03-06 12:50:16 +01:00
jonpas	0dc1e37874	Merge branch 'master' into uiSettings	2016-03-06 12:41:27 +01:00
jonpas	52007fab6a	Add sanity checks, fix explosives checks	2016-03-06 12:06:17 +01:00
commy2	79db282aca	remove obsolete fix, fix #3545	2016-03-06 09:12:49 +01:00
commy2	8892aeed9d	missed one	2016-03-06 07:55:34 +01:00
commy2	8603f2062a	simplify	2016-03-06 07:14:43 +01:00
commy2	f43b287093	use namespace for cargo filters, fixes problem with save games	2016-03-06 06:53:59 +01:00
commy2	6a58af5b33	fix save game crash?, ref #3397	2016-03-06 06:22:38 +01:00
esteldunedain	ae8cbb4834	Add "check temperature" and "swap barrel" actions for AARs	2016-03-05 23:33:30 -03:00
jonpas	ae3a41e6d8	Move common event handlers closer to their counterparts	2016-03-06 02:38:05 +01:00
Nicolás Badano	de6af27912	Merge pull request #3492 from acemod/Fix3491_MortarBoxes ... Replace transportMax... with maximumLoad for mortar boxes.	2016-03-05 22:09:07 -03:00
Nicolás Badano	9f205b4a54	Merge pull request #3509 from acemod/fix3379 ... Increase interaction distance with explosives from 1m to 1.5m.	2016-03-05 22:08:31 -03:00
Nicolás Badano	1d3950bfff	Merge pull request #3497 from acemod/liteDrag ... Fix portable light floating / dir when carrying	2016-03-05 22:07:43 -03:00
Nicolás Badano	e2c2495d52	Merge pull request #3496 from looterz/bftbug ... Fix for player markers not showing up correctly with BFT_ShowPlayerNames	2016-03-05 22:05:33 -03:00
esteldunedain	e15d534fd1	Rename event, removing prefix. Back to square one.	2016-03-05 21:11:53 -03:00
BaerMitUmlaut	8e895e8cff	Added gantry hiding animation	2016-03-05 23:21:10 +01:00
BaerMitUmlaut	b20e433f43	Fixed bug with fastroping simultaneously	2016-03-05 23:20:44 +01:00
BaerMitUmlaut	8039332743	Switched to preStart + XEH_PREP	2016-03-05 23:19:53 +01:00
BaerMitUmlaut	21d546ac1c	Added note concerning BIS_fnc_guiMessage	2016-03-05 21:22:45 +01:00
PabstMirror	721aa94a29	Merge pull request #3536 from acemod/dediCaps ... Fix captivity system on dedicated	2016-03-05 14:08:53 -06:00
BaerMitUmlaut	b8a4349c10	Added deployment API and waypoint	2016-03-05 20:25:35 +01:00
jonpas	9463b05218	targetEvent -> objectEvent	2016-03-05 18:16:09 +01:00
jonpas	881eaf951a	Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local	2016-03-05 18:07:07 +01:00
jonpas	589ca27b60	Fix missing comma	2016-03-05 18:02:21 +01:00
jonpas	015a60e6c4	Increase fuel update to 1s	2016-03-05 17:44:03 +01:00
jonpas	401d457a46	Replace execRemoteFnc with global/targetEvent in refuel	2016-03-05 17:41:47 +01:00
esteldunedain	6cf9787fd1	Fix travis warning	2016-03-05 13:18:41 -03:00
esteldunedain	ebfd76107e	The function name was changed in CBA	2016-03-05 13:15:56 -03:00
esteldunedain	62f598b2a6	Use the correct CBA function name, defining it in ACE as long as it doesn't exist already.	2016-03-05 13:11:20 -03:00
jonpas	b37b1a39b2	Allow string input for isBackpack	2016-03-05 14:29:04 +01:00
nomisum	e36198561f	Merge remote-tracking branch 'refs/remotes/acemod/master'	2016-03-05 12:43:27 +01:00
PabstMirror	4826a89ef5	Fix captivity system on dedicated ... Fix #3532	2016-03-04 11:45:38 -06:00
GitHawk	0b3abd55d3	Disallow refueling with running engine	2016-03-04 13:59:14 +01:00
esteldunedain	5450954fc2	Rename the event as "ace_tagging_tagCreated"	2016-03-04 09:16:42 -03:00
esteldunedain	02616ebbb2	Throw a globalEvent when a tag is created. Close #3521.	2016-03-03 19:43:26 -03:00
PabstMirror	e3deebff7e	Fix empty callback for hr adjustment ... Fix #3526 Same issue as #3384	2016-03-03 13:23:53 -06:00
PabstMirror	53a36f8783	Add REQUIRED_CBA_VERSION macro to script_mod.hpp	2016-03-03 13:00:47 -06:00
PabstMirror	56c5343bd7	Set sandbag side to civ to show in 3den ... ref #3102 #2633	2016-03-03 12:54:13 -06:00
jonpas	ef95e278f9	Fix Cancel Action by moving it to MouseButtonDown display EH	2016-03-03 17:35:43 +01:00
PabstMirror	137a512a9e	close main display if using incompatible cba	2016-03-02 16:33:29 -06:00
commy2	e6c6e55968	Merge pull request #3507 from acemod/mouseZChangedEH ... Replace addScrollWheelEventHandler with MouseZChanged Display EH	2016-03-02 23:15:50 +01:00
commy2	92fddff833	also fix modifier key	2016-03-02 23:14:23 +01:00
nomisum	76468d326b	fixed license file	2016-03-02 22:49:25 +01:00
nomisum	9b55aa1555	Merge remote-tracking branch 'refs/remotes/acemod/master'	2016-03-02 22:40:33 +01:00
nomisum	48e9e9c9e4	added CBA-PFH, added QUOTE	2016-03-02 22:36:42 +01:00
commy2	9a0c839ced	Merge pull request #3508 from acemod/fix3504 ... Make the FRIES inherit from Helicopter_Base_F. Fix #3504	2016-03-02 22:28:01 +01:00
ColdEvul	80bada0365	Fixed carrying rotation.	2016-03-02 22:27:29 +01:00
nomisum	730e79def0	added fastroping sounds	2016-03-02 22:17:49 +01:00
ColdEvul	8b4892598a	added EventHandlers	2016-03-02 22:17:19 +01:00
commy2	303f8d93b9	simplify inheritance	2016-03-02 22:16:40 +01:00
FFAAMOD	95007d8ccd	Spanish translation of FastRope fixed ... Fixed wrong tag in Spanish Translation of Fast Rope module.	2016-03-02 21:00:46 +01:00
esteldunedain	e0493458c0	Reduce interaction distance for defusing back to 1m	2016-03-02 16:19:38 -03:00
PabstMirror	e6a5d2dacd	Add CBA 2.3.1 to versioning check	2016-03-02 13:19:20 -06:00
FFAAMOD	6b13ea287e	Added Spanish Translation to fastroping module ... Added Spanish Translations, some of these can have multiple translations but according to the context, they match properly their meanings.	2016-03-02 19:56:50 +01:00
esteldunedain	928a9b9485	Increase interaction distance with explosives from 1m to 1.5m. Fix #3379	2016-03-02 15:25:41 -03:00
esteldunedain	0399335a3f	Make the FRIES inherit from Helicopter_Base_F. Fix #3504	2016-03-02 14:41:41 -03:00
jonpas	4918dbacb0	Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH	2016-03-02 17:33:46 +01:00
ColdEvul	b91897de3b	Added comment	2016-03-02 16:41:45 +01:00
ColdEvul	e7ec87d284	Added carry and interaction for case.	2016-03-02 16:38:23 +01:00
commy2	467075ad67	replace timePFH with CBA_missionTime	2016-03-02 11:01:39 +01:00
PabstMirror	8f620f2e61	Fix portable light floating / dir when carrying ... #3486	2016-03-01 18:49:41 -06:00
looterz	b86e5d8ad6	Fixes player markers not showing up correctly when BFT_ShowPlayerNames is enabled in multiplayer	2016-03-01 18:23:33 -06:00
esteldunedain	d886289716	Display the new weapon temperature right after swapping barrels	2016-03-01 19:27:39 -03:00
esteldunedain	850a499c0e	Localize spare barrel's displayName	2016-03-01 19:26:20 -03:00
esteldunedain	e6a2ca7102	Fix typos	2016-03-01 19:25:45 -03:00
esteldunedain	f130d6c253	Increase spare barrel mass to 60 (2.7 Kg)	2016-03-01 18:17:58 -03:00
esteldunedain	b8c8c21a02	Remove spare barrels from starting equipments	2016-03-01 18:17:23 -03:00
esteldunedain	a041555381	Add an animation and progressbar to the "Check spare barrels temperatures" action	2016-03-01 18:16:14 -03:00
esteldunedain	46a96dd5da	Move spare barrel event handlers out of postInit	2016-03-01 18:14:36 -03:00
VKing	353b5e9ef4	Replace transportMax... with maximumLoad for mortar boxes. ... Fixes 3490	2016-03-01 21:58:21 +01:00
esteldunedain	bc4a338d32	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spareBarrelSimulation	2016-03-01 17:15:14 -03:00
Glowbal	e2c7576251	Remove headless client component from ACE. ... The component does not fit properly within the scope of the ACE project. In order to avoid difficulties at a later point in time, project management has decided to pull the HC component from the ACE 3.5.0 release. We are going to look into alternative options for the HC component, such as a separate repository maintained by the ACE team.	2016-03-01 19:09:42 +01:00
commy2	fa3913752b	replace XEH_ENABLED macro with actual class, fix #3482, fix #3483	2016-03-01 17:05:00 +01:00
esteldunedain	bafe714ab5	Remove spare barrels from starting equipment, as they make some grenades not fit in the uniforms.	2016-03-01 10:05:06 -03:00
Jonathan Pereira	309f48ee0b	Added remaining PT-BR translarions	2016-03-01 08:56:43 -03:00
NorXAengell	772c4cc100	Another batch of translations and corrections (Fr)	2016-03-01 02:27:19 +01:00
PabstMirror	2bdeff1639	Fix for all missionVersions	2016-02-29 16:34:51 -06:00
PabstMirror	cb370c4f70	Merge branch 'release' into 3den_-1	2016-02-29 14:16:34 -06:00
PabstMirror	fe967ff2bd	Don't read medic setting that is not in module	2016-02-29 14:07:15 -06:00
PabstMirror	2b3b6083cb	Try to handle bad 3den mission modules	2016-02-29 14:06:14 -06:00
BaerMitUmlaut	5b4072bf50	Added vehicle existance check	2016-02-29 19:29:11 +01:00
BaerMitUmlaut	05c16a5dfb	Removed TOH animations	2016-02-29 19:29:10 +01:00
BaerMitUmlaut	11a66d98e2	Cleanup & fix interaction conditions	2016-02-29 19:29:09 +01:00
PabstMirror	c0c6d3c52f	Merge branch 'release' into fixFastropeRepairError	2016-02-29 12:10:34 -06:00
jonpas	7b96fe6c28	Disable logging in tagging - fix #3468	2016-02-29 16:37:19 +01:00
esteldunedain	9e682253f3	Move the dead body cleanup PFH to a loop using waitAndExecute	2016-02-28 23:33:51 -03:00
esteldunedain	90a54397ae	Move the litter cleanup PFH to a loop using waitAndExecute	2016-02-28 23:20:26 -03:00
esteldunedain	4b702f68df	Make loops non public	2016-02-28 23:10:15 -03:00
esteldunedain	94e8bee348	Move the pfh from setDead to a waitAndExecute loop: reviveStepLoop	2016-02-28 23:08:25 -03:00
esteldunedain	12895e7983	Remove unneeded parameter	2016-02-28 22:58:09 -03:00
esteldunedain	0e82cdfe82	Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance.	2016-02-28 22:50:04 -03:00
esteldunedain	21d4939abb	Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10	2016-02-28 22:08:59 -03:00
esteldunedain	35e13d5357	Fixes	2016-02-28 20:55:05 -03:00
esteldunedain	bbb84ec7d1	Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities	2016-02-28 20:50:28 -03:00
esteldunedain	085860c770	Restore addToInjuredCollection as a deprecated function	2016-02-28 20:32:02 -03:00
esteldunedain	bed51ac8a4	Fix waitAndExecute syntax	2016-02-28 20:26:05 -03:00
esteldunedain	3bbabac2d7	Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance.	2016-02-28 20:12:56 -03:00
jonpas	f5ff593dea	Revert "Convert fastroping animations to Arma 3, fix bone errors"	2016-02-28 23:16:44 +01:00
jonpas	8d326a0a1b	Remove duplicate medical string	2016-02-28 22:54:24 +01:00
PabstMirror	e5b79d7b33	Don't try adding repair actions to fastrope helper	2016-02-28 14:17:14 -06:00
BaerMitUmlaut	75c2e3d032	Added QUOTE macros to fastroping configs	2016-02-28 18:56:45 +01:00
VKing	8bb7b072d4	Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. ... This prevents any possible confusion when the GVARs are used in code.	2016-02-28 15:18:15 +01:00
BlackWindowS	c61e7b5104	Tweaked & added translations ... Translation of almost every STR to French	2016-02-28 14:48:04 +01:00
Thomas Kooi	6bfe86e91a	Merge pull request #3455 from acemod/fix3450 ... Fix #3450	2016-02-28 13:07:03 +01:00
commy2	69f810f32b	add missing pee	2016-02-28 07:25:11 +01:00
commy2	03b8e2b590	fix reloadMutex nil, fix#3450	2016-02-28 06:12:40 +01:00
PabstMirror	147cd1a5af	Hide categories that have no user settable options	2016-02-27 18:06:02 -06:00
jonpas	0e606224c7	Convert fastroping animations to Arma 3, fix bone errors	2016-02-27 22:28:12 +01:00
jonpas	905586bddc	Make unused medical strings be used	2016-02-27 21:04:04 +01:00
Glowbal	428b828c27	Increase version 3.5.0	2016-02-27 20:44:38 +01:00
Thomas Kooi	f758a90351	Merge pull request #3445 from acemod/preventSelfIMFromClosing ... Prevent Self Interact Menu from bugging out during animations	2016-02-27 20:35:18 +01:00
Thomas Kooi	d0b1ac56ba	Merge pull request #3440 from System98/Update-german-translations ... Update german translations	2016-02-27 20:33:51 +01:00
esteldunedain	a86bbdb162	Prevent the interact menu from closing when moving the mouse during animations	2016-02-27 15:47:23 -03:00
ElTyranos	9d50812a65	Fastrope French translation	2016-02-27 19:46:15 +01:00
esteldunedain	121663226c	Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases.	2016-02-27 15:44:53 -03:00
commy2	a7ec4d9d2f	Merge pull request #3398 from acemod/fix3317 ... Resync mine orientations in JIP.	2016-02-27 16:52:53 +01:00
Thomas Kooi	a9fa3a99b8	Merge pull request #3441 from acemod/fixNametagsError ... Fix error in nametags when a player disconnects	2016-02-27 15:17:15 +01:00
esteldunedain	30d62859dc	Fix error in nametags when a player disconnects	2016-02-27 10:17:26 -03:00
esteldunedain	188941a9b7	Filter the GVAR(explosivesOrientations) list before sending it	2016-02-27 10:07:51 -03:00
esteldunedain	fba1a322ac	Yet more fixes	2016-02-27 09:50:44 -03:00
esteldunedain	823eb116ae	more fixes	2016-02-27 09:37:57 -03:00
esteldunedain	8280335d07	Fix event name typo	2016-02-27 09:26:42 -03:00
esteldunedain	b9e1028f23	Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317	2016-02-27 09:14:16 -03:00
esteldunedain	834cbb4d24	Debug stuff	2016-02-27 09:14:07 -03:00
esteldunedain	849fa4f1ee	Redo markers, lost in the merge	2016-02-27 09:06:19 -03:00
System98	df3ec3a179	Fix length of a display name ... - Fix the length of a display name so it doesn't get cut off in the settings.	2016-02-27 12:51:32 +01:00
System98	a13b029b4a	Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations	2016-02-27 12:50:07 +01:00
esteldunedain	db4974eae2	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317 ... Conflicts: addons/medical/CfgEden.hpp addons/repair/CfgEden.hpp	2016-02-27 08:48:57 -03:00
Thomas Kooi	ae136af2d6	Merge pull request #3415 from looterz/bftplayernames ... Added Show Player Names option to Blue Force Tracking Module	2016-02-27 12:43:15 +01:00
Thomas Kooi	a0ea724db4	Merge pull request #3436 from acemod/register-last-damage-source ... Add registering last damage source	2016-02-27 12:42:11 +01:00
Thomas Kooi	adcfec6ff0	Merge pull request #3430 from GitHawk/refuel_ropeImprovement ... Refuel improvements	2016-02-27 12:40:50 +01:00
Thomas Kooi	938c1f4c0a	Merge pull request #2904 from BaerMitUmlaut/fastroping ... Fastroping	2016-02-27 12:36:43 +01:00
System98	05575538e4	Fix format errors in "medical" addon	2016-02-27 12:10:40 +01:00
System98	f7253edec8	Update german translations ... - Fix some german translations - Re-add strings in "medical" addon deleted in PR #3437 - Add german translations for previously deleted strings and update the english texts so the purpose of the function gets clearer	2016-02-27 12:07:57 +01:00
System98	110dd68736	Fix error in slideshow ... - Fix error in slideshow addon	2016-02-27 10:37:52 +01:00
esteldunedain	b8f955468c	First version of "Check spare barrel temperatures" action	2016-02-27 01:46:27 -03:00
esteldunedain	e950552345	Track temperatures of spare barrels	2016-02-27 00:29:30 -03:00
looterz	8b534bb4bf	Fixed ACE_Settings.hpp GVAR's missing category	2016-02-26 19:00:55 -06:00
jonpas	0c79869d7a	Fix duplicated English strings	2016-02-27 01:43:57 +01:00
jonpas	10abe5cd57	Merge branch 'master' into German-translations	2016-02-27 01:36:07 +01:00
Glowbal	e0a65aa543	Add registering last damage source	2016-02-26 22:58:49 +01:00
bux578	db71aa54b8	Merge pull request #3434 from NorXAengell/Traduction-Fr ... Traduction fr	2016-02-26 21:18:40 +01:00
bux578	431b6f872c	Merge pull request #3433 from licht-im-Norden87/patch-54 ... German translation	2016-02-26 21:16:54 +01:00
PabstMirror	6e29beefa1	Remove extra "(" in debug output	2016-02-26 12:48:40 -06:00
licht-im-Norden87	a5864c6f40	Merge pull request #42 from licht-im-Norden87/patch-55 ... refuel	2016-02-26 19:44:50 +01:00
licht-im-Norden87	6a6190b99d	Merge pull request #43 from licht-im-Norden87/patch-57 ... Update stringtable.xml	2016-02-26 19:44:37 +01:00
NorXAengell	0006f72663	Minor correction in explosive	2016-02-26 19:38:51 +01:00
licht-im-Norden87	1c7a25cc38	Update stringtable.xml	2016-02-26 19:36:47 +01:00
licht-im-Norden87	cac13e2f4f	refuel	2016-02-26 19:26:34 +01:00
licht-im-Norden87	21766e10c2	German translation ... Habe gerade Arma gestartet und dabei ist mir das ein oder andere Problem aufgefallen. WIP	2016-02-26 19:25:01 +01:00
NorXAengell	ea461446f9	Translation Fr	2016-02-26 19:24:53 +01:00
Githawk	c8e8a17111	Fixes ... - Fixed `isEngineOn` returning true on static objects - Fixed `fnc_readFuelCounter` for objects with infinite fuel	2016-02-26 16:35:34 +01:00
NorXAengell	8b9865b50d	Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr	2016-02-26 16:33:04 +01:00
NorXAengell	212d8f45ff	Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr	2016-02-26 16:22:00 +01:00
System98	e587744b3e	Fix text errors ... - Fix errors in "map_gestures, medical, overheating, slideshow and zeus" addons	2016-02-26 11:29:55 +01:00
GitHawk	7451d1ee5f	Make setFuel and getFuel API	2016-02-26 10:50:02 +01:00
GitHawk	0b324336ee	Initial pass ... Unified ropeDestruction Added check before ropeCreate	2016-02-26 10:46:12 +01:00
PabstMirror	424c6fe878	Show Cargo Example	2016-02-26 01:37:00 -06:00
PabstMirror	7fc1c87bc4	Global Ai Set Skill Example	2016-02-26 00:57:18 -06:00
bux578	704e858d9c	Merge pull request #3424 from NorXAengell/Traduction-Fr ... Translation Fr Captives	2016-02-26 07:38:05 +01:00
NorXAengell	a5ce95f9c7	Traduction, correction Fr Common	2016-02-26 01:29:37 +01:00
ElTyranos	a79cfa583d	bux578 correction	2016-02-25 23:47:27 +01:00
Nicolás Badano	7646068a8b	Merge pull request #3427 from SuN9491/master ... Spanish Translation (3.5.0)	2016-02-25 17:10:55 -03:00
PabstMirror	f59e8920f9	Fix Mortar Display	2016-02-25 13:59:00 -06:00
SuN9491	9efbdb2e71	Spanish Translation (3.5.0) ... Remaining spanish translations for ACE 3.5.0	2016-02-25 20:50:29 +01:00
NorXAengell	f2fa46ddf0	Translation Fr Captives	2016-02-25 19:36:44 +01:00
gienkov	4a73a0519e	translate fastroping	2016-02-25 19:06:50 +01:00
System98	48d312cb8e	Add german translations ... - add missing german translations - small fixes to existing texts - remove unused strings in "medical" addon	2016-02-25 18:10:26 +01:00
bux578	21ba45d0c9	Merge pull request #3421 from gienkov/pltranslation350 ... Polish translation 3.5.0 (FIXED)	2016-02-25 18:01:01 +01:00
gienkov	8ae1c68d5e	remove tabs	2016-02-25 17:20:45 +01:00
gienkov	d4209b2b42	mk6 tagging and overheating translation, finish	2016-02-25 17:16:36 +01:00
Nicolás Badano	333c8f57bc	Merge pull request #3419 from acemod/addMissingMedicalSettingCategory ... Add missing medical category to delayUnconCaptive	2016-02-25 13:16:23 -03:00
jonpas	6ad107ecc0	Add medical category to delayUnconCaptive	2016-02-25 17:03:38 +01:00
gienkov	04f714e53c	Merge remote-tracking branch 'origin/master' into pltranslation350	2016-02-25 16:41:09 +01:00
gienkov	25561ab2c5	hearing and medical, unwind medical pl shorts	2016-02-25 16:31:47 +01:00
Nicolás Badano	69a3c79756	Merge pull request #3418 from acemod/spanishTranslation3.5.0 ... Remaining Spanish translations	2016-02-25 12:28:30 -03:00
esteldunedain	3fa3512509	Remaining spanish translations	2016-02-25 12:25:42 -03:00
PabstMirror	3b03f84116	Disable debug	2016-02-25 09:12:24 -06:00
looterz	859a4321c6	Actually, nevermind that last commit	2016-02-25 09:03:30 -06:00
jonpas	8375694368	Merge pull request #3403 from acemod/fixCargoEventsParams ... Reimplement old parameter syntax for (Un)LoadCargo events	2016-02-25 16:01:57 +01:00
looterz	e6314eb114	Wrapped _groupsToDrawMarkers filtering with a condition check	2016-02-25 09:00:47 -06:00
esteldunedain	2fc27c553f	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spanishTranslation3.5.0	2016-02-25 11:47:10 -03:00
esteldunedain	64a62d65fc	More spanish translations	2016-02-25 11:46:56 -03:00
bux578	ed05d2f1e7	Merge pull request #3414 from acemod/spanishTranslation3.5.0 ... Spanish translation3.5.0	2016-02-25 15:45:38 +01:00
jonpas	b2b781957f	Reimplement old parameter syntax for (Un)LoadCargo events	2016-02-25 15:35:47 +01:00
looterz	b354fed39a	Moved _playersToDrawMarkers into BFT_ShowPlayerNames code region	2016-02-25 08:35:33 -06:00
looterz	00f06f81d1	Added Show Player Names option to Blue Force Tracking Module	2016-02-25 07:57:32 -06:00
esteldunedain	71707bc81a	Some spanish translations for 3.5.0	2016-02-25 10:54:19 -03:00
jonpas	36d5c40b06	Merge pull request #3411 from GitHawk/refuel_api ... Refuel change documentation header for API fnc	2016-02-25 14:52:25 +01:00
Nicolás Badano	23d35cf9f7	Merge pull request #3412 from GitHawk/rearm_api ... Rearm added API	2016-02-25 10:42:28 -03:00
Nicolás Badano	da46a1c0cd	Merge pull request #3408 from acemod/moduleDescriptions ... Cleanup some module descriptions	2016-02-25 09:56:31 -03:00
Nicolás Badano	d02a590886	Merge pull request #3406 from acemod/diePurista ... Replace Purista with Roboto - everywhere	2016-02-25 09:56:16 -03:00
Nicolás Badano	91e671085e	Merge pull request #3371 from acemod/moreSevereJamming ... More severe jamming	2016-02-25 09:56:08 -03:00
Nicolás Badano	d037512c81	Merge pull request #3405 from acemod/3k404 ... remove unused non API functions	2016-02-25 09:55:22 -03:00
Nicolás Badano	ae2ce0eebc	Merge pull request #3124 from acemod/delayUnconCaptiv ... add delay to Unconsciousness Captivity	2016-02-25 09:54:27 -03:00
bux578	6070d29f59	Merge pull request #3386 from licht-im-Norden87/patch-53 ... German translation Update: MK6 Mortar	2016-02-25 13:38:42 +01:00
GitHawk	6deecb0559	Add missing bracket	2016-02-25 10:25:57 +01:00
GitHawk	2f183548b6	Added API	2016-02-25 10:18:31 +01:00
GitHawk	5af31f6bb3	Remove brackets	2016-02-25 10:11:28 +01:00
GitHawk	53457cfe61	Change documentation header for API fnc	2016-02-25 10:08:20 +01:00
jonpas	1402985133	Fix typos	2016-02-24 19:34:03 +01:00
jonpas	a3d769c410	Cleanup some module descriptions, close #2561	2016-02-24 19:22:16 +01:00
jonpas	804456c722	Sort requiredAddons alphabetically	2016-02-24 18:35:52 +01:00
PabstMirror	8cb1546569	Add threeden to required addons and vers to 1.56	2016-02-24 10:52:34 -06:00
Nicolas Diego Badano	5af4e1ca25	Fix trace	2016-02-24 12:17:48 -03:00
Nicolas Diego Badano	c6f6e4e9f7	Let this finally fix it please	2016-02-24 12:14:47 -03:00
jonpas	8f775dfba4	Rename FontCSE macro to FONT_ACE	2016-02-24 15:08:54 +01:00
jonpas	7f022eda00	Replace Purista with Roboto - everywhere, close #3401	2016-02-24 15:06:27 +01:00
commy2	02b2a21300	remove unused non API functions	2016-02-24 10:10:31 +01:00
commy2	8233661d55	remove unused non API functions	2016-02-24 09:39:39 +01:00
PabstMirror	7cf912222b	Merge pull request #3393 from acemod/3denReplaceDropDown ... Fix 3den attributes	2016-02-23 17:09:03 -06:00
PabstMirror	a437326032	Merge pull request #3400 from acemod/fixLampUnload ... Fix lamp unloading	2016-02-23 17:07:31 -06:00
esteldunedain	b2c672e6c7	Apply the same pattern to ACE_Markers	2016-02-23 19:32:39 -03:00
esteldunedain	b32732cad0	Delete the logic and group after used	2016-02-23 19:29:18 -03:00
esteldunedain	66fa18888e	Use the logic directly to determine client	2016-02-23 18:53:33 -03:00
Nicolás Badano	b55648ccb4	Merge pull request #3402 from acemod/fixCutG ... Fix #3334 replace Purista with Roboto in cargo menu	2016-02-23 18:48:06 -03:00
commy2	b08ae7a266	Merge pull request #3395 from acemod/cba23compile ... Cleanup old cba SLX_XEH_COMPILE_NEW code	2016-02-23 22:43:42 +01:00
jonpas	60fba483fe	Fix #3334 replace Purista with Roboto in cargo menu	2016-02-23 22:30:15 +01:00
jonpas	168ec5344d	Fix #3363 lamp unloading bug, Correct cargo menu button classnames	2016-02-23 22:17:36 +01:00
Thomas Kooi	52108b1737	Merge pull request #3382 from acemod/doAnimEvents ... ObjectEvent Func, swap execRemoteFnc in doAnim	2016-02-23 18:38:43 +01:00
esteldunedain	f9ef100fad	Broadcast client	2016-02-23 11:56:46 -03:00
jokoho48	0956b97dce	remove module settings ... change defualt in ACE_Settings	2016-02-23 15:49:03 +01:00
jokoho48	c61763edc9	fix simicolon ... add stringtable entrys	2016-02-23 15:37:28 +01:00
jokoho48	b2d2bec2cf	Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv ... # Conflicts: # addons/medical/functions/fnc_setUnconscious.sqf	2016-02-23 15:31:38 +01:00
esteldunedain	056244602d	Get the client ID from a new logic object	2016-02-23 10:09:55 -03:00
esteldunedain	ec88e4ad32	Revert "Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031" ... This reverts commit aea02af618.	2016-02-23 09:55:37 -03:00
esteldunedain	645ed3e63d	Resync mine orientations in JIP. Fix #3317	2016-02-23 09:53:38 -03:00
esteldunedain	e6af2864eb	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2016-02-23 09:27:23 -03:00
bux578	aa8d3a3fd0	Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis ... Unified ellipsis	2016-02-23 08:27:28 +01:00
BaerMitUmlaut	74ea79e2cc	Unified ellipsis	2016-02-22 23:51:47 +01:00
PabstMirror	a4391a713d	Cleanup old cba SLX_XEH_COMPILE_NEW code	2016-02-22 15:30:16 -06:00
BaerMitUmlaut	b2337d7485	Config cleanup	2016-02-22 22:21:13 +01:00
PabstMirror	37eb353edf	Cleanup Merge	2016-02-22 15:03:40 -06:00
PabstMirror	6dc0d7d4f5	Merge branch 'master' into moreSevereJamming	2016-02-22 14:57:40 -06:00
BaerMitUmlaut	b72751e693	Fixed macro	2016-02-22 21:06:26 +01:00
BaerMitUmlaut	c2856fd8c7	Fixed scopes	2016-02-22 20:58:55 +01:00
PabstMirror	9ec4135be9	Add prep	2016-02-22 12:27:27 -06:00
PabstMirror	eb08149946	Merge branch 'master' into doAnimEvents	2016-02-22 12:27:07 -06:00
licht-im-Norden87	d13e1272ce	Update stringtable.xml	2016-02-22 18:55:45 +01:00
PabstMirror	330792ba7a	Add medic threeden control	2016-02-22 11:26:32 -06:00
commy2	a09cb1612b	fix error when loading save game, fix #3391	2016-02-22 17:43:34 +01:00
commy2	9712f9c1a4	manual merge	2016-02-22 16:24:10 +01:00
commy2	72fe155cda	manual merge	2016-02-22 16:11:10 +01:00
commy2	ac3385fb83	manual merge	2016-02-22 16:08:24 +01:00
commy2	c45523475f	manual merge	2016-02-22 16:06:30 +01:00
commy2	0f7bfc0f66	Merge pull request #3389 from acemod/precompileongamestart ... precompile on game start	2016-02-22 16:00:19 +01:00
commy2	46a239f9f6	precompile on game start	2016-02-22 15:20:36 +01:00
BaerMitUmlaut	06f8f277ac	Added Eden Integration	2016-02-22 14:40:21 +01:00
BaerMitUmlaut	af834838ef	Moved FRIES equipping into seperate function	2016-02-22 14:40:04 +01:00
PabstMirror	e6052aee1f	Fix captives 3den	2016-02-22 03:00:40 -06:00
PabstMirror	ed96307f2f	3den repair - Replace bad combo with custom control	2016-02-22 02:50:20 -06:00
bux578	55a6ef1937	Merge pull request #3367 from licht-im-Norden87/patch-43 ... Update German Stringtable	2016-02-22 08:26:23 +01:00
esteldunedain	aea02af618	Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031	2016-02-21 23:47:47 -03:00
BaerMitUmlaut	ea92424d15	Added license file for TOH anims	2016-02-22 01:21:02 +01:00
BaerMitUmlaut	05054737ab	Removal of virtual rope anchor, animation fix	2016-02-22 00:31:33 +01:00
BaerMitUmlaut	6b2dc78ea4	Fixed moduleEquipFRIES header	2016-02-22 00:31:32 +01:00
BaerMitUmlaut	671fcd90b4	Integrated new model, fixed config, added Kasatka door animation	2016-02-22 00:31:31 +01:00
BaerMitUmlaut	c917cdab8d	New FRIES model, new animations	2016-02-22 00:31:29 +01:00
BaerMitUmlaut	c1ea6fd327	Fixed locality issues, moved rope creation and simulation to server ... Fix rope cut while fastroping Locality fix pt2 - serverside ropes	2016-02-22 00:31:28 +01:00
BaerMitUmlaut	8f49715ae6	Cleanup function params and headers ... Cleanup function params and headers Removed unecessary param	2016-02-22 00:31:27 +01:00
BaerMitUmlaut	8cfbbe4f1f	Skip FRIES preparation if unnecessary	2016-02-22 00:31:26 +01:00
BaerMitUmlaut	953119a411	Bugfix for static FRIES	2016-02-22 00:31:25 +01:00
BaerMitUmlaut	996a5105fc	Model update	2016-02-22 00:31:25 +01:00
BaerMitUmlaut	b2fd7f93b5	Cleanup privates and function params	2016-02-22 00:31:24 +01:00
BaerMitUmlaut	e5c0b5afd3	Added empty fire LOD to helper	2016-02-22 00:31:23 +01:00
BaerMitUmlaut	7d90f707c0	Improved config	2016-02-22 00:31:22 +01:00
BaerMitUmlaut	cc1a54d900	Updated model	2016-02-22 00:31:22 +01:00
BaerMitUmlaut	7241e703ae	Code cleanup, restructured rope deployment	2016-02-22 00:31:21 +01:00
BaerMitUmlaut	2695fc6beb	Better twitching fix, failsaves and EHs	2016-02-22 00:31:20 +01:00
BaerMitUmlaut	3ec9369a9e	Added FRIES object, FRIES module, debugging code	2016-02-22 00:31:20 +01:00
BaerMitUmlaut	12779b03bf	Glitchy rope fix	2016-02-22 00:31:19 +01:00
BaerMitUmlaut	774984dbac	Added possibility for memory point rope origins	2016-02-22 00:31:18 +01:00
BaerMitUmlaut	554c6b14e0	Tweaked interaction conditions	2016-02-22 00:31:17 +01:00
BaerMitUmlaut	890171e629	Added rope origins for all vanilla helicopters	2016-02-22 00:31:17 +01:00
BaerMitUmlaut	c70ab0b332	Buggy ropes workaround	2016-02-22 00:31:16 +01:00
BaerMitUmlaut	eb028c0d1b	Initial commit fastroping	2016-02-22 00:31:15 +01:00
commy2	f4a985fdfd	Merge pull request #3345 from acemod/jrCompat338 ... Add flashsupressor to asdg_MuzzleSlot_338	2016-02-21 23:46:50 +01:00
commy2	dd10fac470	use DisplayLoad for main menu box and to disable options when world=Empty	2016-02-21 23:28:02 +01:00
commy2	9ac1f8fc47	use DisplayLoad for turretDisplayLoaded event	2016-02-21 23:13:26 +01:00
commy2	4c0a817ba8	use precompiled function for optics display	2016-02-21 22:56:35 +01:00
commy2	e1db193099	remove unused config and remove some wrong base classes	2016-02-21 22:50:15 +01:00
commy2	2b9518bf81	use precompiled function for vector display	2016-02-21 22:41:11 +01:00
commy2	da0d37ed0d	remove commented out code	2016-02-21 22:31:14 +01:00
commy2	3f855298e2	remove unused mapDisplayLoaded event and ACE_dlgMap variable	2016-02-21 22:23:46 +01:00
commy2	f43e88ff25	replace zeusDisplayChanged with DisplayLoad event	2016-02-21 22:16:12 +01:00
commy2	4335bfbfcf	replace inventoryDisplayLoaded with DisplayLoad event	2016-02-21 21:24:39 +01:00
licht-im-Norden87	5e0f109b4c	Update stringtable.xml	2016-02-21 21:15:38 +01:00
commy2	e9808bf20b	remove unused PFH check	2016-02-21 20:42:06 +01:00
licht-im-Norden87	00c8f7bdef	mk6	2016-02-21 20:30:57 +01:00
commy2	5e486869c0	replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help)	2016-02-21 20:26:30 +01:00
licht-im-Norden87	4036dcaa8e	Update stringtable.xml	2016-02-21 20:05:26 +01:00
licht-im-Norden87	62dc2ffd06	Update stringtable.xml	2016-02-21 20:04:32 +01:00
licht-im-Norden87	3c8b3031d8	Update stringtable.xml	2016-02-21 19:59:06 +01:00
licht-im-Norden87	ce97916fbf	Update stringtable.xml	2016-02-21 19:55:08 +01:00
licht-im-Norden87	574a6a32ea	Update stringtable.xml	2016-02-21 19:54:24 +01:00
PabstMirror	2467fa7b0c	Fix empty callbacks in medical/repair	2016-02-21 11:34:25 -06:00
PabstMirror	cb33666091	ObjectEvent Func, swap execRemoteFnc in doAnim ... #3370	2016-02-21 11:08:07 -06:00
commy2	5dcb8707dd	Merge pull request #3359 from gienkov/edenadditions ... integrate captivity modules with 3DEN	2016-02-21 12:44:39 +01:00
bux	38c1b45fb9	properly fix the medical translation file	2016-02-21 11:41:53 +01:00
PabstMirror	3d4602e461	Add all joint muzzles and remove from ballistics	2016-02-20 20:03:10 -06:00
PabstMirror	3fbd6cff18	Merge pull request #3368 from acemod/fixNils ... Fix some undefined functions / strings	2016-02-20 19:49:07 -06:00
Nicolás Badano	d7403976aa	Merge pull request #3337 from acemod/overheatingSilencers ... Substantially increase overheating when using silencers or flash suppresors	2016-02-20 22:06:19 -03:00
licht-im-Norden87	360c35dc9c	Update stringtable.xml	2016-02-21 02:04:58 +01:00
licht-im-Norden87	0a0400a7a2	deleted all lines exept for 2 because of obvious reason.	2016-02-21 02:03:30 +01:00
esteldunedain	e4e2f0d661	Add a 10% chance for the unjam action to fail (like in ACE2)	2016-02-20 21:09:52 -03:00
Glowbal	ea113b8e61	Fix duplicate {	2016-02-21 01:04:12 +01:00
Glowbal	7d063d4dee	Merge branch 'master' into medical-focus-feature ... Conflicts: addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf	2016-02-21 00:37:30 +01:00
commy2	f5ef7b6b2d	displayLoad xeh for imenu	2016-02-21 00:36:46 +01:00
esteldunedain	dc7c4ff4fd	Increase the jam chance of all weapons at high temperatures	2016-02-20 20:26:30 -03:00
esteldunedain	11f3189306	Add an unjam action to the interact menu when the weapon is jammed	2016-02-20 20:19:56 -03:00
esteldunedain	2dbf979ec6	By default, prevent reloading from automatically clearing a weapon jam (like in ACE2)	2016-02-20 20:05:59 -03:00
PabstMirror	8b932fd5a0	Fix some undefined functions / strings	2016-02-20 16:58:45 -06:00
licht-im-Norden87	a977715460	Merge pull request #37 from licht-im-Norden87/patch-49 ... Viewdistance	2016-02-20 23:54:10 +01:00
licht-im-Norden87	82a938113c	Merge pull request #39 from licht-im-Norden87/patch-47 ... hearing	2016-02-20 23:54:04 +01:00
licht-im-Norden87	a4d0c219ac	Merge pull request #40 from licht-im-Norden87/patch-51 ... switchunits	2016-02-20 23:53:52 +01:00
licht-im-Norden87	fb20492573	switchunits	2016-02-20 23:53:02 +01:00
licht-im-Norden87	593ae5495e	Merge pull request #38 from licht-im-Norden87/patch-48 ... interaction	2016-02-20 23:46:17 +01:00
licht-im-Norden87	5996f50490	Merge pull request #36 from licht-im-Norden87/patch-50 ... finger	2016-02-20 23:46:11 +01:00
licht-im-Norden87	50dc6ec341	finger ... Iam not happy with my translation in any way. "Zeige Zeiger" sounds terrible "Zeige Fingerzeig (middlefinger)" can be misunderstood (maybe there is a nice solution Iam not aware of.) This is truely a pain in the ass	2016-02-20 23:43:16 +01:00
licht-im-Norden87	747cd8c4cf	Viewdistance	2016-02-20 23:33:12 +01:00
commy2	9c4121f3b1	replace ace_common_fnc_selectWeaponMode with CBA_fnc_selectWeapon	2016-02-20 23:30:40 +01:00
licht-im-Norden87	91bdceead6	interaction	2016-02-20 23:27:32 +01:00
licht-im-Norden87	5569790e0b	hearing	2016-02-20 23:25:19 +01:00
licht-im-Norden87	7f2dfe1749	Merge pull request #35 from licht-im-Norden87/patch-46 ... explosives	2016-02-20 23:20:21 +01:00
licht-im-Norden87	d4cca14929	explosives	2016-02-20 23:19:51 +01:00
commy2	a67917c590	add deprecate log	2016-02-20 23:11:50 +01:00
licht-im-Norden87	83e17e293b	Merge pull request #33 from licht-im-Norden87/patch-45 ... common	2016-02-20 23:08:47 +01:00
licht-im-Norden87	5294527daa	Merge pull request #32 from licht-im-Norden87/patch-44 ... cargo	2016-02-20 23:07:59 +01:00
licht-im-Norden87	cdb58b6233	common	2016-02-20 23:06:29 +01:00
licht-im-Norden87	b41efc39ff	cargo	2016-02-20 23:02:02 +01:00
licht-im-Norden87	073a476ed1	Update German Stringtable ... Since my other PR was merged I have to open another one to add a few things a fix one or two mistakes. It should be done in <30 minutes. (Guess you guys want to realease 3.5.0 as soon as possible.)	2016-02-20 22:57:45 +01:00
commy2	9cdefae10e	delete sqf file	2016-02-20 22:46:22 +01:00
commy2	73d5b3c77b	relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon	2016-02-20 22:41:24 +01:00
esteldunedain	d00587f367	Minor fixes	2016-02-20 17:40:19 -03:00
ChairborneIT	0021bc08df	Added translation for most Italian stringtable entries	2016-02-20 21:39:05 +01:00
esteldunedain	2d2e95fddc	Merge branch 'master' into overheatingSilencers	2016-02-20 17:25:26 -03:00
esteldunedain	63056ef47a	Merge branch 'master' into fixRHSCompat	2016-02-20 17:02:11 -03:00
esteldunedain	6fd8d8da04	Merge branch 'master' into changeHearingDefaults ... Conflicts: addons/grenades/functions/fnc_flashbangExplosionEH.sqf	2016-02-20 16:59:00 -03:00
PabstMirror	c9aa221b01	Convert other weapons with join muzzles	2016-02-20 12:01:34 -06:00
PabstMirror	84ba6f29f2	Merge pull request #3362 from acemod/delayedCaptivity ... Delay captivity until 0.05s after settings are initialized	2016-02-20 10:34:18 -06:00
Thomas Kooi	f6dfd03bec	Merge pull request #2168 from jokoho48/codeCleanupLaserSelfdesignate ... Code Cleanup laser Self Designate Module	2016-02-20 17:28:41 +01:00
Thomas Kooi	b6b173b03e	Merge pull request #3358 from acemod/darkerSandbags ... Darken and improve sandbag texture, close #2595	2016-02-20 17:26:35 +01:00
Thomas Kooi	2930fab6c6	Merge pull request #3354 from acemod/playerBodybags ... Fix bagging respawning players (alt)	2016-02-20 17:26:07 +01:00
Thomas Kooi	911cba81b7	Merge pull request #3347 from GitHawk/refuel_removedTruck ... Handling disconnect and removal of fuel truck	2016-02-20 17:24:32 +01:00
Thomas Kooi	ff7dbfa9f2	Merge pull request #3305 from GitHawk/dagr_fix ... Disable ACE_Laser for choppers (aka Changes to DAGR)	2016-02-20 17:17:46 +01:00
Thomas Kooi	6048d15847	Merge pull request #3290 from acemod/nametagsOptimization ... Nametags optimization	2016-02-20 17:15:01 +01:00
Thomas Kooi	14b526d417	Merge pull request #3272 from acemod/deadmanBombVest ... Deadman switch - trigger explosives in inventory	2016-02-20 17:11:06 +01:00
PabstMirror	918413030b	Short Circuit Tagging	2016-02-20 10:08:41 -06:00
Thomas Kooi	427b14e3ba	Merge pull request #3245 from GitHawk/rearm_fix ... Fixing setVehicleAmmo for rearm	2016-02-20 17:08:37 +01:00
Thomas Kooi	8055eae580	Merge pull request #3210 from acemod/taggingX ... Tagging X	2016-02-20 17:05:02 +01:00
Thomas Kooi	8d12f1cc08	Merge pull request #3130 from acemod/ab-subsonicAmmo ... AB - Handle subsonic ammo when configs not defined	2016-02-20 17:01:22 +01:00
bux578	76bacf184d	Merge pull request #2237 from gienkov/patch-29 ... Make reserve steerable	2016-02-20 17:00:51 +01:00
Thomas Kooi	2e47cb5b40	Merge pull request #3079 from jonpas/tacticalLadderFixes ... Prevent Tactical Ladder interaction if unit on ladder	2016-02-20 16:59:23 +01:00
Thomas Kooi	1e3596b92a	Merge pull request #3043 from acemod/Mortar_interact ... Mortar interaction and ammunition handling	2016-02-20 16:57:55 +01:00
Thomas Kooi	4f10d551d6	Merge pull request #2949 from gienkov/fixWoundCount ... ceil number of wounds	2016-02-20 16:56:17 +01:00
Thomas Kooi	27c6934ff2	Merge pull request #2230 from SzwedzikPL/interactions_lamps ... Interaction with portable lamps	2016-02-20 16:47:28 +01:00
PabstMirror	b9cf5817b9	Restore delay in modules	2016-02-20 09:39:15 -06:00
esteldunedain	6523b715fe	Delay captivity until 0.05s after settings are initialized	2016-02-20 11:57:47 -03:00
gienkov	1b03ee76fd	tabs	2016-02-20 14:07:39 +01:00
gienkov	54b71cc7ba	integrate captivity modules with 3DEN	2016-02-20 13:36:53 +01:00
bux	d9b452f496	darken and improve sandbag texture	2016-02-20 12:12:32 +01:00
Thomas Kooi	fbcfbb92a6	Merge pull request #3346 from acemod/betterFlashEffects ... Better flash effects	2016-02-20 10:22:57 +01:00
PabstMirror	fc3bb0de6b	Fix #3355 - add missing semi-colons	2016-02-19 18:51:25 -06:00
PabstMirror	dffcbc7650	Cleanup events	2016-02-19 15:45:37 -06:00
PabstMirror	44b526ab6d	bodybag - hide player corpse and delete later ... Fix #1301	2016-02-19 15:41:13 -06:00
PabstMirror	488d24bc01	Fix cargo loading on the big huron containers	2016-02-19 15:30:23 -06:00
PabstMirror	ed653456e5	Merge pull request #3338 from acemod/translations156merge ... Fix Merge Conflicts on More Italian Translations	2016-02-19 15:09:40 -06:00
esteldunedain	f2566afc73	Another 5m of effect	2016-02-19 15:22:24 -03:00
bux578	d601e50b15	Merge pull request #3350 from gienkov/patch-2 ... medical PL translation	2016-02-19 19:21:15 +01:00
Grzegorz	95250c8ecd	medical PL translation ... 3.5.0 ready	2016-02-19 19:10:59 +01:00
Grzegorz	99e24aab6d	frag PL translation ... 3.5.0 ready	2016-02-19 19:07:00 +01:00
Githawk	5b908b4be8	Adding disconnect EH	2016-02-19 17:32:02 +01:00
Githawk	e925c48798	Adding HandleDisconnect EH and deletion of fuel truck	2016-02-19 17:24:32 +01:00
esteldunedain	b420512139	Fix reduction based on looking away from the grenade	2016-02-19 12:34:50 -03:00
esteldunedain	9e5f52d161	Make units heavily affected by the blast turn away from the light.	2016-02-19 12:33:49 -03:00
esteldunedain	0f7853f6c6	Increase the maximum range for blinding effect to 25m, but with a high falloff. Close #1539	2016-02-19 12:18:22 -03:00
esteldunedain	648a0259ec	Improve flashbang effects. Make sure the light effect is rendered even if the grenade explodes further than 20m from the player. Increase the amount of hearing damage.	2016-02-19 12:02:29 -03:00
Thomas Kooi	95532ea521	Merge pull request #3333 from acemod/medicalEvents ... Replace execRemoteFnc in ace_medical	2016-02-19 12:00:00 +01:00
commy2	08e09d5cbd	manual merge	2016-02-19 11:50:17 +01:00
commy2	97008d8fc3	Merge pull request #3131 from acemod/removedep ... remove deprecated functions	2016-02-19 11:48:20 +01:00
commy2	5d0d8576ea	Merge pull request #3288 from SzwedzikPL/edenassignsettings ... Repair & medical object attributes for eden editor	2016-02-19 11:47:26 +01:00
PabstMirror	2c2626aade	Add flashsupressor to asdg_MuzzleSlot_338	2016-02-19 01:33:27 -06:00
esteldunedain	38c4b1dc81	Add a diagnose script to detect incompatibilities between vanilla and ab initial velocities	2016-02-19 00:45:00 -03:00
esteldunedain	ff04ca8981	Uniformize interaction distance for vehicle. Distance is now aprox 4m from the bounding box of the vehicle, consistent with interaction with people.	2016-02-18 20:20:02 -03:00
PabstMirror	d2a3f35c80	Fix deleted czech strings from merge	2016-02-18 13:39:14 -06:00
esteldunedain	e22b1c0d25	Derp	2016-02-18 16:07:39 -03:00
bux	49f565f541	fix merging errors	2016-02-18 20:05:30 +01:00
esteldunedain	2dd835b56b	Substantially increase overheating when using silencers or flash suppresors. Optimize overheating calculations for the player through caching.	2016-02-18 15:58:44 -03:00
ViperMaul	14c5558bbf	Merge branch 'master' of https://github.com/acemod/ACE3	2016-02-18 10:50:52 -08:00
ViperMaul	52b3f1e219	Bump version to 3.4.3	2016-02-18 10:50:33 -08:00
bux578	93e655588b	Merge pull request #3294 from gienkov/pltranslations ... pl translation	2016-02-18 19:38:43 +01:00
esteldunedain	2a8410650a	Swap createLocation by CBA_fnc_createNamespace	2016-02-18 13:58:18 -03:00
esteldunedain	0236c16e8f	Cache volume attenuation due to earplugs and headgear	2016-02-18 13:48:40 -03:00
esteldunedain	87dd607901	Add a category name to frag settings	2016-02-18 12:28:00 -03:00
esteldunedain	a8131f597a	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reflectionsDefaultOff	2016-02-18 12:18:51 -03:00
commy2	50b04d937b	Merge pull request #3278 from acemod/removeragdolls ... remove old ragdoll tweaks	2016-02-18 14:46:21 +01:00
commy2	cf4f47160f	Merge pull request #3275 from acemod/realnamebadger ... correct name for wheeled apc 01 cannon	2016-02-18 14:44:24 +01:00
commy2	be8f7f9cc0	Merge pull request #3276 from acemod/156selectapply ... replace filter and map with select and apply	2016-02-18 14:23:02 +01:00
esteldunedain	88eae19646	Replace execRemoteFnc in ace_medical	2016-02-17 22:54:43 -03:00
PabstMirror	be742c13cd	Merge branch 'master' into 155selectRandom	2016-02-17 15:58:19 -06:00
PabstMirror	c456e1a631	Merge pull request #3214 from acemod/cba23 ... Changes for CBA 2.3	2016-02-17 15:33:42 -06:00
PabstMirror	53d870b62a	Merge pull request #3312 from acemod/passengerInteraction ... Only get passenger actions for selected unit	2016-02-17 15:33:29 -06:00
PabstMirror	77f5aebf73	Merge pull request #3282 from acemod/eventLocationHash ... Use location hash for ace events	2016-02-17 15:32:50 -06:00
Thomas Kooi	a8846e92ee	Merge pull request #2954 from gienkov/nozzleLogic ... nozzle additonal check condition	2016-02-17 21:26:04 +01:00
PabstMirror	dccc1d33fd	Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge	2016-02-17 12:30:03 -06:00
Thomas Kooi	e31e20bd42	Merge pull request #3293 from acemod/fix3270 ... Slightly reduce the distance for which the LOS check is skipped.	2016-02-17 18:39:39 +01:00
Thomas Kooi	26cb6bd6a3	Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant ... Make wound assignment consistent for dll/sqf	2016-02-17 18:34:28 +01:00
Thomas Kooi	8e49c8b1b3	Merge pull request #3323 from acemod/fixVehicleCrashes ... Fix vehicle crashes	2016-02-17 18:32:56 +01:00
PabstMirror	930c2f84c6	Call updateHearingProtection at settings init	2016-02-17 09:49:00 -06:00
PabstMirror	40396fc69e	Remove debug	2016-02-17 09:37:08 -06:00
PabstMirror	649b0c28e2	Calculate hearing protection coefficient on events	2016-02-16 18:17:42 -06:00
PabstMirror	8fed9325c9	Fix flashbang	2016-02-16 13:02:25 -06:00
PabstMirror	749425dfb7	Settings Category, Minor Cleanup	2016-02-16 12:58:42 -06:00
PabstMirror	f1797feead	Make wound assignment consistent for dll/sqf ... Dll now exits on first match for threshold damage (exitWith) Remove random wound in sqf to match dll Fix backblast threshold order Add lower vehiclecrash threshold Add dll version logging	2016-02-16 12:19:18 -06:00
commy2	1bc73af1c9	remove ace fake weapon from 3den cargo editor	2016-02-16 16:11:18 +01:00
PabstMirror	5c9dfd7dc5	Handle enemy causing veh explode, fix revive unload ... Fix #3269	2016-02-15 22:23:37 -06:00
PabstMirror	9441b548be	Fix vehicle crashes not being fatal to non-drivers ... Fix #3306	2016-02-15 17:11:04 -06:00
PabstMirror	d88f10b8e0	Merge pull request #3318 from acemod/restricMagPass ... Don't allow passing mags when not in same veh	2016-02-15 11:41:18 -06:00
PabstMirror	4a8b032c1f	Don't allow passing mags when not in same veh	2016-02-14 14:53:04 -06:00
PabstMirror	985af4502c	Merge pull request #3313 from ivankrouglyi/patch-1 ... Update fnc_treatment_success.sqf	2016-02-14 13:27:08 -06:00
VKing	74d410688f	Add check so vanilla magazines can't be unloaded	2016-02-14 14:10:28 +01:00
VKing	560c509a3a	Changed to using playerVehicleChanged.	2016-02-14 13:51:44 +01:00
Glowbal	ff86359247	Merge branch 'master' into medical-focus-feature	2016-02-13 19:51:45 +01:00
Nicolás Badano	7bbdcbc054	Merge pull request #3280 from acemod/unifiedFiredEH ... Unified fired event handler	2016-02-13 15:13:18 -03:00
esteldunedain	e2ed38609d	Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH)	2016-02-13 15:04:43 -03:00
Ivan Krouglyi	0a226b5ee9	Update fnc_treatment_success.sqf ... Error at 84 line - you forget ";"	2016-02-13 03:29:42 +03:00
PabstMirror	54b350a6c0	Only get passenger actions for selected unit ... Fix #1690 #3309	2016-02-12 15:57:16 -06:00
Githawk	17cba965c3	Deactivate laser_sefldesignate on Comanche	2016-02-11 20:27:46 +01:00
Githawk	c38b028c3a	Fixing driver gun ... Magazines from driver gun don't get removed	2016-02-11 19:06:37 +01:00
Githawk	9619fc7fb5	Changes to DAGR ... Allow laserLock, set weaponLockSystem to Laser and move class ADDON to ACE_Hydra70_DAGR	2016-02-11 16:39:53 +01:00
PabstMirror	ff4ba98e68	Pre-load again on mission load (save game)	2016-02-10 11:50:30 -06:00
licht-im-Norden87	5577a1b4bb	Merge pull request #31 from licht-im-Norden87/patch-42 ... trenches	2016-02-10 18:15:14 +01:00
licht-im-Norden87	4fb705e0f9	Update stringtable.xml ... Eigentlich ist Graben ja das falsche Wort, da es in Arma gar nicht möglich ist in die Tiefe zu graben....	2016-02-10 18:14:51 +01:00
licht-im-Norden87	020deb4407	Update stringtable.xml	2016-02-10 18:14:03 +01:00
licht-im-Norden87	adbfa378b1	Update stringtable.xml	2016-02-10 18:12:36 +01:00
licht-im-Norden87	a5597ade89	Merge pull request #30 from licht-im-Norden87/patch-41 ... spectator	2016-02-10 18:06:13 +01:00
licht-im-Norden87	e8a35f3c20	spectator ... Bitte einmal z. 259,268,377 überprüfen!	2016-02-10 18:05:51 +01:00
licht-im-Norden87	0c268b90dc	Merge pull request #29 from licht-im-Norden87/patch-39 ... overheating	2016-02-10 17:35:56 +01:00
licht-im-Norden87	9419e7daf3	overheating	2016-02-10 17:35:36 +01:00
licht-im-Norden87	7bed10d14b	Merge pull request #28 from licht-im-Norden87/patch-38 ... optionsmenu	2016-02-10 17:32:32 +01:00
licht-im-Norden87	51b57b962b	Update stringtable.xml	2016-02-10 17:32:19 +01:00
licht-im-Norden87	cabbc4b6a9	optionsmenu	2016-02-10 17:31:26 +01:00
licht-im-Norden87	c663feed49	Merge pull request #27 from licht-im-Norden87/patch-37 ... nightvision	2016-02-10 17:26:23 +01:00
licht-im-Norden87	864ae484d4	nightvision	2016-02-10 17:26:08 +01:00
licht-im-Norden87	b352b9b024	Merge pull request #26 from licht-im-Norden87/patch-36 ... captives	2016-02-10 17:20:13 +01:00
licht-im-Norden87	39e26b0f11	captives	2016-02-10 17:19:42 +01:00
licht-im-Norden87	ffb3367a50	Merge pull request #25 from licht-im-Norden87/patch-35 ... common	2016-02-10 17:17:47 +01:00
licht-im-Norden87	b9083f1712	common	2016-02-10 17:17:26 +01:00
licht-im-Norden87	c806bfb721	Merge pull request #24 from licht-im-Norden87/patch-34 ... flashlight	2016-02-10 17:14:37 +01:00
licht-im-Norden87	d52c6cb984	flashlight	2016-02-10 17:13:52 +01:00
licht-im-Norden87	a725553a95	commy2	2016-02-10 17:11:24 +01:00
licht-im-Norden87	b617dee302	Merge pull request #23 from licht-im-Norden87/patch-33 ... cargo	2016-02-10 17:09:05 +01:00
licht-im-Norden87	b1990b1586	Update stringtable.xml	2016-02-10 17:08:48 +01:00
licht-im-Norden87	3583e95e1f	cargo	2016-02-10 17:07:05 +01:00
licht-im-Norden87	35b0b11fff	Merge pull request #22 from licht-im-Norden87/patch-32 ... Gestures	2016-02-10 17:03:21 +01:00
licht-im-Norden87	6481a0fbb8	Gestures	2016-02-10 17:02:54 +01:00
licht-im-Norden87	71682bc2f3	Merge pull request #21 from licht-im-Norden87/patch-31 ... headless	2016-02-10 16:58:21 +01:00
licht-im-Norden87	c0a9d6a0e8	headless	2016-02-10 16:57:56 +01:00
licht-im-Norden87	3eaf466994	Merge pull request #20 from licht-im-Norden87/patch-30 ... hearing	2016-02-10 16:57:24 +01:00
licht-im-Norden87	99f6c79573	Update stringtable.xml	2016-02-10 16:57:12 +01:00
licht-im-Norden87	8971f4db1e	Update stringtable.xml	2016-02-10 16:56:15 +01:00
licht-im-Norden87	a9252c1b5d	Merge pull request #19 from licht-im-Norden87/patch-29 ... Interact menu	2016-02-10 16:49:46 +01:00
licht-im-Norden87	61bd04a390	Interact menu	2016-02-10 16:49:00 +01:00
licht-im-Norden87	e2d4589bb0	Merge pull request #18 from licht-im-Norden87/patch-28 ... Hunt IR	2016-02-10 16:42:35 +01:00
licht-im-Norden87	8ef2905e99	Hunt IR	2016-02-10 16:42:03 +01:00
licht-im-Norden87	53f8b14a7c	Merge pull request #17 from licht-im-Norden87/patch-27 ... Adv. ballistic	2016-02-10 16:41:00 +01:00
licht-im-Norden87	17a16d1bad	Adv. ballistic	2016-02-10 16:40:07 +01:00
licht-im-Norden87	49ee49a5b7	Merge pull request #16 from licht-im-Norden87/patch-26 ... magazine repack	2016-02-10 16:29:32 +01:00
licht-im-Norden87	ed1047e199	magazine repack	2016-02-10 16:26:03 +01:00
licht-im-Norden87	03b4a0e8fb	Update German Stringtable	2016-02-10 16:24:18 +01:00
commy2	82086efca0	manual merge	2016-02-10 10:11:33 +01:00
PabstMirror	e1b83b8172	Manually pre-load for StaticWeapons and Car ... Fix #3168	2016-02-09 22:43:38 -06:00
SzwedzikPL	388b00f58c	remove unnecessary code, aesthetic tweak	2016-02-10 01:38:14 +01:00
SzwedzikPL	0c80551fd8	ace attribute category, lower case classes	2016-02-10 01:17:18 +01:00
gienkov	d5dd718b8d	fix endlines	2016-02-09 12:01:13 +01:00
gienkov	fafd25dee7	pl translation	2016-02-09 11:50:35 +01:00
gienkov	8048b2ecbd	lazy evaluation fix	2016-02-09 09:35:16 +01:00
esteldunedain	b02a67605c	Revert to normal testing for units on foot	2016-02-09 00:19:18 -03:00
esteldunedain	0f41c5bf13	Only test the GEOM LOD for visibility	2016-02-09 00:01:51 -03:00
esteldunedain	d4eda6d4ec	Show tags for units inside the player vehicle. Close #538.	2016-02-08 22:54:24 -03:00
esteldunedain	cebc8a2d07	Slightly reduce the distance for which the LOS check is skipped. Fix #3270	2016-02-08 19:19:10 -03:00
esteldunedain	4c938a050b	Fix for combination of "Only Cursor + Keypress" and "Always Show Sound Waves"	2016-02-08 17:57:24 -03:00
esteldunedain	a47f7b8162	Fix cursor mode	2016-02-08 17:18:03 -03:00
esteldunedain	c43b3bd5c1	Switch	2016-02-08 17:14:18 -03:00
esteldunedain	b2e9dd0149	Fix _vecy	2016-02-08 17:03:18 -03:00
esteldunedain	73499489e0	Revert "Optimized EFUNC(common,cachedCall)" ... This reverts commit b358c4a8af.	2016-02-08 16:45:16 -03:00
esteldunedain	1b912cdca0	Switch back to modelToWorldVisual. Perf is about the same and it moves smoothly with the model.	2016-02-08 16:38:26 -03:00
esteldunedain	b358c4a8af	Optimized EFUNC(common,cachedCall)	2016-02-08 16:09:14 -03:00
esteldunedain	62fb26200f	Nametags optimization	2016-02-08 15:36:56 -03:00
esteldunedain	94977ffe5c	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nametagsOptimization	2016-02-08 12:52:49 -03:00
SzwedzikPL	94ea26c7b9	typo fix	2016-02-08 00:14:55 +01:00
SzwedzikPL	3bfac35b65	ace repair and medical attributes	2016-02-07 23:56:45 +01:00
Glowbal	e754c89c73	Remove non functional event driven handleDamage	2016-02-07 13:18:19 +01:00
Glowbal	575f362fb6	Add setting for limiting usage of Epinephrine in basic medical #1792 ... Part of focus feature medical #3134. Default settings are inline with old default.	2016-02-07 13:10:38 +01:00
VKing	f92b798586	Switch to select (is even slightly faster)	2016-02-07 13:09:01 +01:00
VKing	f1cc2ddd51	Change to apply in fcs	2016-02-07 13:08:31 +01:00
Glowbal	bfd90cd5d3	Add Adenosine to replace atropine #1573	2016-02-07 12:54:23 +01:00
Glowbal	39cf11367f	improve medical bandage configuration	2016-02-07 12:37:00 +01:00
Glowbal	84878c3d8b	Merge branch 'master' into medical-focus-feature	2016-02-07 12:11:25 +01:00
esteldunedain	2b1c312d13	Make explosion reflections optional, default off	2016-02-06 23:46:40 -03:00
esteldunedain	b6058242c8	Fix frag fired EH name	2016-02-06 22:20:08 -03:00
esteldunedain	e4122cf42f	Fix winddeflection fire eh	2016-02-06 21:00:42 -03:00
esteldunedain	8fbb6cd72e	Fixed event parameters	2016-02-06 20:49:18 -03:00
esteldunedain	a51372a6b3	Add the TRACE_10 macro	2016-02-06 20:28:16 -03:00
esteldunedain	b7d94f5363	Apply the ufeh to ACE_Advanced_Ballistics	2016-02-06 18:48:26 -03:00
esteldunedain	94ef0c5659	Apply the ufeh to ACE_WindDeflection	2016-02-06 18:36:20 -03:00
PabstMirror	1e66cd406b	Use location hash for ace events	2016-02-06 15:27:53 -06:00
esteldunedain	25b767a16b	Apply the ufeh to ACE_WeaponSelect	2016-02-06 18:27:43 -03:00
esteldunedain	cdfdfffff6	Apply the ufeh to ACE_Scopes	2016-02-06 18:24:48 -03:00
esteldunedain	12d7a171e5	Apply the ufeh to ACE_Recoil	2016-02-06 18:21:43 -03:00
esteldunedain	69dea087ca	Apply the ufeh to ACE_Overpressure	2016-02-06 18:17:27 -03:00
esteldunedain	5aa763f0c6	Apply the ufeh to ACE_Overheating	2016-02-06 17:59:54 -03:00
esteldunedain	5b3df2bcf7	Apply the ufeh to ACE_Optics	2016-02-06 17:50:35 -03:00
esteldunedain	33bcd6d9f9	Fix	2016-02-06 17:44:34 -03:00
esteldunedain	45b6b8467d	Apply the ufeh to ACE_Nightvision	2016-02-06 17:42:44 -03:00
esteldunedain	7ace1738c0	Apply the ufeh to ACE_HuntIr	2016-02-06 17:29:05 -03:00
esteldunedain	0b9695ce70	Apply the ufeh to ACE_Grenades	2016-02-06 17:20:30 -03:00
esteldunedain	ac3f75c8b4	Apply the ufeh to ACE_Goggles	2016-02-06 17:16:10 -03:00
esteldunedain	b70ae9207c	Apply the ufeh to ACE_Frag	2016-02-06 17:12:28 -03:00
esteldunedain	fe66d93275	Added ignore private warnings + trace	2016-02-06 17:07:05 -03:00
esteldunedain	37bc67c951	Create a _vehicle variable	2016-02-06 16:55:36 -03:00
esteldunedain	efbff8cc23	Pass the turret path too	2016-02-06 16:49:53 -03:00
esteldunedain	59cbc6da10	Remove unneeded test in FCS fireEH	2016-02-06 16:49:27 -03:00
esteldunedain	a084373574	Apply the ufeh to ACE_Disposable	2016-02-06 16:39:08 -03:00
esteldunedain	b2bd11ed77	Apply the ufeh to ACE_FCS	2016-02-06 16:29:58 -03:00
esteldunedain	6d9068e306	gunner to lowercase	2016-02-06 16:26:57 -03:00
esteldunedain	72b262f634	Simplified parameter names	2016-02-06 16:22:23 -03:00
esteldunedain	588f76b3f1	Learning to count	2016-02-06 16:12:18 -03:00
esteldunedain	89354e25c8	Unified fired event handler	2016-02-06 16:09:48 -03:00
esteldunedain	698b934801	Increase the volume of the residual woosh when ringing is disabled	2016-02-06 14:49:56 -03:00
esteldunedain	9a8dd3e2ad	Fix stringtable	2016-02-06 14:49:28 -03:00
esteldunedain	354ed0cab2	Trace instead of sideChat	2016-02-06 14:11:18 -03:00
esteldunedain	2f1e96ae4f	Overhaul ACE_Hearing and change default settings.	2016-02-06 13:59:31 -03:00
commy2	baf979064a	remove old ragdoll tweaks	2016-02-06 17:45:47 +01:00
commy2	0a9048815b	simlify some select CODE statements	2016-02-06 14:59:31 +01:00
commy2	ac007e6995	replace more map with apply	2016-02-06 12:08:04 +01:00
commy2	41e39c9c3a	replace more filter with select	2016-02-06 11:58:31 +01:00
commy2	2ebd2f9046	replace filter and map with select and apply	2016-02-06 11:42:35 +01:00
PabstMirror	d69af47030	Merge branch 'master' of https://github.com/acemod/ACE3	2016-02-05 16:49:39 -06:00
PabstMirror	e3e9d19ca1	Fix "key" capitalization for Interaction_GetOut	2016-02-05 16:49:36 -06:00
commy2	ec4a4ef67f	correct capitalization for German translation	2016-02-05 22:21:27 +01:00
commy2	7f6b17cdbc	correct name for wheeled apc 01 cannon	2016-02-05 22:19:27 +01:00
commy2	0032e7aa9a	Merge pull request #3267 from acemod/removeSwagWalkFix ... Remove Swag Walk Fix	2016-02-05 21:59:57 +01:00
PabstMirror	9b3ca2822f	Change german stringtable	2016-02-05 14:46:30 -06:00
commy2	f33beb9865	update movement config comments	2016-02-05 21:31:08 +01:00
commy2	d89c93de22	setAllGear - abort function and print warning when used on remote units,	2016-02-05 21:14:20 +01:00
PabstMirror	deac4395c1	Deadman switch - trigger explosives in inventory ... Also allow manual triggering of the deadman device	2016-02-05 11:40:11 -06:00
Nicolás Badano	027de27e33	Merge pull request #3268 from acemod/fix3140 ... Document the locality requirements of fnc_setAllGear.	2016-02-05 10:19:57 -03:00
esteldunedain	dbe7e294a5	Document the locality requirements of fnc_setAllGear. Close #3140	2016-02-05 10:18:36 -03:00
esteldunedain	b2d050afca	Close #3188, Close #3260	2016-02-05 09:46:51 -03:00
Nicolás Badano	d26fc4614f	Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix ... Fix overheating stringtable	2016-02-05 09:35:29 -03:00
Thomas Kooi	0850ab35e3	Merge pull request #3262 from acemod/nozzleFixes ... fix some issues with Fuel Nozzle	2016-02-05 09:15:27 +01:00
Thomas Kooi	f47b51c0cb	Merge pull request #3070 from dixon13/newCivInteraction ... Changes to civilian interaction	2016-02-05 09:14:45 +01:00
dixon13	a0e6f97125	Updated condition for ACE_GetOut	2016-02-05 00:32:56 -07:00
SzwedzikPL	270b557084	fix overheating stringtable	2016-02-05 04:55:05 +01:00
SzwedzikPL	5f0a2b1945	use event system, polish translation	2016-02-05 04:26:54 +01:00
Nicolás Badano	dadec15948	Merge pull request #2104 from acemod/trenches ... Trenches	2016-02-04 23:43:06 -03:00
SzwedzikPL	374b015ee4	major cleanup	2016-02-05 03:41:18 +01:00
SzwedzikPL	ab297ff97e	more readable macro	2016-02-05 02:03:25 +01:00
SzwedzikPL	a9d57e0d1c	fnc_switchLamp cleanup	2016-02-05 02:02:46 +01:00
SzwedzikPL	7b8be590b4	Merge branch 'acemod/master' into interactions_lamps	2016-02-05 01:43:06 +01:00
esteldunedain	b6581cf5ef	Fix #3264	2016-02-04 21:00:40 -03:00
esteldunedain	2577992dfc	Progress bar localization	2016-02-04 20:43:32 -03:00
esteldunedain	7da6e2a35f	Reduce the placement distance	2016-02-04 18:47:30 -03:00
esteldunedain	8c187cbf07	Adjust big trench height	2016-02-04 18:47:17 -03:00
esteldunedain	4cd0028794	Add animation and progresive digging	2016-02-04 18:43:47 -03:00
esteldunedain	3d47156547	Rename some variables	2016-02-04 17:42:12 -03:00
esteldunedain	2d45a28863	Merge branch 'master' into trenches	2016-02-04 17:04:09 -03:00
jokoho48	dc3026366a	remove unneeded files ... fix hard edge in model add LOD	2016-02-04 20:52:28 +01:00
Glowbal	8c0472bbeb	Merge branch 'master' of github.com:acemod/ACE3	2016-02-04 20:35:15 +01:00
VKing	f652db1d2f	Add Loadout box for easy conversion	2016-02-04 20:35:00 +01:00
Glowbal	f1ce133d32	Merge branch 'release' ... Conflicts: addons/refuel/functions/fnc_connectNozzle.sqf	2016-02-04 20:34:32 +01:00
Thomas Kooi	653f6567cc	Fix french translation refresh marker interval ... As per @alganthe's comment on #3114	2016-02-04 20:30:51 +01:00
Thomas Kooi	543d54d37e	Merge pull request #3114 from Luigium/master ... Fixed and added French Translation	2016-02-04 20:28:00 +01:00
Glowbal	376b611b89	Merge branch 'master' into Mortar_interact	2016-02-04 20:21:03 +01:00
Thomas Kooi	727cb38be6	Merge pull request #3218 from SzwedzikPL/fix3202 ... Fix laser_selfdesignate does not measure the distance	2016-02-04 20:17:06 +01:00
PabstMirror	54870f872a	Disable Debug	2016-02-04 13:16:41 -06:00
Nicolás Badano	c967bd1ace	Merge pull request #3259 from acemod/fix3denGoggles ... Fix ACE_goggle changing the tint on the 3den camera	2016-02-04 16:08:02 -03:00
Nicolás Badano	cbafe05f76	Merge pull request #3082 from acemod/deterministicOverheatingX ... Deterministic overheating (updated)	2016-02-04 16:03:30 -03:00
Thomas Kooi	dd3613c357	Merge pull request #3190 from acemod/fcs_enableGMG ... Add FCS to more things	2016-02-04 20:03:19 +01:00
Thomas Kooi	893040b08a	Merge pull request #3102 from buddytex/SandbagEditor ... Add Sandbag to editor	2016-02-04 20:00:51 +01:00
Thomas Kooi	f26fb9e9da	Merge pull request #3107 from jonpas/headless ... Add Dynamic AI Group Tranferring to Headless Clients	2016-02-04 20:00:16 +01:00
Thomas Kooi	a3f80dbc30	Merge pull request #3230 from acemod/draggingStuff ... Fix dragging moving object to random location	2016-02-04 19:58:56 +01:00
Thomas Kooi	ce27575de3	Merge pull request #3244 from acemod/fixScopesCapturingKeys ... Fix ace_scopes capturing native adjustment keys for the PSO scope.	2016-02-04 19:58:21 +01:00
Thomas Kooi	508f6a16ae	Merge pull request #3162 from acemod/Refuel_Fuelbladders ... Refuel - Add refuel actions to fuel bladder objects	2016-02-04 19:57:50 +01:00
Thomas Kooi	8c9523e36b	Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers ... Various explosives enhancements	2016-02-04 19:56:27 +01:00
Thomas Kooi	e0946c3fc5	Merge pull request #3106 from acemod/explEvents ... Explosive events, fix #3104	2016-02-04 19:52:10 +01:00
PabstMirror	35333cbe9d	Merge branch 'cargoCleanup'	2016-02-04 12:51:52 -06:00
Thomas Kooi	3e5908faf8	Merge pull request #3018 from jonpas/fixFuelHoseExceededAfterDisconnect ... Fix refuel PFH not exiting on nozzle disconnect	2016-02-04 19:47:52 +01:00
Thomas Kooi	038befbce0	Merge pull request #3191 from acemod/cargoCleanup ... Cargo Cleanup, Add makeLoadable	2016-02-04 19:44:27 +01:00
Thomas Kooi	324edbde6d	Merge pull request #3192 from acemod/getTargetDistance_to_LIS ... Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.	2016-02-04 19:42:32 +01:00
Thomas Kooi	6cf02bd06b	Merge pull request #3193 from acemod/fcs_rewriteRangeFunctions ... Cleaning up the FCS code	2016-02-04 19:39:32 +01:00
Thomas Kooi	d68c79efb1	Merge pull request #3204 from acemod/m67_dns ... Fix Handgrenade DisplayNameShort	2016-02-04 19:37:20 +01:00
Thomas Kooi	69746a133b	Merge pull request #3254 from ProfessorCZ/master ... Czech Translation - Update	2016-02-04 19:36:28 +01:00
Thomas Kooi	8034d91d76	Merge pull request #3249 from GitHawk/refuel_nozzle ... Added a real nozzle	2016-02-04 19:32:17 +01:00
Thomas Kooi	d72c73dc25	Merge pull request #3257 from acemod/flashbangUnderwater ... Flashbangs - pass pos instead of obj reference	2016-02-04 19:31:11 +01:00
Thomas Kooi	dc8e7e2994	Merge pull request #3255 from acemod/tourniquetMedications ... Tourniquets block medication until released	2016-02-04 19:30:40 +01:00
PabstMirror	336184dfaa	Change medication removal from array	2016-02-04 10:00:33 -06:00
esteldunedain	c87f19c8da	Fix #3258	2016-02-04 10:04:26 -03:00
PabstMirror	2cf2cb0e59	Fix statusEffect error in refuel	2016-02-04 01:31:12 -06:00
PabstMirror	7fc84c60dd	Flashbangs - pass pos instead of obj reference ... Fix #3205	2016-02-03 17:53:24 -06:00
PabstMirror	3cc10a27ce	Tourniquets block medication until released ... Close #2704	2016-02-03 14:40:26 -06:00
ProfessorCZ	61611d0ec7	Czech Translation - Update ... Update	2016-02-03 18:31:31 +01:00
PabstMirror	397a12056a	Merge branch 'master' into deterministicOverheatingX	2016-02-02 17:11:00 -06:00
Githawk	979ceb7ad7	Fixed rearm unholster macro	2016-02-02 16:04:50 +01:00
Githawk	cbeac7f154	params stuff	2016-02-02 15:47:05 +01:00
Githawk	4d403d21aa	Fixes ... Moved models into data fixed vehicle attach for certain angles	2016-02-02 15:45:57 +01:00
Githawk	5e103ba398	Added nozzle ... Added code for nozzle object Params and private update	2016-02-02 15:03:06 +01:00
Githawk	475351fcfa	Some bracket errors	2016-02-01 20:21:20 +01:00
Githawk	cc624f58dd	Fixes and updates	2016-02-01 20:05:53 +01:00
esteldunedain	f744e164d3	Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0	2016-02-01 14:58:01 -03:00
PabstMirror	46d6e92bca	Add quick debug defines to all script_components	2016-01-28 23:26:02 -06:00
PabstMirror	af6b084ba3	Don't allow carrying with injured legs ... Fix #2644	2016-01-28 23:05:55 -06:00
PabstMirror	c0eccc67c3	Change all SCALAR to NUMBER in headers	2016-01-28 18:19:15 -06:00
PabstMirror	3f1d6ffeb7	Fix dragging sending objects to random location ... attachTo seems to have weird getpos results for a few frames. also don't show mouse wheel option for carrying man and always use 0 offset for dragging man	2016-01-28 17:11:05 -06:00
PabstMirror	d9eafbdf0f	Privates / Headers	2016-01-28 12:52:53 -06:00
PabstMirror	84e76efc7f	Not needed on CfgMagazines	2016-01-27 15:54:45 -06:00
esteldunedain	2eb91cf2b4	Delete spare models	2016-01-27 18:23:04 -03:00
PabstMirror	7a7e0d689a	Improve underwater cargo unloading	2016-01-27 14:56:25 -06:00
esteldunedain	d2d7e46401	Align trench to ground surface to avoid having to lower them too much on slopes	2016-01-27 17:54:40 -03:00
esteldunedain	b20a2f338b	Replace trench models: bigger and opaque	2016-01-27 17:54:10 -03:00
PabstMirror	17a882fe4d	Add findUnloadPosition integration	2016-01-26 18:01:01 -06:00
esteldunedain	f8a1215264	Align trenches to ground	2016-01-26 11:03:11 -03:00
esteldunedain	0358b10298	Bigger trenches	2016-01-26 11:02:55 -03:00
PabstMirror	b15716860d	Remove VehicleLock Items from Virtual Arsenal ... Close #3215	2016-01-25 14:29:27 -06:00
SzwedzikPL	03fca3c372	fix fcs keyup/down forced params #3202	2016-01-25 09:49:47 +01:00
esteldunedain	3e25f9c5f0	Cache drawIcon3D parameters	2016-01-24 17:12:25 -03:00
esteldunedain	351d20ec32	Cache near object CAManBase that are on LOS instead of recomputing each frame	2016-01-24 17:12:06 -03:00
PabstMirror	276aea04c1	Changes for CBA 2.3	2016-01-24 11:41:10 -06:00
PabstMirror	78729e96ff	Fix bad forceWalk params	2016-01-24 11:39:59 -06:00
esteldunedain	0fd6981809	Don't allow placing is standig above the terrain level	2016-01-23 22:05:29 -03:00
esteldunedain	4970423cd7	Cancel placing if position is no longer suitable	2016-01-23 22:04:49 -03:00
esteldunedain	8ff8204905	Initial code implementation of ace_trenches	2016-01-23 20:45:59 -03:00
esteldunedain	1d886ac624	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2016-01-23 17:39:54 -03:00
esteldunedain	dec9235810	Periodically test all tags on objects for corner cases	2016-01-23 16:47:00 -03:00
esteldunedain	431a21044a	Tabs be damned.	2016-01-23 16:37:30 -03:00
esteldunedain	74b6036f3e	Handle destruction of tags placed on objects that don't support handledamage.	2016-01-23 16:24:55 -03:00
esteldunedain	e31636539a	Allow tagging wrongly configured static objects.	2016-01-23 16:21:43 -03:00
esteldunedain	b020d88963	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into taggingX	2016-01-23 15:14:32 -03:00
esteldunedain	758611d230	Restrict temp update to current weapon, and only primary or handgun	2016-01-23 11:48:23 -03:00
PabstMirror	3a62956e24	Fix wind display angle being reversed	2016-01-22 20:43:22 -06:00
PabstMirror	5df211c586	Merge pull request #3126 from acemod/weatherCleanup ... Weather cleanup, fix wind inversion, add non-color based wind speed indicator	2016-01-22 14:56:21 -06:00
PabstMirror	73b29085e2	Merge pull request #3200 from acemod/moreCache ... Hearing - Cache Weapon/Ammo loudness	2016-01-22 14:56:00 -06:00
PabstMirror	45138aea18	Merge pull request #3163 from acemod/unifiedStatusEffects ... Unified status effect handler	2016-01-22 14:55:25 -06:00
VKing	9501c54530	Fix #3203 IEDs magically changing shape	2016-01-22 14:21:25 +01:00
VKing	68531bd4a9	Merge branch 'master' into explosives_cleanup_plus_minetriggers	2016-01-22 14:15:45 +01:00
VKing	1cf7fc727d	Fix Handgrenade DisplayNameShort	2016-01-22 13:12:20 +01:00
PabstMirror	1a98726716	Add makeLoadable sync module	2016-01-21 22:12:54 -06:00
VKing	999d8ac2ce	Use max	2016-01-22 00:01:13 +01:00
esteldunedain	ad96617d3a	- Tagging cleanup. ... - Replaced "Tag wall" and "Tag ground" for a single "Tag" action. - Added more reliable checks before placing the tag - Allowed non-player units to tag (via API). - Replaced execRemoteFnc by events	2016-01-21 19:59:27 -03:00
esteldunedain	a22203a02a	Replace player for ACE_player	2016-01-21 14:39:20 -03:00
VKing	8482d45d8b	Add FCS to gunner and commander RCWS types for MRAPs, APCs, and arty. ... Lower max range to 5500m (9990 is too damn high!)	2016-01-21 16:00:55 +01:00
VKing	299baf1e4a	Fix shotbullet checking (lost in merge)	2016-01-21 15:56:53 +01:00
VKing	fedfa94dcd	Clean up	2016-01-21 15:01:41 +01:00
VKing	4406f270e2	Fix infantry rangefinders (again)	2016-01-21 14:44:23 +01:00
esteldunedain	91b7c7de61	Change the varname of the weapon data cache to be consistent with other modules	2016-01-20 22:22:53 -03:00
esteldunedain	41f8628917	Change cache location type to ACE_HashLocation	2016-01-20 22:20:16 -03:00
esteldunedain	f7cfbebc49	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX	2016-01-20 22:19:11 -03:00
VKing	bf5eb78788	Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions ... # Conflicts: # addons/fcs/functions/fnc_keyUp.sqf	2016-01-21 02:14:51 +01:00
VKing	b83be88571	Enhance ranging. ... KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal. Sorry in advance for the merge conflicts	2016-01-21 02:02:50 +01:00
VKing	7d3044a5c2	Move display update stuff to fnc_getRange	2016-01-21 00:20:21 +01:00
PabstMirror	be8afe507c	Few more privates	2016-01-20 17:19:08 -06:00
PabstMirror	3dac426bc6	Merge pull request #3132 from acemod/interactionMenuCleanup ... Cleanup Interaction Menu	2016-01-20 17:04:10 -06:00
PabstMirror	abb01e0653	Merge pull request #3129 from acemod/frag-cacheIfWillFrag ... Frag - only run addPfhRound on ammo that will frag (for master)	2016-01-20 17:03:55 -06:00
VKing	43ab126c1f	Add FCS to botes RCWS	2016-01-20 23:06:06 +01:00
esteldunedain	e113853395	Merge branch 'master' into tagging	2016-01-20 18:51:41 -03:00
VKing	5f14d17f98	Another fix for BIS' inconsistent implementations	2016-01-20 22:30:22 +01:00
Thomas Kooi	232fe62d8d	Merge pull request #3195 from acemod/fix3194 ... Fix typo in ACE_hearing config	2016-01-20 22:26:13 +01:00
esteldunedain	9d13cc6f60	Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments.	2016-01-20 15:19:46 -03:00
esteldunedain	851615a234	Inherit custom gesture classes.	2016-01-20 13:44:51 -03:00
esteldunedain	7860f375c2	Better func description	2016-01-20 13:07:51 -03:00
esteldunedain	89106f6953	Replace addPerFrameHandler for waitAndExecute	2016-01-20 13:05:47 -03:00
esteldunedain	80b9a8961a	Improve reload animations	2016-01-20 12:48:39 -03:00
PabstMirror	a140f29784	Remove inherited classes that were not used	2016-01-20 09:45:03 -06:00
esteldunedain	bce572e1df	Derp	2016-01-20 12:15:25 -03:00
esteldunedain	19ccf52425	MRBS to mrbs	2016-01-20 12:05:35 -03:00
VKing	43c9444fb8	Didn't need that isNil check, anyway	2016-01-20 15:51:07 +01:00
esteldunedain	1a115e7f9c	Fix #3194	2016-01-20 11:48:12 -03:00
esteldunedain	6b4b8b707c	Prefix new configs for consistency	2016-01-20 11:42:05 -03:00
esteldunedain	2f7cac68a5	Small fixes	2016-01-20 10:59:58 -03:00
VKing	a9511936fd	LayZ evaluation	2016-01-20 12:35:53 +01:00
Glowbal	34613b42f2	Increase heart rate increase speed #3134	2016-01-20 11:49:10 +01:00
VKing	05ce4f824c	Rewrite fnc_getRange to work with specified minimum and maximum ranges ... Also cleaning up fnc_keyUp a bit	2016-01-20 00:10:27 +01:00
VKing	757436140b	fnc_getTargetDistance rewritten to use LineIntersectsSurfaces. ... Turns out it wasn't really needed after all, but better is better :p	2016-01-20 00:06:06 +01:00
PabstMirror	3d4fc66bb1	Cargo Cleanup, Add makeLoadable	2016-01-19 14:51:58 -06:00
esteldunedain	c78f2f8479	Gotcha travis	2016-01-19 17:29:58 -03:00
esteldunedain	5b90fd8b81	Set default particle effect on for the local player, as per current and historic behaviour.	2016-01-19 17:25:14 -03:00
esteldunedain	9bcabd081b	Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off).	2016-01-19 17:24:01 -03:00
VKing	968f7c000b	Simplify	2016-01-19 21:16:41 +01:00
SilentSpike	ca5f6df3d0	Merge pull request #3147 from acemod/spectatorBandAid ... Restart specatator display if player in unitList	2016-01-19 20:15:24 +00:00
VKing	c8bcf44561	Increase M307 FCS range	2016-01-19 21:08:03 +01:00
esteldunedain	8b7ed38990	Add a PFH to cool down all player weapons at (infrequent) regular intervals	2016-01-19 17:04:51 -03:00
esteldunedain	0313e7b322	Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately	2016-01-19 17:03:47 -03:00
esteldunedain	782934c4b2	Add the setApproximateVariablePublic function to common	2016-01-19 16:58:07 -03:00
VKing	ae576e57e3	Fix the magazine name being broken in later code	2016-01-19 20:21:37 +01:00
esteldunedain	3792acd7f7	Merge branch 'master' into deterministicOverheatingX	2016-01-19 15:57:38 -03:00
VKing	59923710b7	Fix FCS not taking weapon initSpeed into account in some circumstances	2016-01-19 19:52:18 +01:00
VKing	838945c1db	Add FCS for the M307 GMG	2016-01-19 18:53:42 +01:00
PabstMirror	04bccf47d7	Replace all use of deprecated commands	2016-01-19 09:39:07 -06:00
esteldunedain	8e2d489312	Add warnings to deprecated functions	2016-01-19 09:39:06 -06:00
PabstMirror	7e84a9d9b0	Add getter, readd old public funcs, add blockSprint	2016-01-19 09:39:06 -06:00
PabstMirror	d2e006397d	cleanup, don't setVar public if no change	2016-01-19 09:39:05 -06:00
PabstMirror	9a3972de76	Unified Status Effect Handler	2016-01-19 09:39:05 -06:00
Thomas Kooi	b99be6122b	Merge pull request #3187 from acemod/fixFCS ... Add missing FUNC to FCS key (Rangefinders)	2016-01-19 16:05:56 +01:00
PabstMirror	6d6cbec5ef	Add missing FUNC to FCS key (Rangefinders) ... #3160	2016-01-19 09:02:51 -06:00
Thomas Kooi	c439036abe	Deprecate execPersistentFnc 3.7.0 ... Remove functions the second update after deprecation.	2016-01-19 15:55:33 +01:00
Thomas Kooi	a612bdecf2	Deprecate execRemoteFnc in 3.7.0 ... Remove functions the second update after deprecation.	2016-01-19 15:54:59 +01:00
PabstMirror	69771d531d	Merge pull request #3173 from acemod/fixInvintoryLock ... Fix Vehicle inventory is not locked	2016-01-19 08:37:58 -06:00
PabstMirror	0ea1c0c03f	Cleanup non-working code, and documentation	2016-01-19 08:31:52 -06:00
Thomas Kooi	e083e60e8c	Merge pull request #3142 from acemod/switchUnitsCleanup ... Cleanup SwitchUnits, Possible fix for #3122	2016-01-19 09:40:24 +01:00
Thomas Kooi	33479ffcae	Merge pull request #3146 from acemod/Explosives_DetonateTrigger ... Function to detonate explosives via script	2016-01-19 09:38:43 +01:00
Thomas Kooi	aa535c9167	Merge pull request #3177 from acemod/fixJavelinZeus ... Javelin - Fix zeus RC after switchCamera	2016-01-19 09:36:08 +01:00