8653 Commits

Author	SHA1	Message	Date
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