10878 Commits

Author	SHA1	Message	Date
Glowbal	02fea363b6	Merge pull request #3940 from acemod/particles ... Custom smoke particles	2016-07-12 13:36:36 +02:00
Glowbal	ee8e03a1ae	Merge pull request #3916 from acemod/merge-basic-and-advanced ... Merge basic and advanced injury systems	2016-07-12 13:36:02 +02:00
PabstMirror	89992a9710	Improve SSN hash	2016-07-11 21:30:04 -05:00
Glowbal	0e740f00c3	Merge branch 'release'	2016-07-11 23:42:03 +02:00
Glowbal	de612d9613	Merge branch 'apex' into release	2016-07-11 20:59:34 +02:00
Glowbal	8e3ad9a032	Merge pull request #4083 from acemod/required-addons-apex-cherry-pick ... Required addons for APEX	2016-07-11 20:58:50 +02:00
Glowbal	0869cf96bd	required arma3 version 1.62. closes #4081	2016-07-11 19:27:40 +02:00
Glowbal	d0c30577af	Remove usage of setUnconscious	2016-07-11 19:18:40 +02:00
Glowbal	86c67d9e33	Merge branch 'apex' into release	2016-07-11 19:04:53 +02:00
commy2	17f848fba9	Merge pull request #4063 from acemod/gunbag-assault-rifles-cherry-pick ... enable gunbag for all non-machinegun primary weapons	2016-07-11 17:40:53 +02:00
jonpas	fd39ee9e6b	Merge branch 'master' into armake	2016-07-11 16:27:37 +02:00
commy2	25a3405d1f	required addons apex, close #4020	2016-07-11 12:01:47 +02:00
Glowbal	dbac1c6398	Merge branch 'apex' into release	2016-07-11 11:16:50 +02:00
Glowbal	02f08939f2	Merge pull request #4052 from acemod/fix4049 ... Mine detector optimization and cleanup	2016-07-11 11:16:16 +02:00
Glowbal	9b85bc3e29	v3.6.1	2016-07-11 11:15:36 +02:00
PabstMirror	74da791610	Proper fix for naval mines	2016-07-10 17:29:19 -05:00
PabstMirror	721bc205ef	Allow defusing naval mines ... Fix #4074 - Workaround for naval mines not working with deactivate - Add "isNotSwimming" exception to defuse progress bar	2016-07-10 13:49:06 -05:00
esteldunedain	9323314da5	Merge branch 'fix4049' of github.com:KoffeinFlummi/ACE3 into fix4049	2016-07-09 20:04:20 -03:00
esteldunedain	165bd4b3f8	Make volume consistent	2016-07-09 20:00:53 -03:00
commy2	d249132864	Merge pull request #4062 from acemod/disable-interaction-menu-while-reloading ... Add reload mutex as canInteractWith condition	2016-07-09 21:03:55 +02:00
PabstMirror	3ac1525a3d	Add base icon	2016-07-09 12:11:58 -05:00
jonpas	55c7b9bfc4	Merge pull request #3997 from acemod/gogglesEffectsSetting ... Add goggle setting for level of effects	2016-07-09 18:48:22 +02:00
jonpas	d9d2302ab8	Merge pull request #4069 from acemod/addAsianStrings ... Add Korean and Japanese strings to tracker	2016-07-09 18:20:16 +02:00
jonpas	317c36e85c	Merge pull request #4061 from acemod/removegtgt ... Remove remaining >> signs from interaction menu	2016-07-09 18:17:39 +02:00
BaerMitUmlaut	0a46a83e02	Realistic names for APEX content (#4055) ... * Added realistic names for APEX content * Fix strings * Lowercase Polish colors	2016-07-09 18:14:08 +02:00
Glowbal	f86d8d113c	Merge branch 'release'	2016-07-09 11:36:49 +02:00
PabstMirror	ef38144d70	Merge pull request #4051 from acemod/simplifyNews ... Make ace news fit apex menu style	2016-07-08 15:46:54 -05:00
jonpas	1185375c90	Add Korean and Japanese strings to tracker	2016-07-08 20:00:12 +02:00
commy2	c55c0d5666	only use one waitUntilAndExecute at any time for reload mutex	2016-07-08 15:12:47 +02:00
esteldunedain	071201ea46	Remove the pistol cursor from the mine detector	2016-07-07 19:03:14 -03:00
jonpas	0220b57609	Remove redundant getMagazineIndex compatibility function	2016-07-07 20:16:03 +02:00
esteldunedain	2a36fec793	Make the detector AI compatible	2016-07-07 12:38:53 -03:00
Glowbal	da661afe9b	Improve syntax	2016-07-07 17:22:08 +02:00
commy2	be17b72cad	remove old 'gestures' reload mutex	2016-07-07 16:38:24 +02:00
commy2	6569de5332	add event handler for reload mutex	2016-07-07 16:35:07 +02:00
esteldunedain	6160fe076d	Add an event when a mine is detected to allow hooking into missions	2016-07-07 11:17:57 -03:00
esteldunedain	244bdb093d	Add clicks when activating/deactivating the detector	2016-07-07 11:17:09 -03:00
esteldunedain	7a25c53dd3	Switch say2D to playSound	2016-07-07 10:51:34 -03:00
commy2	2a84865302	add event handler for reload mutex	2016-07-07 15:47:37 +02:00
Glowbal	7157fcf420	Clean up unconscious and revive states	2016-07-07 12:57:21 +02:00
Glowbal	2daee60d0c	Add handle revive and Unconscious states	2016-07-07 12:04:26 +02:00
Glowbal	d0236a007a	Work done on medical states	2016-07-07 11:46:55 +02:00
commy2	bf7fde0d65	enable gunbag for all non-machinegun primary weapons	2016-07-07 09:47:02 +02:00
commy2	e39017e27a	add reload mut ex as canInteractWith condition	2016-07-07 09:10:14 +02:00
esteldunedain	893866ff39	Remove >> signs from interaction menu	2016-07-06 22:38:03 -03:00
esteldunedain	ce0da11aed	Clip sound duration to below 0.5 s to avoid it stacking into itself when using say	2016-07-06 22:23:34 -03:00
esteldunedain	f73b6b1aad	- Restore the config of detector sounds through CfgSounds ... - Add the possibility of switching between headphones or speaker - Move detector actions to their own submenu	2016-07-06 22:14:26 -03:00
esteldunedain	34654fffb7	Add function to allow using playSound3D on CfgSounds classes	2016-07-06 21:31:06 -03:00
PabstMirror	5362a80911	Tweak spotting scope anims / mem points	2016-07-06 16:55:54 -05:00
PabstMirror	450b8dfedb	Fix order of revive loop ... Fix #4035 Revive loop was killing heartrate before it exited	2016-07-06 00:54:51 -05:00
PabstMirror	4047c44b64	Merge pull request #4047 from acemod/cleanupRefuel ... Refuel - Simplify Actions, Fix Van_01 config	2016-07-05 20:59:49 -05:00
PabstMirror	022e7747b1	Fix no attack profile on static titan launcher (#4023)	2016-07-05 20:58:32 -05:00
jonpas	005f17131a	Add Squad Radar UI setting	2016-07-05 23:06:44 +02:00
jonpas	bd2a063861	Fix pboProject false/true becoming 0/1 in UI config, Default ammoCount to off (#4041)	2016-07-05 23:01:25 +02:00
PabstMirror	6c732bf789	Fix action name, put actions on base class	2016-07-05 00:22:47 -05:00
esteldunedain	30532983a1	Improve the positioning of the detector point	2016-07-04 19:32:40 -03:00
esteldunedain	e26eda3ac2	- Optimize getDetectedObject ... - Cache detected mines for 0.15 s - Call detectorLoop every 0.05 s instead of 0.01s - Compile a dictionary of detectable classnames from config at start - Switch to playSound3d for global effect - Remove dummy - Change config entries to support playSound3d - Cache getDetectorConfig for better interaction menu performance - Change sound to mono wss - Close #4049	2016-07-04 19:04:58 -03:00
PabstMirror	8a572ace41	Make ace news fit apex menu style	2016-07-04 15:31:25 -05:00
PabstMirror	e40415b628	Add #undef for PREP w/ DISABLE_COMPILE_CACHE	2016-07-04 01:17:30 -05:00
Glowbal	1922cac79e	fix spelling of arguments	2016-07-03 23:22:31 +02:00
PabstMirror	ea140f63a5	Refuel - Simplify Actions, Fix Van_01 config	2016-07-03 15:17:00 -05:00
Nicolás Badano	08c4731a3a	Merge pull request #4045 from acemod/fixOverheatingBarrels ... Fix overheating spare barrels	2016-07-03 21:11:13 +02:00
commy2	a5b88d3276	Merge pull request #4034 from acemod/dragKeybind ... Add Drag/Drop Keybind	2016-07-03 20:43:06 +02:00
commy2	0a5a4d2d33	Fix German word order / capitalization	2016-07-03 20:42:43 +02:00
PabstMirror	5ad1f752ca	Fix overheating spare barrels ... - Remove ACE_SpareBarrel from CfgWeapons as it is now a magazine - Don't call updateTemperature in displayTemp, as unit may not be local - Fix targetEvent error	2016-07-03 12:58:40 -05:00
PabstMirror	82f63b5935	Update showHud func for 1.62 (squad radar)	2016-07-03 12:17:42 -05:00
PabstMirror	bbc708e3e0	Less aggressive overlap detection ... Ensure the 2d screen pos distance is significant.	2016-07-02 22:46:36 -05:00
Glowbal	e8eb729e04	Merge medical core and medical state. Add working version of the state machine, re-add sounds	2016-07-02 16:34:28 +02:00
PabstMirror	d15330d245	Fix cargo event name - spare parts not being added	2016-07-01 23:14:20 -05:00
PabstMirror	96efbaef53	Add Drag/Drop Keybind	2016-07-01 16:28:44 -05:00
Glowbal	2d330e36e0	Add initial medical state component	2016-06-30 23:43:25 +02:00
Glowbal	3aa88c80bf	Add first step in medical rewrite ... Split up medical core and medical damage. Move out all other functionality	2016-06-30 17:33:29 +02:00
Glowbal	8b1b31fc8d	Merge branch 'apex' into medical-rewrite	2016-06-30 16:51:50 +02:00
Glowbal	8c331937d0	Merge branch 'merge-basic-and-advanced' into medical-split-treatment ... Conflicts: addons/medical/ACE_Medical_Treatments.hpp addons/medical/config.cpp addons/medical_treatment/functions/fnc_addToTriageCard.sqf	2016-06-30 11:41:03 +02:00
Glowbal	e3f96b6594	Merge branch 'master' into merge-basic-and-advanced ... Conflicts: addons/medical/XEH_postInit.sqf addons/medical/functions/fnc_displayPatientInformation.sqf	2016-06-30 11:27:51 +02:00
Glowbal	cd08e00c71	Merge pull request #3962 from acemod/dogtags ... Dogtags	2016-06-29 22:19:02 +02:00
Glowbal	a497690bbd	Merge branch 'master' into apex	2016-06-29 21:44:15 +02:00
Glowbal	eca5263df8	Merge pull request #3998 from acemod/apexUBC ... Fix UBC for 1.62 Apex	2016-06-29 12:04:21 +02:00
Glowbal	806877492c	Merge pull request #3999 from acemod/fixApexWeapons ... Fix ballisitics and huntir configs	2016-06-29 12:04:05 +02:00
PabstMirror	3ae8a494c4	Add javelin configs for new apex launchers ... Fix #4007	2016-06-28 22:46:04 -05:00
commy2	ab2307996c	add possibility to overwrite a units faction for determining name tags	2016-06-28 23:43:34 +02:00
Glowbal	01c184b174	Merge pull request #4014 from acemod/apexTitanBandaid ... Handle bad target when using apex titans	2016-06-28 22:01:12 +02:00
Glowbal	4251831e2e	Merge pull request #4009 from acemod/fixRearmEvents ... Fix rearm events	2016-06-28 20:33:56 +02:00
BaerMitUmlaut	898217a533	Fixed popping and stray particles	2016-06-28 19:23:47 +02:00
jonpas	e6362c699d	Fix tabs	2016-06-28 18:34:06 +02:00
jonpas	b99b11d066	Merge branch 'master' into armake	2016-06-28 18:29:51 +02:00
PabstMirror	20376385ca	Fix #4007 - Handle bad target when using apex titans	2016-06-27 13:43:05 -05:00
Glowbal	1d66d46501	Fix damaged array not being overwritten. ... This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.	2016-06-27 19:55:00 +02:00
Glowbal	419b525458	Fix incorrect macro syntax ... Syntax caused pboProject to choke	2016-06-27 19:30:39 +02:00
Glowbal	a9f3c2f784	Merge pull request #4012 from acemod/fix-medical-config-typo ... Fix incorrect values for bandage configuration	2016-06-27 19:07:34 +02:00
Glowbal	d7965233d9	Merge pull request #4010 from acemod/rearmHandleNil ... rearm - Skip selectWeapon on nil	2016-06-27 19:05:37 +02:00
Glowbal	8809881a9e	Merge branch 'release' into fixRearmEvents	2016-06-27 19:04:32 +02:00
Glowbal	0844e311a5	Merge pull request #4008 from acemod/cleanupWaitAndExec ... Switch EFUNC(common,waitAndExecute) to CBA	2016-06-27 19:03:24 +02:00
Glowbal	c287223a08	Fix incorrect values for bandage configuration	2016-06-27 19:01:33 +02:00
PabstMirror	8bd3332b0e	rearm - Skip selectWeapon on nil ... Should fix #4006	2016-06-27 00:00:25 -05:00
PabstMirror	8ecd8a49cc	Fix rearm events	2016-06-26 23:37:23 -05:00
PabstMirror	10a19b59e7	Swich EFUNC(common,waitAndExecute) to CBA	2016-06-26 22:18:53 -05:00
esteldunedain	d6d6ed7674	Make it work properly and support ceilings	2016-06-26 20:17:51 -03:00
esteldunedain	18fd198d1e	If the surface is not horizontal create _v2 pointing upward instead of away	2016-06-26 20:02:14 -03:00
Glowbal	21c4efcbba	Merge pull request #4004 from acemod/custom-rank-icons-function ... add function for custom rank icons displayed below nametags	2016-06-26 10:57:49 +02:00
Glowbal	2a46099063	Merge pull request #4003 from acemod/disable-auto-weather ... Disable auto weather	2016-06-26 10:51:38 +02:00
Glowbal	badb3fa943	Merge branch 'release' into fingerCleanup	2016-06-26 10:49:54 +02:00
Glowbal	b84b532cfb	Merge pull request #4001 from acemod/renameEvents ... Rename events	2016-06-26 10:47:39 +02:00
Glowbal	52f8def590	Merge pull request #3991 from acemod/uavFCS ... Block FCS when controlling a UAV	2016-06-26 10:47:19 +02:00
PabstMirror	0ff0185359	Fix ballisitics and huntir configs	2016-06-25 21:57:42 -05:00
PabstMirror	ed0823e40f	Fix UBC for 1.62 Apex	2016-06-25 21:07:30 -05:00
PabstMirror	5108ffe20c	Add goggles setting for level of effects ... Can chose between none, tint/colorCC/ and full dust/dirt/rain/rotorwash	2016-06-25 19:16:26 -05:00
PabstMirror	5a92aaeb28	Make dirt/dust effects less bright at night ... Fix #1447	2016-06-25 19:02:07 -05:00
commy2	4a19f9b1af	update russian rank icons	2016-06-26 01:01:03 +02:00
commy2	4e0fb4d171	give the iranians their ranks back	2016-06-26 00:35:56 +02:00
commy2	9eba2fe940	add russian rank icons	2016-06-26 00:02:19 +02:00
commy2	1db1c41072	only disable auto-weather settings by default, but keep them toggleable	2016-06-25 21:46:24 +02:00
commy2	e88ecfc236	add function for custom rank icons displayed below nametags	2016-06-25 21:25:03 +02:00
esteldunedain	0160ee81a6	- ACE_Finger cleanup ... - Allow pointing to nearby positions	2016-06-25 16:02:06 -03:00
commy2	3690519a7c	disable auto weather - bugging out ACE weather	2016-06-25 20:39:06 +02:00
Glowbal	f171ef8e16	Merge branch 'release' into fixLoadoutWhenNull	2016-06-25 12:25:23 +02:00
Glowbal	af61c2bc50	Remove unused parameter ... Gear is no longer used and can be removed from fthe function parameters	2016-06-25 12:23:07 +02:00
Glowbal	5fef1ba384	Change use backpack command for backpack classname ... Uses the backpack command to retrieve the classname of a unit's backpack instead of a select. Fixes incorrect index.	2016-06-25 12:03:44 +02:00
Glowbal	8f3907c03f	Merge branch 'release'	2016-06-25 11:43:49 +02:00
Glowbal	6e6929be4d	Merge pull request #3985 from acemod/fixLeadIndicatorForBluAA ... Fix lead indicator for B_APC_Tracked_01_AA_F	2016-06-25 11:40:51 +02:00
Glowbal	fc876ce316	Merge pull request #3986 from acemod/fixSekerLos ... missleGuidance - Fix seeker los check	2016-06-25 11:40:15 +02:00
PabstMirror	a18e46c1c9	missleGuidance - Fix seeker los check ... Close #3374 Because func was undefined _losOkay was nil, so target leading was always skipped.	2016-06-25 01:27:23 -05:00
J3aLeiNe	75396ce63e	Update fnc_getMapData.sqf ... No Gitexit for Lingor. Stay with us Lingor ! :p	2016-06-25 08:21:21 +02:00
PabstMirror	5589ef2bb8	Fix Target lead indication for B_APC_Tracked_01_AA_F	2016-06-25 00:13:07 -05:00
PabstMirror	c3710cc7f9	Handle "loadout" changed event when player is null	2016-06-24 23:32:32 -05:00
PabstMirror	618d3a2e96	Block FCS when controlling a UAV ... Fix doing FCS keyUp calculations/setVariable when controlling a UAV while also in a turret with FCS enabled. Normal rangefinder on the UAV will still work as FUNC(canUseRangefinder) is still true	2016-06-24 16:53:13 -05:00
Glowbal	7f7671d5ca	Update required arma3 version	2016-06-24 20:58:45 +02:00
Glowbal	37c4351340	Increase required CBA version	2016-06-24 20:56:57 +02:00
J3aLeiNe	8e7282a46a	Add OFP maps by CWR2 team ... - Add OFP maps by CWR2 team included in the last CUP terrains update - Fix latitude according to the Bohemia Wiki	2016-06-24 19:47:44 +02:00
esteldunedain	28c41e0518	Rename cargo events: ... - ace_cargoAddedByClass -> ace_cargoAdded - ace_addCargoByClass -> ace_addCargo	2016-06-24 12:12:19 -03:00
esteldunedain	6f65155060	Rename the explosive orientations events again: ... - ace_explosives_clientRequestOrientations -> ace_explosives_sendOrientations - ace_explosives_serverSendOrientations -> ace_explosives_orientationsSent	2016-06-24 12:02:10 -03:00
esteldunedain	18f09b9310	Rename events: ... - ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded - ace_cargoAddedByClass -> ace_cargoByClassAdded - ace_enteredCardiacArrest -> ace_cardiacArrestEntered - ace_itemAddedToTriageCard -> ace_triageCardItemAdded - ace_reload_linkedAmmo -> ace_reload_ammoLinked - ace_reload_returnedAmmo -> ace_reload_ammoReturned - ace_treatmentSuccess -> ace_treatmentSucceded - ace_common_engineOn -> ace_common_setEngine - ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations - ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations - ace_interaction_lampTurnOff -> ace_interaction_setLampOff - ace_interaction_lampTurnOn -> ace_interaction_setLampOn - ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel - ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint Close #3533	2016-06-24 10:45:13 -03:00
Nicolás Badano	6801954e1f	Merge pull request #3969 from acemod/dogtag-bodybag ... Add dogtag actions to body bags	2016-06-22 21:35:00 -03:00
J3aLeiNe	6a92b43b1d	Update fnc_getMapData.sqf ... Add maps and fix latitude : - Kidal, latitude 18° (default latitude 0°) - Governor´s Island, latitude 41° (default latitude -34°) - Doung island (Unsung Mod), latitude 10° (default latitude -10°) - Dakrong (Unsung Mod), latitude 16° (default latitude -16°) - Pecher map, latitude 43° (default latitude -34°) Remove obsolete Arma2 Lingor map and fix my illiterate mistakes ...	2016-06-22 16:36:53 +02:00
commy2	08886f413c	change remaining ace events to CBA 'addPlayerEventHandler'	2016-06-22 11:16:55 +02:00
commy2	047ac8c3f2	Merge pull request #3973 from acemod/eventWrappers ... Convert state checking to CBA playerEH	2016-06-22 10:53:47 +02:00
commy2	bd41260fa8	add a missing 'private'	2016-06-22 10:46:04 +02:00
PabstMirror	fad44e38a6	Convert state checking to CBA playerEH	2016-06-21 19:31:25 -05:00
commy2	89ecc81111	convert common events to CBA playerEvents	2016-06-22 01:39:20 +02:00
SilentSpike	6d8121b544	Improve unit name SSN generation ... Names shorter than the required 9 characters are now reused until we have 9 characters - making for fully unique generation. To keep things distributed as pleasantly as possible they're itterated over with a step of two - alternating between odd and even indexes every full loop. Similarly, the slice of string used for names longer than 9 characters is now offset based on the length of the name.	2016-06-21 20:35:23 +01:00
SilentSpike	ebcf1687a7	Generate SSN of unit from their name ... Similar to how we're handling blood types, uses the unit's name to generate a valid three/two/four format SSN. For names less than 9 characters long this will currently generate a unique SSN only up to the length of the name and append valid digits as necessary.	2016-06-21 18:42:15 +01:00
PabstMirror	af6aaf6e7d	fix mine ubc	2016-06-21 12:24:31 -05:00
PabstMirror	3972504d4a	Add dogtag actions to body bags	2016-06-21 12:13:32 -05:00
Glowbal	284231fe21	3.6.0	2016-06-21 18:07:27 +02:00
Glowbal	e357ca3ca8	Merge pull request #3963 from acemod/fix_ace_requiring_patched_stock_classes ... fix some rogue mission dependencies	2016-06-21 17:59:25 +02:00
Glowbal	ee58df9c34	bump minor version	2016-06-21 17:57:50 +02:00
esteldunedain	7f39748ff0	Tidy up text position to properly acommodate two line names	2016-06-20 17:42:21 -03:00
esteldunedain	7e3e101508	Nah, they don't	2016-06-20 17:37:37 -03:00
esteldunedain	171e6b278c	Merge branch 'dogtags_blood_type' of github.com:KoffeinFlummi/ACE3 into dogtags ... # Conflicts: # addons/dogtags/functions/fnc_getDogtagData.sqf	2016-06-20 17:19:35 -03:00
Nicolás Badano	09fd2c4895	Merge pull request #3965 from acemod/fixDogtagRespawn ... Fix issue with dogtag respawn/setVariable	2016-06-20 17:17:02 -03:00
PabstMirror	578477eae6	Fix issue with dogtag respawn/setVariable ... Store object instead of bool to indicate when dogtags have been taken When object respawns, the the old object reference won't apply (defacto reset)	2016-06-20 15:12:23 -05:00
esteldunedain	c47898a624	Parse the first portion of the uid	2016-06-20 17:04:30 -03:00
commy2	c88313221f	add function to report a blood type which is fixed to the units name	2016-06-20 21:50:00 +02:00
esteldunedain	88cf6aad98	Attempt on making blood type and service number unique for players	2016-06-20 16:45:34 -03:00
esteldunedain	6df82aad55	I can't believe it happened to me.	2016-06-20 16:12:40 -03:00
commy2	bf098ec70e	fix some rogue mission dependencies, fix #3954	2016-06-20 21:07:10 +02:00
PabstMirror	fe5dd3fe76	Cleanup some undefined functions and strings	2016-06-20 13:58:37 -05:00
esteldunedain	0d30bf1de8	- Add random service number and bloodtypes to all units. ... - Leave up to CBA to decide if events should be local or remote - Imp	2016-06-20 15:51:36 -03:00
esteldunedain	e58d829927	Restyle the dog tag text.	2016-06-20 14:54:16 -03:00
commy2	3fdc0dd521	Merge pull request #3955 from acemod/add_name ... add 'name' to components	2016-06-20 19:25:58 +02:00
esteldunedain	1f74bfca17	Merge branch 'dogtags' of https://github.com/SzwedzikPL/ACE3 into SzwedzikPL-dogtags	2016-06-20 12:46:49 -03:00
Glowbal	38df85bccc	Merge pull request #3958 from acemod/fix3950 ... Fix freeing prisoners after they've switched locality	2016-06-20 17:21:11 +02:00
commy2	750efbfdd8	fix spelling "Name Tags"	2016-06-20 12:34:30 +02:00
commy2	2249ef5e1c	fix spelling "Laser Pointer"	2016-06-20 12:34:03 +02:00
commy2	ae5fe8af3c	fix spelling "Wire Cutter"	2016-06-20 12:33:10 +02:00
BaerMitUmlaut	88b58216ee	Added beautified component names	2016-06-20 11:44:36 +02:00
Glowbal	e540134de1	Change component name to ACE3	2016-06-20 09:57:27 +02:00
Glowbal	afb9eb3084	Merge pull request #3342 from acemod/vehicleInteractionDistance ... Uniformize interaction distance for vehicle based on bounding box	2016-06-20 09:55:55 +02:00
Glowbal	8549d4402e	Merge pull request #3919 from acemod/fixSpottingScopePlacement ... Fix the placement of spotting scopes on slopes	2016-06-20 09:54:24 +02:00
Glowbal	dac7e54165	Merge pull request #3957 from acemod/fixComancheGuidance ... Fix Comanche's weapon lock and guidance	2016-06-20 09:53:33 +02:00
esteldunedain	dc1c312288	Also handle the surrendering AnimChanged EH	2016-06-19 20:15:51 -03:00
esteldunedain	ac144ca248	Move the AnimChanged EH to its own function to avoid duplication	2016-06-19 19:30:36 -03:00
esteldunedain	8042b888d4	Close #3950	2016-06-19 19:17:49 -03:00
BaerMitUmlaut	f0e4e5d2e8	Tweaked particles, added macros, tweaked burn times	2016-06-19 23:48:23 +02:00
BaerMitUmlaut	58c061553c	Added readme and author	2016-06-19 23:46:41 +02:00
esteldunedain	394832ef40	Completely restore the Comanche's DAGRs to vanilla. Close #3671	2016-06-19 18:26:09 -03:00
Nicolás Badano	618d14555a	Merge pull request #3952 from alganthe/french_translation_update ... French translation update	2016-06-19 10:18:47 -03:00
Josuan Albin	a04dec0c63	Update french translation	2016-06-19 15:16:43 +02:00
Josuan Albin	19da369887	Add back missing portuguese strings in inventory	2016-06-19 13:27:26 +02:00
commy2	c481ddedaf	add 'name' to components	2016-06-19 09:38:39 +02:00
Josuan Albin	d26f133733	Add missing french entries in stringtables and update older ones ... Take changes from #3480 and completed empty entries	2016-06-19 01:18:12 +02:00
esteldunedain	cc9e5f4631	Add icons for mine detector actions. Close #3935	2016-06-18 20:05:14 -03:00
commy2	ddbdf116ab	Merge pull request #3949 from acemod/remove_unused_files ... remove unused files	2016-06-18 20:17:42 +02:00
commy2	2d38ae62d2	remove another unused file	2016-06-18 20:12:17 +02:00
jonpas	ffd207dcf7	Merge pull request #3947 from acemod/fixCarrySitting ... Fix ability to carry a chair someone is sitting on	2016-06-18 19:55:03 +02:00
commy2	9b6441b3c1	remove unused files	2016-06-18 19:54:39 +02:00
jonpas	2b56d0c0dd	Use claim system - fix possibility to carry while someone is sitting	2016-06-18 19:53:44 +02:00
SilentSpike	ca01f31b52	Improve zeus auto-add XEH behaviour ... The XEH InitPost event only needs to be added if the `GVAR(autoAddObjects)` setting is enabled. This change will save on overhead when the setting is disabled and also removes some complexity from the function that runs in response to the event.	2016-06-18 15:41:13 +01:00
Josuan Albin	7c9dcf6bdb	Merge branch 'pr/3480' ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/cargo/stringtable.xml addons/flashlights/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/main/stringtable.xml addons/map/stringtable.xml	2016-06-18 16:26:46 +02:00
Glowbal	74da8cc36c	Fix strange animation played when using PAK ... Fixes #1695	2016-06-18 13:12:49 +02:00
Glowbal	f6b744e741	Merge pull request #3945 from acemod/fix-gray-screen-medical ... Fix no gray screen for advanced medical	2016-06-18 11:59:14 +02:00
Glowbal	12a1f10a29	Merge pull request #3944 from acemod/funcHeaders ... Cleanup Function Headers Titles	2016-06-18 11:57:43 +02:00
Glowbal	7dc76dee78	Fix no gray screen for advanced medical ... Advanced medical was never displaying the gray screen on low blood volume. This is because for advanced medical, the blood volume minimum level is around 40 before death. For basic medical, this is 0.	2016-06-18 11:55:03 +02:00
jonpas	03e923aa68	Cleanup Function Headers titles	2016-06-18 11:50:41 +02:00
Githawk	0723df7dea	Replace execRemoteFnc with CBA events in rearm	2016-06-18 11:44:36 +02:00
jonpas	ed15d99915	Fix basic UI being overwritten on RscDiary unload (#3920) ... * Display disabled message when basic config set by mission showHud * Set showHud on RscDiary unload - fix #3907, Remove redundant force parameter from basic setElements * Log forced source to RPT * Add source to scripted element setter	2016-06-18 11:32:56 +02:00
Glowbal	5d9def3874	Merge pull request #3927 from acemod/use-proper-undefs ... Fix for MikeRo Tools strict requirement for #undef usage	2016-06-18 11:25:25 +02:00
voiper	d5b3b03c1c	Make flashlight on/off + glow a PVAR. ... Clean up all privates. Change glow proxies to not inherit from chemlight_base, to avoid ammo detection issues. Make handleDisconnect glow deletion dedi server compatible (was only listen server compatible). Clean up determineMapLight: faster when no chemlights nearby, a tad slower when chemlights nearby, however sources the colour settings directly from the chemlight's config.	2016-06-17 17:18:06 -07:00
Glowbal	4c2c647842	Fix change in behaviour of QFUNC ... When using QFUNC, the intend most often is to have the name of the variable referencing the function as a string. This behaviour works when compiling without debug enabled. However if debug is enabled, QFUNC compiles in with the debug wrapper, becoming a code string instead of a string representation of a variable reference. A good example where this change of behaviour can be a problem is config attributes that refer to a call back (used a lot within ACE). In normal build, you will use a getvar to get the relevant code, as it is expected to point to the function. When using debug, you will need to do a compile instead, as it's a string representing a code block.	2016-06-17 21:44:04 +02:00
BaerMitUmlaut	deb9e0d75c	Added custom smoke particles	2016-06-17 17:33:50 +02:00
Glowbal	a63f496bf6	Merge pull request #3936 from acemod/fixMineDetector ... fix mine detector not picking up fused explosives	2016-06-17 09:17:49 +02:00
KoffeinFlummi	e5ef31c556	Disable redefinition warnings	2016-06-16 23:40:46 +02:00
voiper	f28f90b624	Use isEqualTo.	2016-06-16 12:21:40 -07:00
bux578	04c9b628c4	exit the loop properly	2016-06-16 17:36:37 +02:00
bux578	2d029401f5	fix capitalization	2016-06-16 17:33:21 +02:00
bux578	5f52101b26	fix mine detector not picking up fused explosives	2016-06-16 17:20:15 +02:00
Glowbal	eedb406ae5	Merge pull request #3930 from acemod/wireCuttersLOS ... Fix Line Of Sight check for wire cutter helper	2016-06-16 15:03:05 +02:00
Glowbal	fc241479fe	Merge pull request #3924 from voiperr/remove_attached_chemlights ... On Detach, Delete Used Chemlights	2016-06-16 15:02:29 +02:00
Glowbal	66450ad36a	Merge pull request #3755 from acemod/add-mine-detector ... Add mine detector port from ACE2	2016-06-16 14:59:35 +02:00
Glowbal	05aac2d223	Add store new helper object ... Fixes an issue were you end up with many helper objects that are not cleaned up	2016-06-16 14:57:26 +02:00
voiper	3070b2ac6e	Sounds are sourced from configs. ... Used impactGroundSoft[] as shortcut.	2016-06-15 18:16:28 -07:00
voiper	d4dfaeaf85	Capital L.	2016-06-15 16:31:05 -07:00
voiper	a20629066a	Further cleanup. Checked some privates.	2016-06-15 16:27:46 -07:00
voiper	2158d39e8a	Used QPATHTOF. Reverted config names. ... Optimised fnc_getUnitFlashlights.	2016-06-15 14:58:07 -07:00
PabstMirror	81c8ea54c3	getVehPos - Tweak heli width, and put at eye level	2016-06-14 23:30:58 -05:00
PabstMirror	cfc046ce71	Fix Merge	2016-06-14 19:37:22 -05:00
PabstMirror	d46c596cc4	Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance	2016-06-14 19:36:45 -05:00
PabstMirror	2bcc82cea7	Fix Line Of Sight check for wire cutter helper ... Fix #2976	2016-06-14 19:32:30 -05:00
ViperMaul	99d08d988a	Merge branch 'master' of https://github.com/acemod/ACE3 into use-proper-undefs	2016-06-14 08:27:47 -07:00
ViperMaul	d5750a6c40	Remove Tab	2016-06-14 08:12:29 -07:00
ViperMaul	b79a00d8d1	These 2 can be removed, since they are in CBA since 2.4.0 as Note from jonpas	2016-06-14 08:11:28 -07:00
voiper	01c335d13a	More cleanup + a bug fix.	2016-06-13 19:23:14 -07:00
voiper	69c3dd5cfb	Remove extra bracket.	2016-06-13 18:42:45 -07:00
voiper	c0e412211e	More realistic chemlight impact sounds.	2016-06-13 18:07:46 -07:00
voiper	b69aa8571e	Chemlights no longer re-add to inventory on remove. ... Items are detached prior to being deleted, to avoid objNull attaches.	2016-06-13 18:06:05 -07:00
esteldunedain	a12d9dc2fb	Attempt aof fixing the placement of spotting scopes on slopes	2016-06-13 16:51:28 -03:00
commy2	11dc3bd71a	Merge pull request #3911 from acemod/gunbagCleanup ... Gunbag cleanup	2016-06-13 20:39:46 +02:00
PabstMirror	a6766b611f	Always add finger keybind so it is changeable (#3914)	2016-06-13 12:14:35 -05:00
ViperMaul	2242f7c622	Fix for MikeRo Tools strict requirement for #undef usage	2016-06-13 09:20:09 -07:00
Glowbal	a8831a0d16	Change split medical in two components ... - medical component is responsible for the injuries and common functionality - medical_treatment component is responsible for offering treatment functionality	2016-06-13 17:00:56 +02:00
jonpas	6644a89fbf	More isModLoaded	2016-06-13 15:58:42 +02:00
Glowbal	295ad3b037	Merge branch 'medical-impr' into merge-basic-and-advanced	2016-06-13 14:32:15 +02:00
Glowbal	38cdd523f0	Clean up medical function private declares	2016-06-13 14:27:43 +02:00
Glowbal	fd108478fe	Clean up medical menu privates	2016-06-13 12:49:35 +02:00
Glowbal	58f43f8a51	Remove unneeded and deprecated functions from medical	2016-06-13 12:24:28 +02:00
Glowbal	d568041838	Change medical menu to work with basic medical injury overhaul	2016-06-13 12:19:19 +02:00
Glowbal	6657bde921	Change basic medical to use advanced medical injury system	2016-06-13 12:18:56 +02:00
Glowbal	792dbcd009	Change clean up privates in handleDamage code	2016-06-13 11:05:21 +02:00
Glowbal	8e59993d7a	Change clean up medical code	2016-06-13 10:55:19 +02:00
Glowbal	73bd684b65	Change formatting and private keywords in medical	2016-06-13 02:34:56 +02:00
Glowbal	3ba2396db7	Change minor clean up of handleUnitVitals	2016-06-13 02:11:21 +02:00
voiper	1ffd9d58ab	Revert postInit.	2016-06-12 15:39:16 -07:00
voiper	5a29c4b04c	Fix up weapon names.	2016-06-12 15:33:37 -07:00
voiper	f3fc99f3b8	Housekeeping of ace_flashlights and ace_map. ... ace_map now handles flashlights independently of ace_flashlights. ace_map searches for flashlight beam textures directly from weapon configs. ace_map has acc_flashlight config (so vanilla ace_map will have at least one flashlight to use).	2016-06-12 15:31:11 -07:00
jonpas	b80b7e5265	Shorten more GVARs	2016-06-13 00:08:28 +02:00
jonpas	323555d9a4	Prefix model, Fix indentation of model.cfg, Remove redundant CLASSNAME macro	2016-06-13 00:03:33 +02:00
jonpas	b40915dd12	Cealnup quotes, capitalization, function headers	2016-06-12 23:56:00 +02:00
voiper	b45a17001c	Merge remote-tracking branch 'origin/master' into grenadesounds	2016-06-12 14:54:14 -07:00
Glowbal	f0b0b49f3c	Merge pull request #3908 from acemod/funBag ... Only do gunbag things when target has a gunbag	2016-06-12 23:25:55 +02:00
Glowbal	43a2b0ea29	Merge pull request #3909 from acemod/fix-bandaging-configuration ... Adjust bandage configuration	2016-06-12 23:25:16 +02:00
PabstMirror	1997cb5199	Add maxDam for medium velocity wounds ... Ensures that velocity wounds from a major hit will use the "Large" type of wound	2016-06-12 14:47:59 -05:00
Glowbal	fa1282406f	Change bandage configurations ... - Field dressing is average treatment - Packing bandage is average treatment, higher reopen change, longer reopening delay - Elastic bandage is higher treatment, higher reopen change, shorter reopen delay - QuikClot is lower treatment, lower reopen change, longer reopening delay	2016-06-12 20:40:45 +02:00
PabstMirror	e8a403a9ad	Only do gunbag things when target has a gunbag	2016-06-12 12:58:39 -05:00
VKing	d5f8d965f3	Change ace_time to cba_missionTime	2016-06-12 17:22:44 +02:00
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
GitHawk	8e004741b9	Cleanup	2016-06-07 11:13:42 +02:00
GitHawk	e3f8fc2840	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm_supply	2016-06-07 10:56:38 +02:00
GitHawk	bc90a85bcd	Improvements	2016-06-07 10:26:22 +02: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
Githawk	9cfa2f11d9	Stuff ... Arguments, Return Value, (optional)	2016-06-06 20:42:20 +02:00
Githawk	ef4e232664	Merge remote-tracking branch 'master' into rearm_supply	2016-06-06 20:28:27 +02:00
Githawk	a2b9678b15	Object event	2016-06-06 19:51:00 +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
KoffeinFlummi	68a9a6157e	Fix vehiclelock weirdness	2016-05-28 19:54:01 +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
jonpas	f956ea557a	Merge branch 'master' into armake	2016-05-22 17:41:43 +02: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
GitHawk	d0509830e3	Some things ... Made params nicer, replaced some forEach and used params in XEH_respawn	2016-05-12 14:55:40 +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
KoffeinFlummi	13691fb5fa	More changes for Linux / armake	2016-05-02 21:18:44 +02:00
KoffeinFlummi	86a94baa8f	Rename files for Linux	2016-05-02 21:18:25 +02:00
PabstMirror	33b624c896	Tactical Ladder - Update model cfg ... #3745	2016-05-02 12:10:44 -05:00
KoffeinFlummi	c02e7ead32	Fix medical paths	2016-05-02 16:49:33 +02: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
commy2	7c2977ed47	Merge pull request #3150 from acemod/fixinteractmenusavegame ... reset interaction menu time variables on save game load	2016-03-10 23:46:37 +01: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
GitHawk	29cd940fd0	Added server events	2016-03-07 07:15:01 +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
Githawk	8dc99a4a4e	Replacing execRemoteFnc with events	2016-03-06 11:14:34 +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
GitHawk	6cce74907f	Merge acemod/master 3.5.0 ... # Merged Conflicts in addons/rearm/CfgVehicles.hpp	2016-03-02 09:59:22 +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
GitHawk	349b05a89b	Removed forgotten diag_log	2016-02-29 15:21:33 +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
Githawk	8e6b4f4ffb	More docu fixes	2016-02-27 21:14:23 +01:00
Githawk	3e2b01afca	Another minor fix	2016-02-27 21:12:50 +01:00
Githawk	3d7c51bdf1	Cleanup	2016-02-27 21:05:19 +01:00
jonpas	905586bddc	Make unused medical strings be used	2016-02-27 21:04:04 +01:00
Githawk	734c8b1962	Minor fix	2016-02-27 20:45:04 +01:00
Glowbal	428b828c27	Increase version 3.5.0	2016-02-27 20:44:38 +01:00
Githawk	8b87f1b43a	Custom width displayTextStructured ... Adding width as optional fourth parameter	2016-02-27 20:37:47 +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
Githawk	91c6341bc8	Implementation	2016-02-27 20:31:07 +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
GitHawk	279541676e	Expanded module and string table	2016-02-26 11:30:22 +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
Thomas Kooi	4ee338c57e	Merge pull request #3178 from acemod/scopes_hideNonAdjustments ... Scopes: Don't show adjustment or play click sound if the adjustment doesn't happen	2016-01-19 09:35:01 +01:00
Thomas Kooi	5c1f55a0f1	Merge pull request #3181 from acemod/leaveMyPlugsAlone ... Do not add or remove earplugs if gear should be preserved	2016-01-19 09:34:38 +01:00
Thomas Kooi	46f832379a	Merge pull request #3120 from acemod/explosives_actionmenu_cleanup ... Clean up explosive interaction menu	2016-01-19 09:32:26 +01:00
Thomas Kooi	f5d71ca03c	Merge pull request #3183 from acemod/codeCleanupGforces ... Code cleanup of Gforces module V2	2016-01-19 09:31:16 +01:00
Thomas Kooi	fbb358233b	Merge pull request #3172 from acemod/overpressureCleanup ... Overpressure cleanup and fix distance check	2016-01-19 09:30:43 +01:00
esteldunedain	f599542b8e	gforces cleanup. Close #2130	2016-01-19 00:18:01 -03:00
commy2	8731e8e338	Merge pull request #3133 from acemod/gottaCacheEmAll ... Use Function Caching in CBA	2016-01-18 20:27:39 +01:00
esteldunedain	0a91dfa7b2	Do not add or remove earplugs if gear should be preserved. Fix #3180.	2016-01-18 13:23:55 -03:00
VKing	2af3d9e769	Don't show adjustment or click sound if the adjustment doesn't happen	2016-01-18 16:16:53 +01:00
PabstMirror	67087d7c88	Capitalization	2016-01-18 00:27:19 -06:00
PabstMirror	a5c6c5579f	#3175 - Javelin - Fix zeus RC after switchCamera	2016-01-17 12:12:05 -06:00
Glowbal	86158ac45b	Stage improvements bandage effectiveness	2016-01-17 14:09:22 +01:00
Glowbal	7de1a7bc6c	add initial implementation of drowning and collision damage handling	2016-01-17 13:21:18 +01:00
Glowbal	209d10065b	Fix missing event log entries #3134	2016-01-17 12:28:37 +01:00
Glowbal	6e42a10d47	Add selectionDamage implementation	2016-01-17 12:28:08 +01:00
PabstMirror	48a1ddd401	#3166 - Fix Vehicle inventory is not locked	2016-01-16 21:58:59 -06:00
PabstMirror	35e6a181b5	opps	2016-01-16 17:48:58 -06:00
PabstMirror	893c6658a5	Fix debug msg order, re-add local check on eh	2016-01-16 17:29:57 -06:00
PabstMirror	a875d6a870	Overpressure cleanup and fix distance check	2016-01-16 15:53:28 -06:00
Glowbal	ee9a620a63	Merge branch '340handledamage' into medical-focus-feature	2016-01-16 22:03:28 +01:00
Thomas Kooi	c8c91d2af7	Merge pull request #3138 from acemod/increaseTrainingInLocations ... Medical Locations Boost Training	2016-01-16 21:59:45 +01:00
VKing	e3123b3f56	Local check before setPosition	2016-01-16 01:13:01 +01:00
SilentSpike	dbcf94153d	Merge pull request #3155 from acemod/spectatorFix ... Fix some spectator errors	2016-01-15 15:43:45 +00:00
VKing	17aaf477fe	Standardize displayName for the M26/Mk26/M152/whatever this is	2016-01-15 11:47:40 +01:00
VKing	cfea80bec8	Animate preplaced bottom attack SLAMs	2016-01-15 10:49:22 +01:00
VKing	248eb2143b	Fix inconsistent detonator pictures for some IEDs	2016-01-15 10:20:49 +01:00
VKing	0078ad862a	Remove redundant entries. ... Not removing them as it can be useful to have a reminder that those classes exist.	2016-01-15 09:33:01 +01:00
Thomas Kooi	e38a80a712	Merge pull request #3119 from acemod/explosives_detonateAll ... Add action to detonate all explosives on a detonator	2016-01-15 08:22:16 +01:00
VKing	4e8ea4f8e6	Fix detonate action pictures	2016-01-15 00:25:02 +01:00
PabstMirror	1affbd7d2f	Move littler syncedEH install to after settingInit	2016-01-14 17:06:46 -06:00
VKing	05c80c2368	Gah stop that you jerk!	2016-01-15 00:04:12 +01:00
VKing	ed8b437a8f	Prep function	2016-01-14 23:58:31 +01:00
VKing	32b33d7792	How the feck did this happen	2016-01-14 23:58:07 +01:00
VKing	8bdb2cb7f7	GVAR it.	2016-01-14 23:05:56 +01:00
VKing	575f37c8fd	Add fnc_connectExplosive to add editor explosives to unit triggers	2016-01-14 23:05:26 +01:00
VKing	195f0a6874	GVAR it	2016-01-14 20:07:53 +01:00
VKing	1da2b69de4	Make fuel bladders work	2016-01-14 20:07:32 +01:00
VKing	099648b6b6	Russian translation as suggested	2016-01-14 18:51:14 +01:00
VKing	7158a89de9	Start	2016-01-14 18:48:16 +01:00
VKing	74435ba777	Style guide formatting	2016-01-14 18:47:51 +01:00
VKing	73e093ec07	Make stringtable a little more translatable	2016-01-13 22:39:37 +01:00
VKing	2c26d3836b	Some fixes for the zeus modules	2016-01-13 22:39:14 +01:00
SilentSpike	49c814ccb3	Merge branch 'master' into spectatorUpdates	2016-01-13 19:19:00 +00:00
SilentSpike	d870a1f448	Fix nil spectator Draw3D event handler index ... Minor oversight introduced in pabst's fix for #2989, the icon handler is a mission event handler that isn't self terminating so the index needs to be preserved until after it is removed via `removeMissionEventHandler`. It is safe to let the `onUnload` event take care of that (and preferable so that icons disappear while temporarily closed).	2016-01-13 19:03:24 +00:00
SilentSpike	65e981373b	Store spectator display in a uiNamespace variable ... This allows me to explicitly close the right display and hopefully fix the interface staying open upon mission end. @Commy2's theory is that perhaps the main display `46` is killed upon mission end, meaning that `findDisplay` can't find the spectator display to close it because the game thinks it doesn't exist.	2016-01-13 18:38:51 +00:00
VKing	1ae21ad354	Change SLAM bottom attack ammo to be more bottom attacky	2016-01-13 15:41:20 +01:00
VKing	b87a6327ee	Fix Zeus modules not showing up	2016-01-13 15:40:39 +01:00
VKing	058ea4e8f4	Actual editor mines	2016-01-13 01:03:50 +01:00
VKing	f90dd9fed8	Allow SLAMs to use long range transmitter	2016-01-13 00:14:17 +01:00
VKing	46643d44d0	Add editor/zeus modules for different trigger options	2016-01-13 00:13:56 +01:00
VKing	a07d456476	Change small IEDs to use smaller pressure plates	2016-01-12 23:17:10 +01:00
VKing	61f288c9cc	Rename custom classes with ACE_ prefix	2016-01-12 23:16:49 +01:00
commy2	80ea079827	reset interaction menu time variables on save game load	2016-01-12 19:32:26 +01:00
esteldunedain	455c53a084	Nerf the amount of backblast received by the firer via reflection. Fix #2890.	2016-01-12 13:09:41 -03:00
PabstMirror	091c807708	Restart specatator display if player in unitList ... Possible fix for #2677	2016-01-12 00:30:03 -06:00
PabstMirror	8cbf31a375	Fix undefined variable error in FUNC(debug) ... possibly related to #2677 - threw error from switchToGroupSide	2016-01-11 23:37:44 -06:00
VKing	4fc7c3065e	Rename to fnc_scriptedExplosive	2016-01-11 23:41:33 +01:00
VKing	01dd663337	Add fnc_detonateExplosiveTrigger	2016-01-11 23:36:34 +01:00
bux	ec0ece059f	use Killed event, fix missing public setVar ... add more text, don't delete dead unit	2016-01-10 20:58:54 +01:00
bux	09e4a6a76e	cleanup SwitchUnits	2016-01-10 19:08:28 +01:00
PabstMirror	c2f780e95f	#1259 - Medical Locations Boost Training	2016-01-09 23:54:48 -06:00
PabstMirror	dd979676fd	Remove use of CAManBase for all mans ... End use of bandaid from #1294	2016-01-09 22:05:40 -06:00
PabstMirror	82179636f3	Cache hearing firedNear	2016-01-09 18:51:41 -06:00
PabstMirror	63a79b9920	Use Function Caching in CBA	2016-01-09 01:36:19 -06:00
PabstMirror	a161008eb7	Fix count/forEach	2016-01-09 01:15:09 -06:00
PabstMirror	ed4cc42897	Cleanup Interaction Menu	2016-01-08 23:29:32 -06:00
commy2	62f589ac84	remove deprecated functions	2016-01-08 15:56:32 +01:00
PabstMirror	54397abaa2	AB - Handle subsonic ammo when not defined ... Fix #3062 - Add basic AB configs for subsonic russian bullets. - When building ab ammo cache, if round is subsonic and does not have AB configured attempt to use the parent's config, scaled down to the subsonic's round speed.	2016-01-07 15:06:12 -06:00
PabstMirror	066976766f	Show beaufort dots on wind display -for color Blind ... Show dots on the wind display so color blind can still determine wind level Replace PR #1308	2016-01-07 10:34:31 -06:00
PabstMirror	9d14ff8b03	Merge branch 'master' into deterministicOverheatingX	2016-01-06 23:25:24 -06:00
commy2	de13518177	explode macro to params	2016-01-06 22:49:22 +01:00
commy2	e56e18bff3	Code cleanup 1.54	2016-01-06 22:42:02 +01:00
VKing	9985988987	Change ACE_Player to _unit	2016-01-06 18:05:06 +01:00
jokoho48	daf2fc2669	remove ccp issue in settings ... prevent setCaptive if unit is wake up	2016-01-06 18:01:24 +01:00
jokoho48	6d49bbda28	add delay to Unconsciousness Captivity(posible fix for #3121)	2016-01-06 17:46:59 +01:00
commy2	abf516aeb1	manual merge	2016-01-06 15:57:09 +01:00
PabstMirror	4c229c92f5	Add Stringtable Entry	2016-01-05 17:29:01 -06:00
PabstMirror	b6dce03c90	Fix Header	2016-01-05 17:16:47 -06:00
VKing	1706ca0adc	Move detonate actions from "Detonate" layer to "Explosives" layer. ... Remove inconsistent ">>" from explosive actions.	2016-01-06 00:06:06 +01:00
VKing	cc8ac69feb	Add function and action to detonate all explosives on a detonator	2016-01-05 23:47:01 +01:00
Glowbal	c042703786	Merge branch 'release'	2016-01-05 22:55:34 +01:00
Glowbal	509e142de8	bump version 3.4.2	2016-01-05 22:42:37 +01:00
PabstMirror	175624620c	Fix inverting wind direction each sync update ... Fix #1052 (and maybe #1708)	2016-01-05 15:29:52 -06:00
commy2	7eaa55f9df	Merge pull request #3022 from acemod/bodybagevent ... add event for placing units in body bags	2016-01-05 21:59:47 +01:00
commy2	74f78c2dd1	Merge pull request #3010 from acemod/cargoboxfilters ... Add more filters to ammo boxes	2016-01-05 21:55:24 +01:00
commy2	279b48f112	Merge pull request #3110 from acemod/gogglesfiredBIS ... fix usage of deprectated fired XEH, fix #3088	2016-01-05 21:52:53 +01:00
commy2	3854a5c989	Merge pull request #3109 from acemod/ThingX ... fix ThingX capitalization, fix #3076	2016-01-05 21:52:42 +01:00
PabstMirror	e2c08d2c26	Privates, Headers, Merge 4 PFEH into one	2016-01-05 01:39:29 -06:00
PabstMirror	46cb90254a	Add ACE_HashLocation to common	2016-01-04 21:48:26 -06:00
Luigi	7f9c766770	Fixed and added French Translation	2016-01-04 16:47:15 +01:00
Luigi	a079f213c0	Fix French translation ... Fix an error in a French translation	2016-01-04 16:19:23 +01:00
PabstMirror	a72e07fcaa	Goggles - change some events to be client only ... all these events have `if (_unit != ACE_player) exitWith {true};`	2016-01-03 11:01:14 -06:00
Alessandro Foresi	bafde22c71	Fix: Indentation	2016-01-03 16:47:41 +01:00
commy2	3974c255a0	fix usage of deprectated fired XEH, fix #3088	2016-01-03 15:27:16 +01:00
commy2	427628045c	fix ThingX capitalization, fix #3076	2016-01-03 15:21:38 +01:00
commy2	ecad63e34d	integrate filters pbo into inventory pbo	2016-01-03 14:47:37 +01:00
jonpas	b93183fef9	Shorten if check	2016-01-03 14:05:50 +01:00
Alessandro Foresi	2d152675fc	Add: IT small translations, DE removed duplicate	2016-01-03 13:02:01 +01:00
Alessandro Foresi	c16d97cad0	Merge branch 'master' into translation/15bn/alef	2016-01-03 12:23:27 +01:00
Braxton Williams	ce069c8f3c	Change Sandbag category	2016-01-02 18:25:48 -06:00
jonpas	6edd7ab093	Change ACE_HeadlessClientJoined event to be global and always triggered	2016-01-02 14:42:05 +01:00
jonpas	a1866a561b	Add Headless	2016-01-02 14:23:14 +01:00
bux	977bda83e5	add 2 new events, add unit to place event ... defuse and explodeOnDefuse	2016-01-01 21:47:39 +01:00
Braxton Williams	99e2ee6110	Add sandbag to editor	2016-01-01 13:09:11 -06:00
PabstMirror	76c9e1560d	Frag - only run addPfhRound on ammo that will frag ... If spall is not enabled (default) then calculate which ammo types will actually cause a frag event, cache and then only track those.	2016-01-01 02:33:08 -06:00
PabstMirror	79a7bb54aa	Kill Spectator PFEH when exiting spectator ... Should fix #2989 There is a race condition between these 4 PFEH and the "onUnload" event in handleInterface. If the PFEHs run first they will use nil variables and throw a script error. This sets them to nil immediately when exiting spectator	2016-01-01 00:14:48 -06:00
PabstMirror	5f74daec42	Fix dupe german stringtable entry	2015-12-31 22:28:35 -06:00
jonpas	33f91b2ee7	Remove duplicated line caused by merge	2016-01-01 03:52:37 +01:00
jonpas	ebf1321c0b	Merge branch 'release' into fixFuelHoseExceededAfterDisconnect	2016-01-01 03:51:44 +01:00
PabstMirror	fb0738bd30	Merge branch 'master' into release	2015-12-31 20:27:26 -06:00
PabstMirror	32b4416c29	Merge pull request #3064 from GitHawk/refuel ... Adaptation of fnc_makeJerryCan to new interact_menu	2015-12-31 20:12:43 -06:00
VKing	222b15634f	Increase prep time for guided projectiles	2015-12-31 22:26:04 +01:00
PabstMirror	586449eef9	Merge pull request #3084 from acemod/cbaZeusIntegration ... CBA zeus integration	2015-12-31 15:15:23 -06:00
PabstMirror	19f54071f1	Merge pull request #3052 from acemod/isPlayerRemoteZeus ... Add support for non local Zeus RC in common-isPlayer	2015-12-31 15:14:44 -06:00
PabstMirror	62a94759c4	Merge pull request #3092 from acemod/minorSittingCleanup ... Sitting Cleanup	2015-12-31 14:50:31 -06:00
PabstMirror	8bdd5d0597	Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge	2015-12-31 14:30:29 -06:00
licht-im-Norden87	2d64d54d98	Update German Stringtable ... Iam sure there was a translation some time ago. Someone must have deleted it. spelling mistake Update Stringtable 100% some of them already existed in german language Update stringtable.xml spelling mistake Update stringtable.xml Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it. Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig. Update stringtable.xml	2015-12-31 14:17:13 -06:00
PabstMirror	cf27571b5a	Merge pull request #3007 from dudakov/master ... Russian Translations - Update	2015-12-31 14:11:45 -06:00
PabstMirror	7b077c5f19	Merge pull request #3078 from acemod/fixGoggles3rd ... Fix Third Person Goggle Effect Not Displaying	2015-12-31 10:24:23 -06:00
Thomas Kooi	40afa45417	Merge pull request #3058 from freghar/isturnedout ... fix inverted isTurnedOut for map lighting	2015-12-31 13:03:42 +01:00
bux	23bec6d9a8	Merge master into branch	2015-12-31 10:20:47 +01:00
PabstMirror	2e211c5a04	Fix Medical Triagecard Macro ... Fix #3087	2015-12-31 01:46:24 -06:00
PabstMirror	f11c2af921	Update XEH_clientInit.sqf	2015-12-30 14:55:25 -06:00
PabstMirror	d372111d3f	Sitting Cleanup ... - Add modern privates - Don't add actions, canInteractWith, or EH if not enabled	2015-12-30 12:23:35 -06:00
bux	0e8eb5fac4	Remove obsolete hotkey entries	2015-12-30 11:23:52 +01:00
bux	d6c5643790	improve code style	2015-12-30 09:43:19 +01:00
bux	2a6042bf61	add interaction position and defuse object position ... and reduce interaction distance	2015-12-30 09:11:57 +01:00
PabstMirror	72fe95c797	Add "isNotInZeus" to canInteractWith ... Re-fix #1951 (CTRL+V from climb blocking paste in zeus)	2015-12-30 01:48:43 -06:00
PabstMirror	1e29c0286f	Remove Keybinds/Events for Zeus now handeld in CBA ... Close #2937	2015-12-30 01:07:55 -06:00
bux	112c002b0b	remove ace_offset entry ... Ported from AGM and simply renamed. It wasn't even used in AGM.	2015-12-29 20:57:55 +01:00
dixon13	356bd36728	Changed action name ... - Changed display name for extraction action on civilians to match the new action name 'Get Out'. - Changed class name for extracting civilians out of vehicles to match the action name	2015-12-29 09:27:43 -07:00
dixon13	f2b3275538	Changed action name ... Changed extraction action to 'Get Out' to match other civilian actions.	2015-12-29 09:25:33 -07:00
dixon13	d410fe42d9	Fixed misspell ... '_targe' is suppose to be '_target'	2015-12-28 22:00:08 -07:00
PabstMirror	462e37e6d1	Update Heating / Cooling physics numbers ... Attempting to update numbers based on real physics. Effects will increase heat generated per shot and decrease cooling - ~1.333x increased heating - ~1.45x less cooling	2015-12-28 21:01:56 -06:00
PabstMirror	415402b5ad	Cleanup and debug ... Fix missing weapon configs Fix Dispersion (Radians / Degrees) Fix comment	2015-12-28 16:08:32 -06:00
PabstMirror	42b350a40c	Cache Weapon Configs	2015-12-28 16:04:56 -06:00
PabstMirror	e587a6e6e3	Modernize code	2015-12-28 16:04:56 -06:00
PabstMirror	3020023f58	setVariablePublic - Use waitAndExecute	2015-12-28 16:04:55 -06:00
esteldunedain	c1e8b3dba9	Fix temperature bar color	2015-12-28 16:04:55 -06:00
esteldunedain	f132955d9f	Reenable refraction fx but make it optional for the moment.	2015-12-28 16:04:55 -06:00
esteldunedain	d001131314	Tweak and optimize the smoke effect to increase smoke and reduce performance impact	2015-12-28 16:04:54 -06:00
esteldunedain	3c74c4bada	Fix temperature indicator to max out red at half the bar	2015-12-28 16:04:54 -06:00
ulteq	4122d68684	Adjusted temperature display (red above 600°C)	2015-12-28 16:04:54 -06:00
ulteq	a1ee99cc8a	Remove debug code	2015-12-28 16:04:53 -06:00
ulteq	7858b65fde	Fixed misspelled function name	2015-12-28 16:04:53 -06:00
ulteq	0a27c309cb	Added missing variable definitions	2015-12-28 16:04:52 -06:00
commy2	f83206353d	jamming	2015-12-28 16:04:52 -06:00
Nicolás Badano	4264789631	Refactored code so the weapon temperature is correctly updated when checking it	2015-12-28 16:04:52 -06:00
Nicolás Badano	ac67e45098	overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion	2015-12-28 16:04:51 -06:00
Nicolás Badano	932e17cea4	fix	2015-12-28 16:04:51 -06:00
Nicolás Badano	fb56350217	small fixes	2015-12-28 16:04:51 -06:00
Nicolás Badano	de902ca4fd	Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again.	2015-12-28 16:04:50 -06:00
jonpas	c0aaf05eaf	Prevent interaction if unit(s) climbing the ladder, Disable tilting, Split adjust string into adjust and tilt	2015-12-27 19:28:29 +01:00
PabstMirror	dc60860421	Fix Third Person Goggle Effect Not Displaying ... #3074	2015-12-26 23:31:49 -06:00
dixon13	a4781a20d3	Authors	2015-12-23 19:27:55 -07:00
dixon13	2a98aa57ed	Delete fnc_canInteractWithCivilianVehicle.sqf ... No need to create another funciton	2015-12-23 11:54:41 -07:00
dixon13	d3a1110250	Removed a portion of the condition	2015-12-23 11:52:23 -07:00
dixon13	5f7e833d43	Removed "PREP(canInteractWithCivilianVehicle)" ... Function is being removed	2015-12-23 11:51:19 -07:00
dixon13	21daa331dc	Changes to ACE_Unload ... - added semi-colon - changed the condition - changed the statement	2015-12-23 11:49:17 -07:00
dixon13	1aa192f7e0	Extract civilans from vehicles, rmeoved actions from civilians in vehicles	2015-12-23 00:19:41 -07:00
Githawk	2432ac3319	Changed scope for carried objects	2015-12-22 17:54:16 +01:00
Githawk	d16417a00b	Changed scope on nozzle	2015-12-22 17:49:58 +01:00
Githawk	ebb28177b1	More fixes to make jerryCan work	2015-12-21 17:54:52 +01:00
Glowbal	c1fa81f28b	Fix tabs in sqf files	2015-12-21 17:05:48 +01:00
Githawk	d9e7a43bf7	Fixes error with new interact_menu	2015-12-21 16:53:25 +01:00
jokoho48	0addb592d3	remove Unused Varaible in AB ... fix private in AB	2015-12-21 02:29:10 +01:00
VKing	38fb97aeac	Fixed init problem; added mortar ammo boxes	2015-12-20 20:51:44 +01:00
VKing	73720f9313	Too hasty	2015-12-20 18:20:34 +01:00
VKing	b7bd468fdd	That ought to not have worked before	2015-12-20 18:18:33 +01:00
freghar	a383da5b2d	fix inverted isTurnedOut for map lighting ... According to the comment, the idea is to provide unobscured map when inside an enclosed vehicle (!isTurnedOut). Signed-off-by: freghar <freghcz@gmail.com>	2015-12-20 11:53:08 +01:00
PabstMirror	9b0641c06f	Add nil return for count	2015-12-19 21:17:36 -06:00
PabstMirror	74aec45921	Fix medical menu not closing on range, litter dir ... - Medical Menu didn't close when target moved out of range - Litter was always created in the same direction	2015-12-19 20:50:57 -06:00
VKing	450a18e13a	Forgot to disable in case the setting's set to "no" (but why would you ever want to	2015-12-19 21:29:37 +01:00
VKing	f75311917c	Upped mortar round mass	2015-12-19 20:49:09 +01:00
VKing	b4cb5c2ba7	Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init.	2015-12-19 19:54:45 +01:00
VKing	85270e4521	Fix init issue	2015-12-19 18:22:54 +01:00
VKing	a37d97103f	Erk	2015-12-19 16:37:30 +01:00
VKing	a336707623	Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars)	2015-12-19 16:30:01 +01:00
VKing	dfe7c07936	Fix fnc_mortarInit, fnc_loadMagazine, some other stuff	2015-12-19 12:10:12 +01:00
VKing	2c4a25a6c0	Mortar init functions	2015-12-19 02:18:35 +01:00
PabstMirror	4d041c3c94	Merge pull request #3049 from acemod/fixlaserdesignator ... Remove undefined laser selfdesignate macro	2015-12-18 12:09:04 -06:00
Jonathan Pereira	ad48f51ec7	Added PT-BR translations ... All remaining translations of gestures, hearing, interact_menu, interaction, nightvision, rearm, refuel, viewdistance were done!	2015-12-18 15:14:19 -02:00
PabstMirror	c53a0541a4	Add support for non local Zeus RC in common-isPlayer	2015-12-18 11:08:10 -06:00
Jonathan Pereira	db7074b6cf	Removed duplicated German entry	2015-12-18 14:45:20 -02:00
commy2	e3ecc64771	remove undefined macro	2015-12-18 13:53:25 +01:00
VKing	579f861b8f	Unload to player inventory	2015-12-17 19:25:22 +01:00
VKing	27890a8dab	First try at some module control	2015-12-17 11:00:46 +01:00
VKing	a0fdc58ed7	Remove unused variables, spaces	2015-12-17 09:13:23 +01:00
VKing	d8c8d02177	Port inventory picture and model	2015-12-17 00:21:54 +01:00
VKing	e0a21ce144	Completed code porting and interaction	2015-12-16 23:47:14 +01:00
VKing	3e6fc52733	First working iteration. ... Todo: Implement in module (Choose new or old/don't break old missions) Magazine UI+model Add preparing delay Fix function readmes Cleanup in functions? Credits MP Testing	2015-12-16 20:22:18 +01:00
PabstMirror	43a9865fa2	Use isNil for better future compatiblity	2015-12-16 12:10:53 -06:00
PabstMirror	360bdcb50e	Optics - Don't modify camera for ThreeDen Editor ... Fix broken ThreeDen Camera when returning to editor from preview. PIP will still work in preview. Will have to take a look at 1.56 RC to see if command exists and eventually cleanup.	2015-12-16 11:28:43 -06:00
PabstMirror	ff3ddbe287	Building Interact - Dummy object instead of hiding ... Fix #3038 InteractiMenu now checks `isObjectHidden`, So now use dummy object instead of hiding a real one	2015-12-15 12:04:03 -06:00
PabstMirror	7258a0084a	Merge pull request #2995 from acemod/repairThreshholdToolkit ... Fix PostRepairDamage and toolkit consumtion setting	2015-12-14 19:30:19 -06:00
PabstMirror	f2bcd66784	Toolkit also consumed on fullRepair	2015-12-14 19:28:31 -06:00
PabstMirror	886c13f6a9	Merge pull request #3013 from acemod/bloodyLitter ... Fix litter for adv - Add bloody p3d for Pack/qClot	2015-12-14 19:23:51 -06:00
PabstMirror	0b5b11c966	Merge pull request #3014 from acemod/fixNameSanatize ... Sanitize less/greater-than symbol to square	2015-12-14 19:23:07 -06:00
PabstMirror	e5abb59f1d	Merge pull request #3011 from acemod/rhsMergeERA ... RHS Compat - Combine all ERA Hitpoints	2015-12-14 19:22:51 -06:00
commy2	e6be1537cd	replace more private with private keyword in common	2015-12-14 13:17:48 +01:00
commy2	bfa29246be	replace private with private keyword in other half of common	2015-12-14 13:08:19 +01:00
PabstMirror	9064579a65	Send string to serverLog instead of strucText ... Fix `Performance warning: SimpleSerialization::Read 'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized by simple serialization, falling back to generic serialization, use generic type or ask for optimizations for these types`	2015-12-13 13:27:46 -06:00
VKing	170095ae35	Initial commit for mortar ammunition handling.	2015-12-13 18:27:13 +01:00
commy2	bd3c79f739	add function to retrieve the control of the stamina bar	2015-12-12 20:25:42 +01:00
commy2	7f63d51ccb	add event for placing units in body bags	2015-12-12 18:21:11 +01:00
commy2	2839cff753	common code fixes	2015-12-12 17:26:47 +01:00
commy2	3d5ea74c7e	replace private with private keyword in first half of common	2015-12-12 16:48:54 +01:00
jonpas	4c2d92d360	Negate fuel hose connected condition	2015-12-12 15:12:50 +01:00
PabstMirror	a501c7e1c3	Remove new models and just combine existing litter	2015-12-11 19:47:40 -06:00
jonpas	e5f64bcdc1	Fix refuel PFH not exiting on nozzle disconnect	2015-12-11 22:45:28 +01:00
PabstMirror	24d77d1b7c	Fix Typo	2015-12-11 12:17:05 -06:00
PabstMirror	db50b5313d	getName can return raw or sanatized html tags	2015-12-11 12:01:50 -06:00
commy2	ff95aab100	remove helmets from items filter	2015-12-11 15:05:43 +01:00
commy2	ee7f8f82f5	remove debug	2015-12-11 14:24:54 +01:00
commy2	5d9a057165	add more filters to ammo boxes	2015-12-11 14:18:11 +01:00
commy2	2b63b2efa8	add more filters to ammo boxes	2015-12-11 13:14:58 +01:00
PabstMirror	c7b6375092	Sanitize less/greater-than symbol to square ... Fix #2912 The raw `&lt;` showed up in nametags and anything besides strucText `[ / ]` is fairly close and will work in either text mode.	2015-12-10 23:29:05 -06:00
PabstMirror	e9be05209a	Fix litter for adv - Add bloody p3d for Pack/qClot ... Fix #2950 Get correct bloodLossOnSelection for both basic and advanced Adds bloody versions of packing bandage and quickClot	2015-12-10 22:58:44 -06:00
PabstMirror	ee0812ad15	RHS Compat - Combine all ERA Hitpoints ... Put all ERA hitpoints (up to 46 of them) onto a single point and put that point on the main interaction point	2015-12-10 20:57:23 -06:00
commy2	68388bc976	add more filters to ammo boxes	2015-12-11 01:02:15 +01:00
bux	8e6a057f52	fix common stringtable	2015-12-10 18:48:00 +01:00
kaban	fd06472f4d	Russian Translations - Update	2015-12-10 20:32:16 +03:00
[OMCB]kaban	aec2c3fef2	HotFix: removed duplicated key. ... Removed duplicated German key for STR_ACE_Common_DoNotForce. It caused Tabler.exe couldn't read stringtable files.	2015-12-10 18:24:28 +03:00
PabstMirror	f3b7b3b94f	Merge pull request #2994 from acemod/microDagrListBoxKeyblock ... MicroDagr - Prevent Home Key being blocked	2015-12-10 09:20:06 -06:00
PabstMirror	a71cce1981	Merge pull request #2987 from acemod/gesturesCleanup ... Setting For Gestures - Fix BI* gestures	2015-12-10 09:19:35 -06:00
commy2	077b9827e8	code cleanup fcs	2015-12-10 16:00:14 +01:00
commy2	7748131e73	code cleanup markers	2015-12-10 15:32:31 +01:00
commy2	a08cf69149	tweak size of laserpointer, fix #2975	2015-12-09 22:56:14 +01:00
havena	6f0568c370	fix Unexpected stringtable format ... Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>	2015-12-09 20:18:15 +01:00
PabstMirror	3ae7cd15bd	cleanup stringtable phrasing	2015-12-09 12:27:47 -06:00
PabstMirror	3d560108a3	Setting For Gestures - Fix BI* gestures	2015-12-08 23:08:09 -06:00
PabstMirror	0eed4799af	MicroDagr - Prevent Home Key being blocked ... Fix #2974	2015-12-08 21:31:03 -06:00
PabstMirror	e964b2c135	Fix PostRepairDamage and toolkit consumtion setting ... Fix #2982	2015-12-08 20:31:40 -06:00
PabstMirror	cae9f436f6	Merge branch 'release'	2015-12-08 15:14:33 -06:00
Glowbal	0599b35fc6	Bump version to 3.4.1	2015-12-08 14:47:48 +01:00
PabstMirror	38bf869f07	Also Fix Rearm	2015-12-07 14:07:03 -06:00
PabstMirror	cd68f9b320	Fix refuel unconc error - Man unloading for air	2015-12-07 13:54:41 -06:00
Thomas Kooi	05c56f73b5	Change disable NVG with sights by default ... As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.	2015-12-07 18:33:20 +01:00
PabstMirror	39edd205f0	Merge pull request #2942 from acemod/CzechTables ... Czech Translations - Update	2015-12-07 09:32:00 -06:00
bux578	fbde1dd794	Merge pull request #2941 from acemod/DieStringtables ... Update German Stringtables	2015-12-07 10:27:11 +01:00
bux578	821ccf5726	fix medical menu stringtable name	2015-12-07 10:21:48 +01:00
bux578	af31d43567	fix german typos	2015-12-07 10:20:35 +01:00
PabstMirror	358228f5bb	Cleanup De Stringtables	2015-12-06 15:03:15 -06:00
commy2	9fa62c6d2a	clean up vehicles config	2015-12-06 11:18:07 +01:00
gienkov	56e919dccc	nozzle additonal check condition	2015-12-06 06:47:19 +01:00
gienkov	1132efaf48	ceil number of wounds	2015-12-06 02:57:21 +01:00
gienkov	f6e7cad678	remove Original entries	2015-12-05 22:08:39 +01:00
PabstMirror	b13656e54b	addDamageToUnit - Disable debug / testing code	2015-12-05 12:19:34 -06:00
Thomas Kooi	761d6e28d8	Merge pull request #2939 from acemod/fixMicroDagrDefines ... MicroDagr - Add #undef to config for pboProject	2015-12-05 11:29:25 +01:00
Thomas Kooi	8e88740730	Merge pull request #2924 from acemod/woundReopeningArray ... Don't update openWounds if not bandaged	2015-12-05 11:28:56 +01:00
ProfessorCZ	cf41ac5fba	Czech Translations - Update	2015-12-04 22:28:10 -06:00
licht-im-Norden87	291f4df072	Update German Stringtables ... Update stringtable.xml Update stringtable.xml Update stringtable.xml kommas........................................................................................................................................................... Rallypoint Update stringtable.xml slideshow, not finished yet Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml What does Curator mean in this context? l. 294, l 302 cargo Update stringtable.xml Update stringtable.xml I left a few things out. I'd like if someone gives me advice Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma? Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört... Update stringtable.xml Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden. Update stringtable.xml Update stringtable.xml Update stringtable.xml Fix Mistakes from merge Fix Empty Entries Fix Mistake Fix	2015-12-04 22:06:44 -06:00
PabstMirror	f5aae81465	MicroDagr - Add #undef to config for pboProject ... #2936	2015-12-04 20:08:30 -06:00
PabstMirror	43a168f0b9	Flashbangs - Make event radius match effect radius	2015-12-04 15:16:17 -06:00
commy2	e418cfcf11	Merge pull request #2935 from acemod/fixbinoculars2 ... Fix binocular related bugs	2015-12-04 21:27:53 +01:00
commy2	5d43fa93c6	fix FUNC(binocularMagazine), fix #2916, fix #2917, fix #2918, fix #2922, fix #2928, fix #2933	2015-12-04 19:37:37 +01:00
PabstMirror	875b3980ac	Don't update openWounds if not bandaged ... Fix #2921	2015-12-03 15:23:38 -06:00
PabstMirror	91ace4fc9b	Fix whitelist string -> array error in checkPbo ... Fix #2913 Use splitString instead of call compile to convert string into an array	2015-12-02 23:58:41 -06:00
PabstMirror	c928a0d6cb	Remove Sleep/WaitUntil from checkPBO ... Fix #2910	2015-12-01 22:50:28 -06:00
PabstMirror	46c43b56db	Merge branch 'release'	2015-12-01 15:54:57 -06:00
PabstMirror	419af195e9	#2902 - Remove error and don't exit if veh has no hit points ... B_UAV_01_F has no hitpoints and would throw error Don't exit so "fullRepair" action still gets added	2015-12-01 13:43:27 -06:00
Glowbal	dacfe4d6cb	Bump version to 3.4.0	2015-12-01 17:05:08 +01:00
commy2	861262e41c	revert false captitalization change	2015-11-30 17:56:25 +01:00
commy2	411a8d58f3	fix more setVariable and getVariable capitalization	2015-11-30 17:53:57 +01:00
commy2	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	e422388484	fix waitUntil capitalization	2015-11-30 17:28:01 +01:00
commy2	a9ebcf8543	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
commy2	d037f00a92	fix forEachIndex capitalization	2015-11-30 17:25:16 +01:00
commy2	b3950bd7f0	fix forEach capitalization	2015-11-30 17:23:48 +01:00
commy2	a8228f60c2	fix configFile capitalization	2015-11-30 17:23:02 +01:00
commy2	2b05f6f451	fix isNil capitalization	2015-11-30 17:22:16 +01:00
commy2	5e41643cff	fix pushBack capitalization	2015-11-30 17:21:28 +01:00
commy2	d9b90258bc	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
commy2	0b84bb514b	fix Cfg capitalization	2015-11-30 17:09:26 +01:00
commy2	dcf0a68b80	Revert "fix Cfg capitalization" ... This reverts commit 43bda9c462.	2015-11-30 17:00:32 +01:00
commy2	43bda9c462	fix Cfg capitalization	2015-11-30 16:52:20 +01:00
commy2	ca9b909e75	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
commy2	ae1f35c042	remove superfluous private	2015-11-29 16:55:44 +01:00
commy2	caa5585044	simplify getRandomAnimation in sitting	2015-11-29 16:50:08 +01:00
commy2	ff4406e411	manual merge, more selectRandom command useage	2015-11-29 16:48:23 +01:00
commy2	e5c4d35969	1.55 use new selectRandom command	2015-11-29 16:33:25 +01:00
Thomas Kooi	02eee05cf4	Merge pull request #2884 from acemod/speedLimiterUGVFix ... fix that in UGV dont work speedLimiter	2015-11-29 12:41:13 +01:00
Thomas Kooi	081106d6a3	Merge pull request #2892 from acemod/TheHidden ... Remove nametags and actions on hidden units	2015-11-29 12:38:27 +01:00
bux578	35ecef454f	Merge pull request #2825 from gienkov/pl-translation ... pl translation	2015-11-29 07:35:04 +01:00
PabstMirror	8d2b612570	Remove nametags and actions on hidden units ... Fix #2596	2015-11-28 21:35:25 -06:00
SilentSpike	c426bfc9c1	Merge pull request #2888 from acemod/repairPositions ... Define custom repair points for a few vehicles	2015-11-28 20:09:37 +00:00
Thomas Kooi	5282e95668	Merge pull request #2876 from acemod/medicalTranslateHP ... Medical Fixes	2015-11-28 20:58:08 +01:00
Thomas Kooi	ced94d73a7	Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone ... [REMADE] RoadCone_F and its inhered RoadBarrier_F intractable	2015-11-28 20:51:39 +01:00
Thomas Kooi	d7a19cf0a6	Merge pull request #2882 from acemod/fixUGVNametag ... fix UGV Nametag issue	2015-11-28 20:50:23 +01:00
Thomas Kooi	7dd0af33b4	Merge pull request #2871 from acemod/cleanupLaserpointer ... cleanup laserpointer	2015-11-28 20:43:31 +01:00
Thomas Kooi	c132ef86cf	Merge pull request #2133 from jonpas/dynamicViewDistance ... Mk 1 eyeballs Integration	2015-11-28 20:40:29 +01:00
Thomas Kooi	e669f3e2cb	Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight ... Disable nvgs in sight	2015-11-28 20:37:30 +01:00
gienkov	f25a181d8e	fix my error	2015-11-28 20:37:29 +01:00
Thomas Kooi	cef01baf0b	Merge pull request #2856 from acemod/isEqualTypeRepalcement ... 1.54 - Replace typeName with isEqualType	2015-11-28 20:36:07 +01:00
Thomas Kooi	b807d1db48	Merge pull request #2886 from acemod/bandageReopen ... Add all wound types to bandage treatment configs	2015-11-28 20:32:13 +01:00
SilentSpike	a8cf9c6f48	Fix missing boolean inversion	2015-11-28 13:58:56 +00:00
gienkov	2c83fe4a11	refuel translation fixes	2015-11-28 13:45:59 +01:00
gienkov	a906c180ce	remove alpha entries	2015-11-28 13:34:54 +01:00
PabstMirror	a42c2153cc	Error handling for bad setting values array	2015-11-28 01:57:15 -06:00
PabstMirror	f676e6d9c9	Add some more typeNames replacements	2015-11-27 21:23:27 -06:00
PabstMirror	5850f78c1f	Merge branch 'master' into isEqualTypeRepalcement	2015-11-27 21:08:21 -06:00
gienkov	adae379445	fixes	2015-11-27 21:55:05 +01:00
gienkov	b091b73e24	fixes	2015-11-27 21:54:04 +01:00
gienkov	3250245587	3.4.0 translations and fixes	2015-11-27 21:50:57 +01:00
PabstMirror	6031eb8c6e	Add all wound types to bandage treatment configs ... Fix by adding all config entries; instead of trying to modify classname	2015-11-27 14:19:26 -06:00
gienkov	7eecff4296	Merge remote-tracking branch 'origin' into pl-translation ... Conflicts: addons/captives/stringtable.xml addons/map_gestures/stringtable.xml addons/zeus/stringtable.xml	2015-11-27 21:19:25 +01:00
SilentSpike	0ffb9ea5ad	Define custom repair points for a few vehicles ... Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.	2015-11-27 20:06:57 +00:00
ViperMaul	8d4364350c	Fix for "double semicolon detected" error	2015-11-27 10:43:30 -08:00
jokoho48	76435ec228	posible fix for overlapping Speedlimiters	2015-11-27 15:48:03 +01:00
PabstMirror	e51f658ce0	Try base wound class in bandage treatment configs ... Gets the correct wound for the bandage treatment config Used for selecting most effective bandage and reopening _className was something like "velocityWoundMedium" but configs only had base class "velocityWound"	2015-11-26 23:18:39 -06:00
jokoho48	f364c2a5c3	fix some stuff i mixed up	2015-11-26 23:44:42 +01:00
jokoho48	5f2840bf39	fix that in UGV dont work speedLimiter	2015-11-26 23:39:17 +01:00
jokoho48	5df7eba1eb	remove debug Code	2015-11-26 22:27:46 +01:00
jokoho48	59708ec2f7	fix UGV Nametag RPT Issue #2873	2015-11-26 22:24:06 +01:00
jokoho48	52a6eddb44	fix missing PBOPREFIX	2015-11-26 20:53:14 +01:00
PabstMirror	4aeeefdfe8	Fix UBC and increase Heli_04 Pod interaction distance	2015-11-26 11:47:25 -06:00
PabstMirror	a5c45c137f	Medical - addDamageToUnit Helper	2015-11-26 09:53:12 -06:00
Thomas Kooi	581f71f8a1	Merge pull request #2141 from GitHawk/refuel ... Adding vehicle refueling	2015-11-26 16:16:13 +01:00
Thomas Kooi	bba0e999ff	Merge pull request #2164 from GitHawk/rearm ... Adding vehicle rearming	2015-11-26 16:15:09 +01:00
Thomas Kooi	81ab280cb4	Merge pull request #2670 from acemod/simplifyFragConfig ... Simplify frag config	2015-11-26 16:13:21 +01:00
Thomas Kooi	15267c0433	Merge pull request #2219 from acemod/handSignals ... Hand signals enhancement	2015-11-26 16:04:41 +01:00
PabstMirror	ca0cfc9bbf	Merge pull request #2861 from acemod/repairRebass ... Repair Overhaul	2015-11-25 17:00:32 -06:00
PabstMirror	988a5c76bb	Medical - 1.54 Changes ... 1.54 Armor Translate selectiosn to hitpoints Calc newDamage using hitIndex (because sel is translated) Fix isFalling never being reset Cache hitpointIndex to reset damage Normalize Limb Armor to 1.54 Cleanup Cleanup	2015-11-25 11:49:20 -06:00
PabstMirror	0b9044e3c7	Merge pull request #2753 from acemod/showHudSetter ... Showhud setter	2015-11-25 11:16:21 -06:00
PabstMirror	ac6390c0b3	Add array info to header	2015-11-25 11:07:56 -06:00
PabstMirror	185cae2fe5	Remove Old Gestures from interaction	2015-11-25 11:00:45 -06:00
PabstMirror	095252ef76	Cleanup ... revert `format ["'%1'", QGVAR()];` as it crashes the game	2015-11-25 10:16:37 -06:00
SilentSpike	c731d83642	Merge pull request #2848 from acemod/fixForEachDeleteAt ... fix Issue with forEach Loops and deleteAt Index	2015-11-25 14:00:37 +00:00
Thomas Kooi	08c5374a99	Merge pull request #2390 from BaerMitUmlaut/pass-magazine ... Added interaction to quickly pass a magazine	2015-11-25 14:04:07 +01:00
PabstMirror	36bf2d9cb5	Merge pull request #2803 from BaerMitUmlaut/remove-team-synching ... Remove manual team synching	2015-11-24 21:37:50 -06:00
PabstMirror	20bf90f3e9	Medical - Fix Hitpoints Macro when building	2015-11-24 16:30:09 -06:00
PabstMirror	575fabb69d	#2872-Map time support for subclasses of ItemWatch	2015-11-24 16:17:06 -06:00
jokoho48	fd1c38c612	Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals	2015-11-24 22:44:32 +01:00
jokoho48	352db4cb66	remove some crap code ... replace some variables with macros	2015-11-24 22:43:42 +01:00
PabstMirror	cfefb1c40e	Cleanup spotting scope configs	2015-11-24 15:24:14 -06:00
PabstMirror	2c6cfcf294	Merge pull request #2832 from p1nga/Spotting-Scope-Update ... Updated spotting scope model.	2015-11-24 15:23:12 -06:00
PabstMirror	9ecffcd133	Merge pull request #2746 from acemod/fixFlashlightPrivates ... fix privates in Map module	2015-11-24 15:18:38 -06:00
IngoKauffmann	f9266764fb	Moved module to ACE_Logistics	2015-11-24 21:33:38 +01:00
IngoKauffmann	1a6730340c	Move module to ACE_Logistics category, removed single interact point	2015-11-24 21:30:08 +01:00
PabstMirror	2c76bc3b10	Merge pull request #2605 from TheNiner/master ... Fixed Laser Update Position Bug	2015-11-24 13:43:53 -06:00
BaerMitUmlaut	818466d296	Added ACE setting to hide interaction	2015-11-24 19:07:17 +01:00
PabstMirror	51a463de24	Fix tap shoulder msg display ... Missing efunc on displayTextStructured Calculate a shoulder side when using keybind	2015-11-24 11:25:56 -06:00
IngoKauffmann	8fc52a4dfb	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel	2015-11-24 17:57:21 +01:00
PabstMirror	86f7ee2ad2	Merge pull request #2834 from acemod/addEarPlugsLoudness ... Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues	2015-11-24 10:52:11 -06:00
IngoKauffmann	d4c708e731	Missing ;	2015-11-24 17:33:33 +01:00
PabstMirror	ddc8b16db2	Merge pull request #2857 from acemod/invResize154 ... Inventory Resize UI - changes for 154 GL-Mags	2015-11-24 10:24:06 -06:00
PabstMirror	4ae209ab44	Merge pull request #2865 from acemod/154UBC ... Fix UBC for 1.54	2015-11-24 10:23:48 -06:00
jokoho48	773b30df33	Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals	2015-11-24 15:14:30 +01:00
PabstMirror	7981faad64	private -> local	2015-11-23 17:47:58 -06:00
PabstMirror	0273dd1d4d	Merge branch 'master' into fixFlashlightPrivates	2015-11-23 17:45:41 -06:00
commy2	1d315bee6f	cleanup laserpointer	2015-11-23 20:52:04 +01:00
IngoKauffmann	fd2fd3241e	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm	2015-11-23 19:37:10 +01:00
IngoKauffmann	cbe8d98f86	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel	2015-11-23 19:29:05 +01:00
IngoKauffmann	931c6830fc	Added reset ... It's now possible to reset a fuel truck by console command: [fuel_truck] call ace_refuel_fnc_reset	2015-11-23 19:28:51 +01:00
IngoKauffmann	763df43fbc	Added possibility to disallow rearm ... > vehicle setVariable ["ace_rearm_disabled", true, true]; Also added ammo compatibility for RHS Mi24 with turret	2015-11-23 17:08:06 +01:00
commy2	3be60a2f6e	Merge pull request #2842 from acemod/fcsUpdateDisplay ... Update FCS display after distance adjust	2015-11-23 16:34:09 +01:00
SilentSpike	d2538c6ff2	Add spectator text chat ... Turns out custom radio channels are kind of a pain to work with. However this should work fine assuming the radioChannelAdd commands will work on client machines.	2015-11-22 20:03:10 +00:00
IngoKauffmann	113ac0f370	Minor improvements ... fnc_reset is still WIP	2015-11-21 23:24:24 +01:00
SilentSpike	f07f06c843	Merge pull request #2760 from acemod/spectatorUpdates ... Spectator updates	2015-11-21 15:00:44 +00:00
PabstMirror	c2564de5ef	Fix UBC for 1.54 ... Soldiers no longer inherit hitpoints from CaManBase Adds a macro to deal with them	2015-11-20 23:27:29 -06:00
PabstMirror	ab769757d9	Skip Depends Hitpoints - Use HitPoints selPos for wheels ... Stuff Normalize Depends - Skip Glass Repair Fix spawned wheel/track not having correct damage getHitpointString robustness, hatchback fuelHitpoint, fix count errors - Formatting local -> private Fix Stuff	2015-11-20 21:11:50 -06:00
SilentSpike	839c022b84	Fix broken repair point selection code ... Only valid hit selection + hit point combinations are usable for repair points: - Empty hit points mean there isn't enough information to display to the user - Empty hit selections mean that the hit point doesn't actually exist	2015-11-20 21:11:23 -06:00
PabstMirror	4e93b9c72d	2307 - Repair sub-turrets ... Privates Cleanup debug Add repair actions for sub turrets Cleanup Fix Header Error Handling Cleanup setHitpointDamage Fix common ACE_isEngineer to handle scalar or bool Claim and release repair objects (wheel/track) Repair sub-turrets	2015-11-20 21:11:05 -06:00
Glowbal	d0cb09196d	Merge branch 'master' of github.com:acemod/ACE3	2015-11-20 23:29:33 +01:00
Glowbal	67345b0178	Fix incorrect variable ... _items was the old variable name.	2015-11-20 23:28:52 +01:00
PabstMirror	979ff8b479	Local -> private	2015-11-20 16:13:20 -06:00
PabstMirror	0f62168250	Merge pull request #2840 from acemod/fixOverpressure ... Overpresure - Misc fixes	2015-11-20 15:38:24 -06:00
PabstMirror	08813c1b75	Convert local keywords to private	2015-11-20 15:36:37 -06:00
Thomas Kooi	801120fb39	Merge pull request #2841 from acemod/medicalAiBandage ... Move bandage log before basic exit	2015-11-20 22:28:55 +01:00
Thomas Kooi	4a19fcc5a5	Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation ... inWater -> isUnderwater	2015-11-20 22:28:43 +01:00
Thomas Kooi	a652be8248	Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound ... Cleanup ambient sounds module	2015-11-20 22:27:57 +01:00
PabstMirror	063042cb36	Merge pull request #2777 from acemod/interactionAnimationSetting ... Interaction Menu Animation Setting And PreExpand First Level	2015-11-20 14:56:37 -06:00
PabstMirror	7b526a99a3	Cleanup	2015-11-20 14:53:16 -06:00
PabstMirror	c4117e1283	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-20 14:37:23 -06:00
PabstMirror	69b53af1d3	1.54 - Replace typeName with isEqualType	2015-11-20 11:40:31 -06:00
PabstMirror	9a9029fa49	Merge pull request #2839 from acemod/abFixTwist ... AB - Fix ACE_twistDirection	2015-11-20 10:32:28 -06:00
PabstMirror	e81dd0729e	Inventory Resize UI - changes for 154 GL-Mags	2015-11-19 15:54:43 -06:00
SilentSpike	f8e293d04d	Localise spectator hotkeys in help window	2015-11-18 15:18:21 +00:00
SilentSpike	0567d1c2a1	Fix spectator unit list key press handling ... By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.	2015-11-18 15:02:17 +00:00
SilentSpike	0110ada1b5	Fix zeus waypoint formation actions	2015-11-18 14:54:17 +00:00
SilentSpike	d1dff4a24a	Merge branch 'master' into fixForEachDeleteAt ... # Conflicts: # addons/common/XEH_postInit.sqf	2015-11-18 13:27:04 +00:00
SilentSpike	49d4f233d9	Revert commit a718c82780	2015-11-18 13:19:12 +00:00
bux578	3b2b7fd78d	Merge pull request #2821 from dudakov/master ... Russian Translations - Update	2015-11-18 08:30:46 +01:00
PabstMirror	ebbf2b373a	goggles - prevent CBA PFEH warning ... fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING: Invalid or not existing PFH ID."	2015-11-17 23:44:50 -06:00
kaban	da16fc1038	\addons\captives\stringtable.xml - resolving conflicts.	2015-11-18 06:50:00 +03:00
kaban	f8481ae5f2	Merge branch 'master' of https://github.com/acemod/ACE3.git into develop ... Conflicts: addons/captives/stringtable.xml	2015-11-18 06:39:58 +03:00
PabstMirror	d6000ae985	local -> private	2015-11-17 14:33:17 -06:00
PabstMirror	3ec9fca73e	local -> private	2015-11-17 14:06:12 -06:00
PabstMirror	75d80be143	Merge branch 'master' into interactionAnimationSetting	2015-11-17 14:05:31 -06:00
PabstMirror	5cbfe4f2a5	local -> private	2015-11-17 14:02:20 -06:00
PabstMirror	896615beb1	Merge pull request #2826 from acemod/settingsParamsArray ... Read settings from paramsArray (params in description.ext)	2015-11-17 14:01:16 -06:00
PabstMirror	5823749f0c	Merge branch 'master' into settingsErrorChecking	2015-11-17 14:00:22 -06:00
PabstMirror	6d04156f69	local -> private	2015-11-17 13:56:55 -06:00
commy2	a57d1bca75	replace local keyword with private	2015-11-17 17:43:07 +01:00
SilentSpike	a718c82780	Implement nice index deletion iteration solution ... Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements. This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.	2015-11-17 16:02:56 +00:00
SilentSpike	23e110d7ce	Remove depreciated spectator hotkey	2015-11-17 15:26:34 +00:00
commy2	b6f9a2b776	Merge pull request #2703 from jonpas/removeAdjustedProneOptics ... Remove enable optics in adjusted prone stances	2015-11-17 16:24:27 +01:00
jokoho48	561f6126dc	fix missing bracket	2015-11-17 13:34:34 +01:00
jokoho48	f3c5c64390	fix Issue with forEach Loops and deleteAt Index	2015-11-17 04:31:17 +01:00
BaerMitUmlaut	e008f87fb8	Cleanup ambience sound module	2015-11-16 19:00:02 +01:00
Jonathan Pereira	6ebd76ff2f	Added PT-BR translations to Cargo	2015-11-14 12:24:01 -02:00
SilentSpike	cf368f240f	Remove ear ringing upon spectator entry ... Volume updating was disabled, however any existing ringing would persist. Setting the volume to 0 should make the hearing PFH stop playing sound.	2015-11-13 13:00:04 +00:00
PabstMirror	a621eaab24	#2750 - Update FCS display after distance adjust	2015-11-13 02:57:06 -06:00
PabstMirror	c3e6990d00	#2528 (6) - Move bandage log before basic exit ... In advanced medical without enableFor AI. Bandaging an AI would exit before adding log.	2015-11-12 01:06:29 -06:00
PabstMirror	9b2c79e7e1	getDistance - use lineIntersectsSurfaces	2015-11-11 14:12:42 -06:00
PabstMirror	391bfc160a	Overpresure - Misc fixes ... - Fix passing magazine/ammo to overpressure event - Use AGL for nearEntities - Fix getDistance returning nil	2015-11-11 13:24:27 -06:00
PabstMirror	9d2d5b9c7c	AdvanBalls - Fix ACE_twistDirection	2015-11-11 01:58:12 -06:00
PabstMirror	e72c1d874a	Merge branch 'master' into fixFlashlightPrivates ... Conflicts: addons/map/functions/fnc_determineMapLight.sqf	2015-11-10 21:21:06 -06:00
PabstMirror	99852f2071	Merge pull request #2718 from acemod/rangeCards-scriptError ... RangeCard / AB fixes	2015-11-10 21:02:16 -06:00
PabstMirror	4ff31771d3	DAGR - missing (	2015-11-10 20:51:00 -06:00
PabstMirror	87b9ff9785	Hearing - Reset earplugs on respawn, addItem setting ... Fix #2835 - readd item on respawn Fix #2837 - setVariable false on respawn	2015-11-10 20:44:55 -06:00
PabstMirror	e2e74e0f5d	DAGR - Fix degrees (° - seems to need UTF-8 BOM)	2015-11-10 16:17:22 -06:00
PabstMirror	830e7d9be4	Merge pull request #2278 from jokoho48/codeCleanUpDagr ... Code cleanup of Dagr module	2015-11-10 16:15:12 -06:00
Thomas Kooi	d91ae9082e	Merge pull request #2628 from acemod/cargoClassnames ... Add support for virtual cargo	2015-11-10 08:38:17 +01:00
Thomas Kooi	ec1187e79b	Merge pull request #2830 from acemod/mixedMedicalDisplay ... Display basicMed wounds for AI in mixed mode	2015-11-10 08:33:21 +01:00
PabstMirror	845909f8af	#2833 - Add earplugs based on loudness (+MGs) ... Use same loudness calc as firedNear (replacing old audibleFire) Give ear plugs to machine gunners (depends on magzine size)	2015-11-08 14:02:00 -06:00
PabstMirror	28738517e8	Merge pull request #2829 from acemod/FlashlightProxyModel ... Fix empty flashlightProxy model + Delete map glow lights from disconnecting players	2015-11-08 11:25:06 -06:00
PabstMirror	5b16638ae5	Always force param settings	2015-11-08 11:22:41 -06:00
P1NGA	6dd3aebe63	Authors....	2015-11-08 15:26:17 +11:00
P1NGA	5ffa646ded	updated spotting scope model and textures.	2015-11-08 15:18:31 +11:00
PabstMirror	dad1388eec	RealisticNames - add ka-60 v2 (black and white)	2015-11-07 18:34:46 -06:00
[OMCB]kaban	2dd90824aa	Map Gestures translations update	2015-11-08 02:52:16 +03:00
PabstMirror	01d679c5dc	#2810 - Delete map glow light from DC players	2015-11-07 14:33:41 -06:00
PabstMirror	ff60cdcfa3	#2828 - Fix empty flashlightProxy model	2015-11-07 11:44:31 -06:00
[OMCB]kaban	34163b5e56	Nametags translations are rolled back	2015-11-07 19:54:48 +03:00
Jonathan Pereira	7ec480c98e	Added ace_captives translation to PT-BR	2015-11-07 11:39:02 -02:00
Glowbal	caa36aa4f6	Merge pull request #2819 from acemod/medicalTranslateHitpoints ... Medical - Better handle odd selection/hitpoint names	2015-11-07 11:06:49 +01:00
PabstMirror	4a6730341a	Fix p3d paths	2015-11-07 00:16:08 -06:00
PabstMirror	826b4fd20b	Cleanup	2015-11-06 20:53:05 -06:00
PabstMirror	e0506f29bc	Read settings from paramsArray (params in description.ext) ... for now just limited to SCALAR/BOOL	2015-11-06 20:46:06 -06:00
PabstMirror	c91789f3c4	Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking	2015-11-06 20:30:12 -06:00
SilentSpike	6e30e9e0df	Fix overpressure priority evaluation ... The code was checking the wrong configs for priority because of some missing variables.	2015-11-06 19:02:54 +00:00
PabstMirror	9161f8e2fb	Merge pull request #2824 from acemod/acreIsSpeaking ... Nametags - Cleanup isSpeaking for ACRE	2015-11-06 09:58:16 -06:00
PabstMirror	c326bc2f87	#2772 - Display basicMed wounds for AI in mixed mode	2015-11-06 01:05:25 -06:00
gienkov	0b6fcacaf0	pl translation	2015-11-06 00:56:15 +01:00
ViperMaul	4b200d6909	bump to v3.3.3	2015-11-05 14:00:01 -08:00
PabstMirror	fabbf6d14d	Nametags - Cleanup isSpeaking for ACRE	2015-11-05 13:13:37 -06:00
[OMCB]kaban	59b9e9a7df	Missing periods added.	2015-11-05 03:45:34 +03:00
kaban	e2763dde27	Russian Translations - Update	2015-11-05 03:28:53 +03:00
PabstMirror	38105136fa	#2820 - Fix target event error	2015-11-04 17:43:51 -06:00
PabstMirror	1cebe613fa	Fix Capitialzation	2015-11-04 14:38:32 -06:00
PabstMirror	c5da32e470	Medical Handle Damage - check hitpoints if selection is weird	2015-11-04 14:36:26 -06:00
PabstMirror	39d4383a04	Merge pull request #2781 from acemod/updateWirecutters ... Wirecutters - Update Fence Configs, Use faster getModelInfo	2015-11-04 13:17:15 -06:00
PabstMirror	c88f77403b	Merge pull request #2805 from jonpas/cleanupMacros ... Cleanup Macro Definitions	2015-11-04 13:16:14 -06:00
PabstMirror	a3443cae43	Merge pull request #2780 from acemod/fixTimeInComments ... Changed ACE_time back to time in comments where appropriate	2015-11-04 13:04:05 -06:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
PabstMirror	50ab2aa904	MicroDagr - move drawEH array define to preInit ... Fix load order problems (init.sqf can be before postInit)	2015-11-02 15:21:34 -06:00
Glowbal	ac22ca3637	Merge pull request #2813 from acemod/medical-hitpoints-fix ... Add method to deal with new hitpoints	2015-11-02 20:20:23 +01:00
Joko	bd97c1ee96	fix Docu in waitUntilAndExecute	2015-11-02 12:05:43 +01:00
ColdEvul	03b82e5859	Adjusted interaction nod, changed carrying height for he barrier.	2015-11-01 22:38:55 +01:00
Broström.A | Evul	100c20fc83	Fixed missing strings ... XEH_ENABLED carryPosition carryDirection dragPosition dragDirection	2015-11-01 20:33:18 +01:00
Glowbal	8f6e9be636	Add method to deal with new hitpoints ... This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names. This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.	2015-11-01 16:35:25 +01:00
bux578	03d3d1c764	Merge pull request #2789 from ToasterBR/translation02 ... Remaining PT-BR translations	2015-10-31 06:14:37 +01:00
jonpas	998f3e996c	Cleanup macro definitions	2015-10-30 21:59:46 +01:00
BaerMitUmlaut	8f473b4a27	Removed all assignTeam occurrences	2015-10-30 16:50:13 +01:00
jonpas	94ce49fedc	Add selective UI	2015-10-28 23:23:02 +01:00
ColdEvul	b82350baa2	Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable. ... I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.	2015-10-28 21:33:00 +01:00
PabstMirror	10d17a8117	Merge pull request #2783 from acemod/captivesStuff ... Captives Fix duplicate animEH and add handcuffing module	2015-10-28 14:09:13 -05:00
commy2	7d69b7a3f4	fix merkava, patria tracer color	2015-10-28 19:48:49 +01:00
commy2	97999cde04	Merge pull request #2708 from acemod/amvGunSmoke ... - Fix gun smoke on AMV	2015-10-28 19:33:47 +01:00
commy2	d424eadd48	delete superfluous space ocd	2015-10-28 19:25:59 +01:00
commy2	09ba2c8216	Merge pull request #2793 from ColdEvul/CargoFixForTheAutonomus ... Fixed small UAV carrying allot of cargo.	2015-10-28 19:10:56 +01:00
commy2	049d40b96e	change description in function header	2015-10-28 19:02:54 +01:00
commy2	a0bfcdd04c	Revert "rename hasHatch to canTurnOut, change description in function header" ... This reverts commit 932f09ce60.	2015-10-28 19:01:47 +01:00
commy2	932f09ce60	rename hasHatch to canTurnOut, change description in function header	2015-10-28 18:57:47 +01:00
BaerMitUmlaut	7d7aa5b67f	!hasHatch condition part 2	2015-10-28 17:15:46 +01:00
BaerMitUmlaut	a1d72b81bf	Switch to unit namespace, added !hasHatch condition	2015-10-28 17:13:05 +01:00
jonpas	3f59b2fd4e	Merge branch 'master' into uiSettings	2015-10-28 16:18:30 +01:00
ColdEvul	6ac1d8361d	Fixed small UAV carrying allot of cargo.	2015-10-28 16:00:24 +01:00
commy2	643f4d36dc	add FUNC(hasHatch)	2015-10-28 08:01:25 +01:00
Jonathan Pereira	ce5364d7af	Added PT-BR translations ... Added all remaining translations, including dagr, dragging, map, map_gestures, medical, repair, tacticalladder and zeus.	2015-10-26 22:04:03 -02:00
PabstMirror	2c995f9c2c	Minor Cleanup	2015-10-26 10:49:39 -05:00
PabstMirror	fefe24b7eb	Disable debug in parachute	2015-10-24 19:07:23 -05:00
Glowbal	b5539db27f	Merge pull request #2767 from acemod/canTreatLocation ... Fix medical location check when set to disabled for PAK/Surgical	2015-10-24 00:55:51 +02:00
PabstMirror	1c26f6c9f5	Captives - Module to set handcuffing ... also add player check for GVAR(requireSurrender) in canApplyHandcuffes	2015-10-23 14:17:31 -05:00
PabstMirror	ef681e4332	Captives - Fix adding duplicate animEH	2015-10-23 13:11:11 -05:00
PabstMirror	e340f5164c	Wirecutters - Update Fence Configs, Use faster getModelInfo	2015-10-22 20:54:09 -05:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
VKing	a899c74133	ace_fcs_ace_time -> ace_fcs_time	2015-10-21 22:17:28 +02:00
VKing	0936238862	Fix lead calculation for vehicle FCS	2015-10-21 21:52:48 +02:00
PabstMirror	554c303be0	InteractionMenu - Auto Expand First Level	2015-10-20 13:31:09 -05:00
PabstMirror	7db5a34b24	Interaction Menu - Add setting for animation speed	2015-10-20 13:26:42 -05:00
jonpas	349447c5ea	Readd prone down optics removal	2015-10-20 19:37:49 +02:00
BaerMitUmlaut	c227f05f8a	Deprecated isWater	2015-10-19 23:28:50 +02:00
Glowbal	57abe3b885	Merge pull request #2743 from acemod/medicalStuff ... Medical Menu Fixes	2015-10-19 22:47:13 +02:00
PabstMirror	acc3504d7b	Merge branch 'master' into fixFlashlightPrivates ... Conflicts: addons/map/stringtable.xml	2015-10-19 13:59:15 -05:00
PabstMirror	cfde11d2fa	Fix medic treatment location check as well	2015-10-19 01:45:30 -05:00
PabstMirror	aad6cab896	#2765 - Fix location check when set to disabled	2015-10-19 01:20:11 -05:00
bux578	602832cc0c	adjust german translations	2015-10-19 07:29:02 +02:00
bux578	f7b717db64	Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11	2015-10-19 07:23:51 +02:00
PabstMirror	af80635a3f	ST Map Gesture Force Color Settings	2015-10-18 23:59:40 -05:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
PabstMirror	16180686d2	PV GVAR(settings) after modules, add error debug	2015-10-18 18:49:03 -05:00
PabstMirror	26c051d397	Sitting - Fix missing semicolon	2015-10-18 11:48:21 -05:00
IngoKauffmann	1804215dbb	Readded caliber for ACE_Hydra70_DAGR	2015-10-18 13:21:20 +02:00
IngoKauffmann	f02c57b599	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm ... Conflicts: addons/missileguidance/CfgAmmo.hpp	2015-10-18 13:19:27 +02:00
IngoKauffmann	5a453a7074	Fixed flying ... Moved attached ammo further away	2015-10-18 13:11:28 +02:00
IngoKauffmann	8a4b3a117a	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm	2015-10-18 12:49:36 +02:00
Glowbal	843eb16837	Merge pull request #2650 from acemod/setDefaultChannel ... Set Default Channel at mission start	2015-10-18 12:28:13 +02:00
Glowbal	f57eb08ce5	Merge pull request #2620 from jonpas/sittingFramework ... Sitting Framework	2015-10-18 12:26:53 +02:00
Glowbal	8e4bc264cc	Merge branch 'master' into map_gestures ... Conflicts: AUTHORS.txt	2015-10-18 12:20:54 +02:00
Glowbal	9a0aa2b14c	Merge pull request #2152 from jokoho48/codeCleanupKestrel4500 ... Code cleanup of Kestrel 4500 module	2015-10-18 12:16:44 +02:00
Glowbal	76efdbcc1c	Merge pull request #2257 from jonpas/parseList ... Parse List Common Function	2015-10-18 12:14:18 +02:00
Glowbal	ebe2bf96cd	Merge pull request #2277 from jokoho48/codeCleanUpConcertina_wire ... Code cleanup of Concertina_wire Module	2015-10-18 12:13:44 +02:00
Glowbal	3682a1710b	Merge pull request #2527 from alef/issues/titan_miss ... Fix: Titan hitting ground instead of vehicle	2015-10-18 12:11:09 +02:00
PabstMirror	da2d140a39	Cleanup unnecessary statement	2015-10-17 14:30:59 -05:00
jokoho48	bfcf057dab	extract Gestures to own Module and Port THS to ACE	2015-10-17 21:17:37 +02:00
SilentSpike	b6dd7b941f	Reduce overhead of spectator map icons ... Fixes #2514 by only rendering individual unit icons when zoomed in and only rendering the units currently within the screen bounds. Behaves as expected, but whether or not it has a significant performance increase under scaled up testing conditions remains to be seen.	2015-10-17 13:23:51 +01:00
PabstMirror	fa7299ba1b	Add array info to header	2015-10-16 08:28:54 -05:00
PabstMirror	94e3cd1f79	Replace old use of showHud	2015-10-15 22:45:35 -05:00
PabstMirror	bec884e581	showHud handler	2015-10-15 22:33:05 -05:00
SzwedzikPL	98f6bb3589	Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps ... Conflicts: addons/cargo/CfgVehicles.hpp addons/interaction/CfgVehicles.hpp addons/interaction/XEH_preInit.sqf addons/interaction/stringtable.xml	2015-10-15 11:49:08 +02:00
PabstMirror	6ffde8150f	Simplify Map Light Interactions	2015-10-14 14:36:40 -05:00
jokoho48	2dcdd224bd	fix privates in Map module	2015-10-14 19:56:54 +02:00
PabstMirror	f7fe0c08e0	#2391 - Use AGL for sitting setPos	2015-10-14 11:15:44 -05:00
PabstMirror	680f52cd27	Handle Distance when mounted	2015-10-13 13:40:16 -05:00
PabstMirror	8ffe1b4e01	#2528 (2) - Integrate Dragging	2015-10-13 02:20:19 -05:00
PabstMirror	ad1191cdd5	#2528 - Medical Menu Work ... (1) Verify target is valid and in reasonable range	2015-10-13 02:01:59 -05:00
PabstMirror	5d76395914	#2734 - Map effects / flashlights for TrippleHead	2015-10-12 11:27:38 -05:00
PabstMirror	7062f60f0a	Fix UBC from #2726	2015-10-12 01:07:20 -05:00
Glowbal	1e26fee3ba	Merge pull request #2683 from acemod/commonCleanupX ... Common cleanup x	2015-10-11 12:15:27 +02:00
Glowbal	8db8e87c53	Merge pull request #2560 from acemod/lockingMissles ... #2349 - Don't disable locking for base RocketPods	2015-10-11 12:06:11 +02:00
Glowbal	94ed78a173	Merge pull request #2578 from alganthe/strings_fix ... PAK and Surgical Kit strings normalized inside modules.	2015-10-11 12:05:11 +02:00
PabstMirror	4ba0d72bfd	#2580 (1) - Fix bandages always created at terrain level.	2015-10-10 23:09:52 -05:00
IngoKauffmann	b5568ca0db	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel ... Conflicts: optionals/compat_bwa3/config.cpp	2015-10-10 13:13:30 +02:00
PabstMirror	53f833b68c	#2702 - Cargo: Make "Supply Box" pallets heavy	2015-10-10 00:19:09 -05:00
PabstMirror	f2c66240ca	#2717 - Cleanup Coax Weapon Mempoints	2015-10-08 22:32:07 -05:00
PabstMirror	f8ca3693fd	#2709 - Fix AB handleFired _muzzleVelocityShift	2015-10-08 21:22:00 -05:00
PabstMirror	326d549510	#2696 - Rangecard check bounds before select	2015-10-08 20:32:14 -05:00
BaerMitUmlaut	2fe53431c7	Split event handlers	2015-10-08 19:29:30 +02:00
BaerMitUmlaut	e50a28874f	Fix for BI bug, FFV support	2015-10-08 11:31:29 +02:00
PabstMirror	f3c4ff66ca	#2701 - Fix gun smoke on AMV	2015-10-08 02:51:54 -05:00
jonpas	03f26fc12b	Merge branch 'master' into uiSettings ... Conflicts: addons/ui/README.md addons/ui/RscChat.hpp addons/ui/config.cpp	2015-10-08 00:06:41 +02:00
jonpas	e6a5d8c990	Remove enable optics in adjusted prone stances	2015-10-07 23:00:35 +02:00
BaerMitUmlaut	edb76ffae4	Initial commit	2015-10-07 20:11:07 +02:00
PabstMirror	39b838c7ab	Merge pull request #2681 from acemod/vehDetachLocalfix ... Attach getIn/Out run on local unit	2015-10-06 13:49:58 -05:00
commy2	9c22052871	Merge pull request #2685 from acemod/340removeactionsondead ... remove check ammo action on destroyed static weapons	2015-10-06 19:36:19 +02:00
BaerMitUmlaut	1effe61aa9	Removed parent condition	2015-10-06 19:09:51 +02:00
BaerMitUmlaut	090384c014	Fixed canPassMagazine header	2015-10-06 17:56:32 +02:00
BaerMitUmlaut	d6dcd4112e	Resolved merge conflicts	2015-10-06 17:50:55 +02:00
SilentSpike	e5b29727a5	Merge pull request #2617 from jonpas/zeusSpareparts ... Add Zeus Modules for Adding Spare Parts	2015-10-05 19:01:50 +01:00
SilentSpike	780e0aa270	Add vision mode support to spectator external cam ... Since external view is actually another camera, vision modes should also apply to it too.	2015-10-04 19:26:53 +01:00
SilentSpike	4079ca354e	Update spectator function headers	2015-10-04 18:30:07 +01:00
SilentSpike	c1dc8a6493	Fix spectator 3D icons not rendering ... Fixes #2676 as per voiperr's suggestion (working with camera can be really strange, I swear this worked before)	2015-10-04 18:17:07 +01:00
SilentSpike	52d703c2eb	Improve spectator seagull handling ... Previously they were only hidden, but this didn't account for the annoying audio they play so now they're entirely staged like a spectator unit would be.	2015-10-04 18:17:02 +01:00
SilentSpike	f0f822b4bc	Decrease default spectator camera speed	2015-10-04 18:17:01 +01:00
SilentSpike	b1dda86cb2	End spectator interface when the mission ends ... Fixes #2592 (in theory) by forcing spectator closed on mission end	2015-10-04 18:17:01 +01:00
PabstMirror	616bc9f8a0	local-private waitAndXX PFEH	2015-10-04 11:38:31 -05:00
PabstMirror	f3e61e2136	Merge branch 'master' into commonCleanupX	2015-10-04 11:31:05 -05:00
SilentSpike	0beaa40fbc	Add API parameter to allow for unforced spectator ... Adds an optional boolean paremeter to the setSpectator function for forcing the interface. It is forced by default, so if `false` is passed as the value the spectator will be able to close the interface with the escape button.	2015-10-04 13:52:54 +01:00
gienkov	b6d2cdee69	Merge remote-tracking branch 'origin/master' into pl-strings	2015-10-04 12:25:55 +02:00
commy2	d9595b6176	fix fnc_binocularMagazine on remote and dead units	2015-10-04 12:10:08 +02:00
commy2	92ed7eeac2	remove check ammo action on destroyed static weapons, fix #2671	2015-10-04 11:58:26 +02:00
commy2	42ce11cfee	Merge pull request #2679 from acemod/340missingmags ... fix missing magazines after certain scenarios	2015-10-04 11:46:36 +02:00
commy2	5ed290362d	Merge pull request #2663 from acemod/340rallypointminutes ... fix broken time format for rallypoints, fix #2662	2015-10-04 11:46:25 +02:00
commy2	040a63bd8f	Merge pull request #2254 from acemod/waitUntilAndExecute ... Add WaitUntilAndExecute Function	2015-10-04 11:45:54 +02:00
commy2	a2b6166aa0	optimization waitUntilAndExecute, add comments	2015-10-04 11:43:13 +02:00
Glowbal	f8cebd9403	Merge pull request #2007 from jokoho48/codeCleanupWeather ... Code cleanup Weather module	2015-10-04 09:36:32 +02:00
Glowbal	58ea8d5e2c	Merge pull request #2543 from alef/feature/death_short_diagnose ... Remove: pain diagnosis on dead patients	2015-10-04 09:34:10 +02:00
Glowbal	9ce4ce6cdd	Merge pull request #2582 from acemod/fixLitterFloating ... fix Littergeneric fly over ground	2015-10-04 09:32:03 +02:00
Glowbal	e36df978ec	Merge pull request #2646 from DerekSauer/FixArmaInjury ... Fix healHitPointAfterAdvBandage - Issue #2498.	2015-10-04 09:28:47 +02:00
Glowbal	2c292af77e	Merge pull request #2680 from acemod/cargoLockedVeh ... Disable loading into locked vehicles.	2015-10-04 09:26:53 +02:00
Glowbal	4445ecd7c4	Merge pull request #2581 from acemod/invisibleLadder ... Invisible Tactical Ladder	2015-10-04 09:26:34 +02:00
Glowbal	a823eff37f	Merge pull request #2674 from acemod/triageCardGameTime ... Use ACE_gameTime for triage card	2015-10-04 09:22:18 +02:00
PabstMirror	59da3e1c35	Optimize PFEH Funcs	2015-10-03 23:05:46 -05:00
PabstMirror	c75d219b65	Cleanup Undefined Functions	2015-10-03 21:34:46 -05:00
PabstMirror	7315dd650f	Merge branch 'master' into vehDetachLocalfix	2015-10-03 19:44:20 -05:00
PabstMirror	21f35dc7d0	#2664 - Disable loading into locked vehicles.	2015-10-03 19:42:40 -05:00
commy2	f0036fabbb	use BIS fnc for time format	2015-10-04 02:15:38 +02:00
commy2	38422e6586	fix missing magazines after certain scenarios	2015-10-04 01:26:38 +02:00
PabstMirror	10950d5fab	Merge pull request #2623 from acemod/interactMenuSet ... Interact menu settings after init	2015-10-03 12:49:04 -05:00
PabstMirror	12c663978a	Merge pull request #2649 from acemod/captiveEvents ... Global Event for "CaptiveStatusChange"	2015-10-03 12:47:58 -05:00
PabstMirror	b0b755720c	#2672 - Use ACE_gameTime for triage card	2015-10-03 12:28:54 -05:00
jokoho48	25166226a0	change by idea from @jonpas	2015-10-03 17:38:24 +02:00
jokoho48	1de012b7a7	simplify frag config(Macros FTW)	2015-10-03 12:34:04 +02:00
gienkov	3d4a37614c	Merge remote-tracking branch 'origin/master' into pl-strings	2015-10-03 12:19:48 +02:00
commy2	573279bd30	add selection, collision, fall and drowning damage events	2015-10-02 23:19:14 +02:00
commy2	94eaeb38cc	move variable out of params	2015-10-01 21:34:40 +02:00
commy2	7f1f56c121	fix broken time format for rallypoints, fix #2662	2015-10-01 21:28:00 +02:00
commy2	ea01db4030	Merge pull request #2648 from acemod/340goggles ... Code cleanup / refactoring Goggles	2015-10-01 16:54:57 +02:00
licht-im-Norden87	66e8914360	Update stringtable.xml	2015-10-01 04:38:21 +02:00
Derek Sauer	f9352de489	Clarified comment slightly.	2015-09-30 20:34:51 -04:00
Derek Sauer	0a788a282e	Improved efficiency of wound counting. ... Using a switch/case conditional since it offers early termination if a matching condition is found before all conditions are checked. It also unnecessary to use a conditional to confirm whether a limb is wounded or not. Number of Wounds multiplied by Blood loss will return zero for a fully bandaged body part, not incrementing the wound counter; or it will return some other number which will increment the wound counter.	2015-09-30 20:27:40 -04:00
licht-im-Norden87	88ee846d7d	Update Stringtable, german: "captives"	2015-10-01 01:36:27 +02:00
commy2	1fdedb5785	delay scroll wheel init	2015-09-30 19:29:17 +02:00
Derek Sauer	f69f4066e9	Fix capitalization on forEach and getVariable.	2015-09-30 06:17:54 -04:00
commy2	945ec7a388	more goggles code cleanup	2015-09-30 01:31:45 +02:00
commy2	dc882a3c66	more goggles code cleanup	2015-09-30 01:26:08 +02:00
commy2	c0105bf083	Merge branch 'master' of https://github.com/acemod/ACE3 into 340goggles	2015-09-30 00:28:26 +02:00
commy2	75d1ea7df3	Merge branch 'master' of https://github.com/acemod/ACE3	2015-09-30 00:14:41 +02:00
commy2	9f3615ea06	change function header of removeEventhandler and waitAndExecute to public: yes	2015-09-30 00:14:21 +02:00
commy2	8bbd6b69f0	change function header of removeEventhandler and waitAndExecute to public: yes	2015-09-30 00:12:35 +02:00
commy2	28e0e781f5	Merge pull request #2645 from acemod/340fixopticszeus ... fix zeus forced interface broken, fix #2642	2015-09-29 23:04:51 +02:00
Derek Sauer	2824009317	Incorrectly retrieving list of current wounds. ... Used the wrong method to retrieve the target's current wounds and was getting an empty array. This caused bandaging any wound even once to completely heal the target on the Arma side.	2015-09-29 17:00:49 -04:00
commy2	8d5ce1dbe2	more goggles code cleanup	2015-09-29 22:24:25 +02:00
Derek Sauer	8d05214eb0	Resolve merge conflict from upstream pull.	2015-09-29 16:24:17 -04:00
gienkov	ba42e3e295	pl string for dragging, tactical ladder	2015-09-29 22:12:11 +02:00
commy2	62349f685c	more goggles code cleanup	2015-09-29 22:01:40 +02:00
gienkov	d88d2fe578	Merge remote-tracking branch 'origin' into pl-strings	2015-09-29 21:56:29 +02:00
commy2	b7ce315240	more goggles code cleanup	2015-09-29 21:28:57 +02:00
gienkov	251437c415	pl translation	2015-09-29 20:37:30 +02:00
commy2	d1aacf3fef	more goggles code cleanup	2015-09-29 19:51:41 +02:00
commy2	53bfcdb61e	more goggles code cleanup	2015-09-29 18:51:24 +02:00
PabstMirror	d454271fb9	Give the event the D	2015-09-29 11:40:32 -05:00
PabstMirror	c0b78ecf3a	Set Default Channel at mission start	2015-09-29 11:36:30 -05:00
commy2	d051d4c208	more goggles code cleanup	2015-09-29 17:57:09 +02:00
PabstMirror	16b1244b0a	Global Event for "CaptiveStatusChange"	2015-09-29 10:17:17 -05:00
commy2	477e9f06b6	more goggles code cleanup	2015-09-29 17:09:23 +02:00
commy2	2731ac360a	more goggles code cleanup	2015-09-29 16:56:10 +02:00
commy2	d25d79c485	Goggles Code refactoring initial commit	2015-09-29 16:22:57 +02:00
Derek Sauer	954fad615a	Reformatted to follow ACE3 coding guidelines.	2015-09-29 06:36:36 -04:00
Derek Sauer	8619f02538	Take into account wounds that do no cause blood loss.	2015-09-29 06:19:49 -04:00
PabstMirror	6e24d2868c	Fix playerChanged event	2015-09-28 22:41:45 -05:00
Derek Sauer	a864a3411c	Clarified a comment.	2015-09-28 21:32:04 -04:00
commy2	1ec4556bb8	fix zeus forced interface broken, fix #2642	2015-09-29 02:48:22 +02:00
Derek Sauer	488541bba6	Fix for Arma wounds not being healed with healHitPointAfterAdvBandage.	2015-09-28 20:08:07 -04:00
commy2	19131f001d	fix error in handleplayerchanged for tacticl ladder	2015-09-28 21:16:13 +02:00
commy2	bc8cefa5e7	manual merge	2015-09-28 21:06:40 +02:00
commy2	34793ce044	Merge pull request #2635 from acemod/340interactcleanup ... Code Cleanup Interaction	2015-09-28 21:04:28 +02:00
commy2	6c968d8bc7	per frame handler for incremental door opening	2015-09-28 20:07:01 +02:00
commy2	443cbf8be3	fix compile error when trying to open a locked door by shortcut	2015-09-28 19:03:37 +02:00
commy2	6f64fcd0fb	search for door in geometry lod (lineintersectssurface)	2015-09-28 18:45:10 +02:00
commy2	6289a0cadb	Merge pull request #2626 from acemod/340weaponselectcleanup ... Code Cleanup WeaponSelect	2015-09-28 18:10:16 +02:00
commy2	5a3a32f236	more interaction cleanup	2015-09-28 18:06:25 +02:00
commy2	9bf7b68d76	fix errors on game start	2015-09-28 17:28:51 +02:00
commy2	5c5a65443b	more interaction cleanup	2015-09-28 17:20:56 +02:00
commy2	f48636e633	more interaction cleanup, remove dead code	2015-09-28 17:11:53 +02:00
Glowbal	e1bbc06ef8	Merge pull request #2613 from jonpas/improveSlideshowParams ... Improved Slideshow API	2015-09-28 16:38:00 +02:00
jonpas	4521df0a57	Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter	2015-09-28 16:17:12 +02:00
jonpas	db2572acfd	Merge branch 'master' into parseList ... Conflicts: addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf	2015-09-28 16:06:32 +02:00
jonpas	e4d8f13c89	Change may to must in slideshow error log	2015-09-28 16:02:18 +02:00
Glowbal	7215dd9082	Merge pull request #2368 from jonpas/removeVignetteAndCleanUI ... Removed Vignette and Cleaned up UI component	2015-09-28 15:56:34 +02:00
commy2	9189148b3f	more interaction cleanup	2015-09-28 15:37:18 +02:00
Glowbal	74805caa5d	Merge pull request #2565 from acemod/medVehAssignFix ... assign vehicle module fix for prefilled veh	2015-09-28 15:02:48 +02:00
commy2	4b536425b1	Code Cleanup Interaction	2015-09-28 14:36:51 +02:00
SilentSpike	f5e46bf089	Merge remote-tracking branch 'origin/master' into cargoClassnames	2015-09-27 17:41:38 +01:00
SilentSpike	f65f6e9b72	Add support for virtual cargo ... Allows cargo objects to be added via classname and reduces simulation/synchronization overhead. Objects become physical upon unloading and cannot be re-made virtual, only scripts can add such virtual objects. Also separates the player feedback from the loading/unloading code and adds a progress bar.	2015-09-27 17:34:37 +01:00
commy2	e9770fcb97	remove obsolete functions	2015-09-27 17:15:59 +02:00
commy2	1613ce3ff6	correct comment	2015-09-27 16:55:43 +02:00
commy2	b6532a05cc	new function to select a grenade	2015-09-27 16:47:02 +02:00
alganthe	38fe56472e	ace setting string added for ace_zeus_autoAddObjects	2015-09-27 15:35:32 +02:00
commy2	f8819d3ee4	WeaponSelect cleanup	2015-09-27 14:55:36 +02:00
commy2	e3b926296f	Merge branch 'master' of https://github.com/acemod/ACE3 into 340weaponselectcleanup	2015-09-27 13:53:00 +02:00
commy2	af24428363	Merge pull request #2607 from acemod/340cleanupBackpacks ... Code cleanup Backpacks	2015-09-27 13:50:20 +02:00
commy2	1a5f65ec5a	Merge pull request #2625 from acemod/340safetymodecleanup ... Code Cleanup SafetyMode, also fixes "cannot load sound .wss" RPT error	2015-09-27 13:50:11 +02:00
commy2	92ae1da660	Merge pull request #2622 from jonpas/aliveCommand ... Replaced isAlive function with alive command	2015-09-27 13:49:58 +02:00
commy2	5387700460	Merge pull request #2610 from acemod/340cleanupNoRadio ... Code Cleanup NoRadio	2015-09-27 13:49:08 +02:00
commy2	0500d4385d	Merge pull request #2611 from acemod/340cleanupHitReactions ... Code Cleanup HitReactions	2015-09-27 13:48:57 +02:00
commy2	fbe157614b	Merge pull request #2612 from acemod/340cleanupGrenades ... Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing	2015-09-27 13:48:46 +02:00
commy2	3211e6432e	Merge pull request #2614 from jonpas/loadCargoOptionalHint ... Optionalized Cargo Loaded Hint	2015-09-27 13:48:27 +02:00
commy2	a078d73230	Code Cleanup WeaponSelect	2015-09-27 08:51:42 +02:00
commy2	50046decf3	Code Cleanup SafetyMode	2015-09-27 08:28:55 +02:00
PabstMirror	4a935eb129	Remove debug	2015-09-26 22:02:44 -05:00
PabstMirror	174d8ac306	#2486 - Run color setup on settingsInit	2015-09-26 22:02:05 -05:00
jonpas	2ab58ab9ce	Replaced common,isAlive function with alive command	2015-09-27 02:23:56 +02:00
jonpas	f35b13bf29	Merge branch 'master' into sittingFramework	2015-09-27 02:16:51 +02:00
jonpas	ae07a71b0d	Minimized XEH to ThingX config level	2015-09-27 02:13:32 +02:00
jonpas	cd510c8ff7	Added carrying to chairs	2015-09-27 02:05:38 +02:00
jonpas	85cff04e0c	Stored scroll-wheel action ID into already existing player setVariable instead of having 2	2015-09-27 01:37:19 +02:00
jonpas	dbd0beb514	Stored a global variable in player setVariable	2015-09-27 01:31:23 +02:00
jonpas	a7a716ca8d	Better sitting framework in terms of interactions	2015-09-27 01:20:40 +02:00
jonpas	e3985dce3e	Cleanup sitRotation as it's no longer needed	2015-09-27 00:40:59 +02:00
jonpas	151903ace4	Expanded optional hint to addCargoItem and AddCargoByClass event	2015-09-27 00:31:23 +02:00
jonpas	b345db4ae9	Added Zeus modules for adding Spare Tracks and Wheels	2015-09-27 00:29:19 +02:00
jonpas	30544dc757	Make cargo loaded hint optional, disable it when not loading manually	2015-09-26 23:16:05 +02:00
jonpas	498dddcc26	Used isEqualTo	2015-09-26 23:06:35 +02:00
jonpas	b787286837	Fixed allowed data types	2015-09-26 23:02:18 +02:00
jonpas	4a5d6cade1	Bracket to Brace	2015-09-26 22:54:31 +02:00
jonpas	64d6a172c7	Improved public function parameter handling, Fixed issue with synchronized objects	2015-09-26 22:53:49 +02:00
commy2	cd839a0ddc	remove superfluous brackets	2015-09-26 22:42:47 +02:00
commy2	6cc920dc34	Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing	2015-09-26 22:39:12 +02:00
commy2	028aa404e9	change description in function header	2015-09-26 21:27:00 +02:00
commy2	c12584e15c	Code Cleanup HitReactions	2015-09-26 21:23:18 +02:00
commy2	0509e26690	Code Cleanup NoRadio	2015-09-26 20:45:19 +02:00
commy2	9ae215704c	Code cleanup Backpacks	2015-09-26 20:29:08 +02:00
commy2	f77242fce3	Merge pull request #2604 from acemod/340fixunconaftersettngsinit ... delay setUnconscious until the settings are inited	2015-09-26 19:54:09 +02:00
commy2	07774647e9	delay setUnconscious until the settings are inited, fix #148	2015-09-26 19:30:13 +02:00
Niner1309	1a43341506	Fixed Laser Update Position Bug	2015-09-26 19:15:09 +02:00
commy2	93114802d2	Merge pull request #2603 from acemod/340fixcargodestroyed ... dont access cargo of destroyed vehicles, fix #2523	2015-09-26 18:29:56 +02:00
commy2	8affae9f7a	dont access cargo of destroyed vehicles, fix #2523	2015-09-26 18:16:38 +02:00
commy2	777ac05d16	Merge pull request #2602 from acemod/340respawncleanup ... Code cleanup respawn module, close #2184	2015-09-26 17:58:17 +02:00
commy2	6d9943ff2e	fix wrong macro, missing ;	2015-09-26 16:45:39 +02:00
commy2	b1fb7befe8	remove wrong isServer check	2015-09-26 16:32:29 +02:00
commy2	5425836e47	cleanup respawn module, close #2184	2015-09-26 16:28:18 +02:00
commy2	f0584adeff	Merge pull request #2601 from acemod/340fixfixfloatingSelections ... fix fixFloating resetting reflector hitpoints, close #2279	2015-09-26 14:45:50 +02:00
commy2	dc7d24a3fd	fix fixFloating resetting reflector hitpoints, close #2279	2015-09-26 14:38:50 +02:00
PabstMirror	8bb5f71ba1	Macro for non spawned CBA Debug Logging	2015-09-25 22:30:57 -05:00
commy2	2fe142032e	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
SilentSpike	5f7c30dd7c	Merge pull request #2597 from Cuel/delay-spectator ... fix spectator view if called instantly	2015-09-25 13:34:37 +01:00
jokoho48	4ad16ed938	fix that waitUntilAndExecute have a return	2015-09-25 13:29:39 +02:00
jokoho48	998fbcc403	Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-25 13:19:19 +02:00
Cuel	dcbf977d6d	fix spectator view if called instantly ... If you call setSpectator directly from init.sqf you'll be put into some weird limbo mode with borders and spectator not working. This should fix it	2015-09-25 12:51:13 +02:00
commy2	43cdfaecc0	Merge branch 'master' of https://github.com/acemod/ACE3	2015-09-25 11:15:46 +02:00
commy2	412685e0ff	fix some code was commented out in loadPersonLocal and unloadPersonLocal	2015-09-25 11:15:25 +02:00
jokoho48	f7787730e1	fix Littergeneric fly over ground(add Landcontact Points)	2015-09-23 20:17:16 +02:00
jokoho48	d6203d0f2e	Posible Fix for Invisible Tactical Ladder V2	2015-09-23 19:54:12 +02:00
jokoho48	dce49721e4	Posible Fix for Invisible Tactical Ladder	2015-09-23 19:17:57 +02:00
KoffeinFlummi	3471ebef16	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
alganthe	10296d2883	PAK and Surgical Kit strings normalized inside modules. ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-23 15:50:50 +02:00
bux578	95ec25736e	Merge pull request #2563 from gienkov/missing-strings ... Missing english strings	2015-09-23 09:48:54 +02:00
PabstMirror	ebcc540943	Merge pull request #2572 from acemod/fixClickExplosivePlace ... Delay one frame when selecting explosives	2015-09-22 13:23:33 -05:00
PabstMirror	5add8d6789	#2537 - Delay one frame when selecting explosives	2015-09-22 11:31:58 -05:00
jonpas	a42685af2e	Removed copy/pasted maintainer intruder	2015-09-22 18:04:27 +02:00
Grzegorz	1848ea6325	fixez	2015-09-22 14:58:59 +02:00
[OMCB]kaban	49d1355ad8	Fix due to review	2015-09-22 11:52:06 +03:00
PabstMirror	cf8a7f742e	#2541 - Attach getIn/Out run on local unit	2015-09-21 22:50:48 -05:00
PabstMirror	f93538eb9a	#2423 - assign vehicle module fix for prefilled veh	2015-09-21 21:44:52 -05:00
PabstMirror	079d88ded7	Merge pull request #2509 from acemod/miscFixNilFunctions ... Fix some nil functions	2015-09-21 20:36:09 -05:00
PabstMirror	bf0cdbaf77	Merge pull request #2534 from acemod/unconcHandcuffs ... Take Unconscious captive	2015-09-21 20:35:02 -05:00
Grzegorz	55eae90484	tabz	2015-09-22 02:35:06 +02:00
gienkov	bbccfbaa35	pl medical string	2015-09-22 01:04:46 +02:00
commy2	24f0df55a2	Merge pull request #2559 from acemod/340disableuserinputcleanup ... Use CBA PFH in disableUserInput	2015-09-22 00:52:58 +02:00
commy2	617b1ec78d	Merge pull request #2556 from acemod/340deprecation ... add deprecated warnings	2015-09-22 00:52:43 +02:00
gienkov	229ba1f758	Merge remote-tracking branch 'upstream/master' into missing-strings	2015-09-22 00:36:32 +02:00
gienkov	b05f0c62ff	missing english respawn strings	2015-09-22 00:36:10 +02:00
PabstMirror	45e44251b6	Merge branch 'release' ... Conflicts: addons/repair/stringtable.xml	2015-09-21 17:14:53 -05:00
PabstMirror	6702a1faa4	Fix warnings for WeaponHolderSimulated	2015-09-21 16:34:02 -05:00
jonpas	2e3014daa3	Merge branch 'master' into parseList ... Conflicts: addons/common/functions/fnc_assignObjectsInList.sqf	2015-09-21 22:46:01 +02:00
commy2	23e3db9cc0	use CBA pfh in disableUserInput and fix key input weirdness	2015-09-21 22:42:31 +02:00
Glowbal	62ad9d4284	Version 3.3.2	2015-09-21 22:31:01 +02:00
Glowbal	42b2c18509	Merge pull request #2542 from acemod/FixSparePartsCargo ... Fix cargo setVariable on server with InitPost	2015-09-21 22:28:59 +02:00
Glowbal	6b93760f9b	Merge pull request #2557 from alganthe/torso_diag_fix ... Torso diag fix	2015-09-21 22:27:13 +02:00
Glowbal	bbed98fbef	Merge pull request #2394 from jonpas/cleanupRepairRelease ... Minor Repair Cleanup for release	2015-09-21 22:25:58 +02:00
commy2	f1abd4698f	remove superfluous ;	2015-09-21 22:12:17 +02:00
commy2	08a6da7ed5	Merge branch '340deprecation' of https://github.com/acemod/ACE3 into 340deprecation	2015-09-21 22:10:11 +02:00
commy2	f134a77e98	add and use deprecated macro	2015-09-21 22:09:54 +02:00
PabstMirror	d3c2420381	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_doAnimation.sqf	2015-09-21 15:08:43 -05:00
PabstMirror	9996aa22ab	Replace googles - isTurnedOut	2015-09-21 15:03:34 -05:00
commy2	a98e490f5c	Merge pull request #2512 from acemod/340fixaidisposable ... fix ai seemingly reloading disposable launcher at mission start, fix #2508	2015-09-21 22:00:55 +02:00
commy2	f8676afca4	use correct macro for rpt writing	2015-09-21 21:56:18 +02:00
commy2	020915a52a	Revert "fix broken log warning macro" ... This reverts commit b1f79f0383.	2015-09-21 21:51:05 +02:00
commy2	441efcd65f	change version number in deprecated log	2015-09-21 21:48:18 +02:00
commy2	b1f79f0383	fix broken log warning macro	2015-09-21 21:39:45 +02:00
commy2	af309b937b	add depracted warnings	2015-09-21 21:25:18 +02:00
commy2	a1b2d63417	Merge pull request #2551 from acemod/commoncleanup11 ... common code cleanup part 11	2015-09-21 21:12:42 +02:00
commy2	0070ba113c	Merge pull request #2546 from acemod/overheatJamFFV ... Allow fixing jam when in FFV slot	2015-09-21 19:51:14 +02:00
PabstMirror	1d5217d165	Medical - delayedUnconsicous fix waitAndExecute	2015-09-21 12:43:35 -05:00
commy2	5a5242f1c9	more common code cleanup	2015-09-21 19:19:49 +02:00
PabstMirror	4cc9b91d68	Merge pull request #2463 from acemod/cleanupNightvision ... Cleanup Nightvision	2015-09-21 12:06:15 -05:00
PabstMirror	5a67b00540	Merge pull request #2507 from acemod/pythonSearchNilFuncs ... Script to search for undefined functions	2015-09-21 12:05:27 -05:00
commy2	8503d15c9b	more common code cleanup	2015-09-21 18:37:19 +02:00
commy2	1a4ebdac51	more common code cleanup	2015-09-21 17:32:21 +02:00
commy2	13b487e13b	fix missing ;	2015-09-21 17:13:28 +02:00
commy2	b5b5c761c4	fix missing '' in info log macro	2015-09-21 17:09:10 +02:00
commy2	3037181fc2	more common code cleanup	2015-09-21 17:00:53 +02:00
commy2	df3211cc42	more common code cleanup	2015-09-21 14:20:53 +02:00
commy2	b0f9eab1f7	more common code cleanup	2015-09-21 13:53:12 +02:00
commy2	5adca6616d	Merge branch '323cleanuphitpoints' into commoncleanup10	2015-09-21 13:24:12 +02:00
commy2	9fa6eb0651	more common code cleanup	2015-09-21 13:08:10 +02:00
commy2	ef099861a3	Merge pull request #2545 from acemod/commoncleanup9 ... common code cleanup part 9	2015-09-21 09:24:41 +02:00
bux578	9be4072a10	Merge pull request #2547 from gienkov/patch-34 ... Add missing english string	2015-09-21 08:44:31 +02:00
bux578	549a3e0a2a	Merge pull request #2548 from gienkov/patch-35 ... Add missing english string	2015-09-21 08:44:16 +02:00
commy2	d802cdfb23	more common code cleanup	2015-09-21 01:41:17 +02:00
commy2	d449e4bd83	more common code cleanup	2015-09-21 01:07:49 +02:00
PabstMirror	5555eb195a	Also search for missing stringtable entries	2015-09-20 17:46:43 -05:00
Grzegorz	89a1495534	Add missing english string	2015-09-21 00:42:08 +02:00
Grzegorz	29db26eb58	Add missing english string	2015-09-21 00:40:14 +02:00
Grzegorz	fe75aa55cf	Add missing english string	2015-09-21 00:39:13 +02:00
commy2	5f7d8c0095	more common code cleanup	2015-09-21 00:34:04 +02:00
commy2	1679235b51	more common code cleanup	2015-09-21 00:28:25 +02:00
PabstMirror	345b1f0f98	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_execPersistentFnc.sqf addons/common/functions/fnc_execRemoteFnc.sqf	2015-09-20 17:02:49 -05:00
PabstMirror	79d4eb62be	Allow fixing jam when in FFV slot	2015-09-20 16:55:33 -05:00
commy2	1d4eb209a4	fix missing ; in dumpPerformanceCounters	2015-09-20 23:50:30 +02:00
commy2	ffc5a16384	more common code cleanup	2015-09-20 23:40:51 +02:00
commy2	a98a45e5d1	more common code cleanup	2015-09-20 23:18:51 +02:00
commy2	62ec00a251	more common code cleanup	2015-09-20 22:36:05 +02:00
commy2	5fd1938f25	more common code cleanup	2015-09-20 22:29:38 +02:00
commy2	493ce1b092	more common code cleanup	2015-09-20 22:16:51 +02:00
commy2	2348c25e1a	more common code cleanup	2015-09-20 20:25:25 +02:00
PabstMirror	86fae2c251	#2528 - addToLog date / missing string fullHeal	2015-09-20 13:19:51 -05:00
PabstMirror	0c8a694b96	Medical_menu settings under medical category	2015-09-20 12:07:44 -05:00
PabstMirror	610fb0bb2c	Fix Merge	2015-09-20 11:28:43 -05:00
PabstMirror	7687374fcf	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_resetAllDefaults.sqf	2015-09-20 11:25:33 -05:00
Alessandro Foresi	aabc437314	Remove: pain diagnosis on dead patients	2015-09-20 17:37:33 +02:00
PabstMirror	9c61f256bc	Rem debug	2015-09-20 10:06:24 -05:00
PabstMirror	789f3843d5	#2488 - Fix cargo setVariable on server with InitPost	2015-09-20 10:05:34 -05:00
commy2	0a01bbdc76	more common code cleanup	2015-09-20 16:56:35 +02:00
commy2	e62683a0c4	more common code cleanup	2015-09-20 16:40:49 +02:00
commy2	e8ebe87450	more common code cleanup	2015-09-20 15:52:40 +02:00
alganthe	4265b11d51	wrong target fixed ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-20 14:13:22 +02:00
Glowbal	461028b4e8	Merge pull request #2521 from acemod/fix-ctd-medical ... Fixed CTD on overpressure with advanced medical enabled	2015-09-20 12:44:58 +02:00
Glowbal	8279f60d09	Merge pull request #2529 from acemod/repairCanInteractCheck ... Add CanInteractWith checks for repair	2015-09-20 11:48:10 +02:00
Glowbal	409c2d5f78	Merge pull request #2505 from acemod/fixBFT ... Run BFT module on server	2015-09-20 11:46:03 +02:00
commy2	4c4785c140	Merge pull request #2535 from acemod/commoncleanup7 ... common code cleanup part 7	2015-09-20 11:06:38 +02:00
commy2	d33a98c612	set variable public didn't work / didn't work on server and headless client	2015-09-20 11:02:15 +02:00
commy2	8c8b23ec18	Merge pull request #2530 from acemod/commoncleanup6 ... common code cleanup part 6	2015-09-20 10:44:31 +02:00
PabstMirror	05f4dad764	maptools - Remove debug	2015-09-19 20:42:46 -05:00
commy2	dfa6d71a64	more common code cleanup	2015-09-20 00:55:58 +02:00
commy2	73a9c1b5f8	more common code cleanup	2015-09-19 23:18:07 +02:00
commy2	6b96c7fd7c	more common code cleanup	2015-09-19 22:27:23 +02:00
commy2	bfd5d13de8	more common code cleanup	2015-09-19 21:33:25 +02:00
bux578	450ee98004	Merge pull request #2515 from acemod/340fixinventoryeh ... fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513	2015-09-19 21:04:48 +02:00
PabstMirror	db41537f56	#2524 - Take Unconscious captive	2015-09-19 13:58:34 -05:00
commy2	09f133b7f8	more common code cleanup	2015-09-19 20:55:35 +02:00
SilentSpike	35d94e8d5c	Fix medical litter scopeCurator values ... Solves #2526 where medical litter would appear in zeus with no name.	2015-09-19 19:37:38 +01:00
commy2	3ddaa5ed4a	more common code cleanup	2015-09-19 20:34:07 +02:00
commy2	1636e3976d	more common code cleanup	2015-09-19 20:17:38 +02:00
commy2	cbc7f961b2	more common code cleanup	2015-09-19 19:40:56 +02:00
commy2	20a5c79431	more common code cleanup	2015-09-19 19:26:45 +02:00
commy2	6ee5c6d9f8	Merge pull request #2510 from acemod/commoncleanup5 ... common code cleanup part 5	2015-09-19 18:50:28 +02:00
commy2	fb71e0594e	lsd module, use global variable for color	2015-09-19 18:47:00 +02:00
PabstMirror	8573238cff	Merge branch 'release'	2015-09-19 11:21:33 -05:00
PabstMirror	3c93c2c95c	#2525 - Add CanInteractWith checks for repair	2015-09-19 11:07:03 -05:00
PabstMirror	79d985a648	Fix XEH Warning Debug ... Wait 5 to let supMon run first, and only show visual error if actually missing pbo.	2015-09-19 10:43:29 -05:00
PabstMirror	2e09a7aa4b	"cherrypick" PR #2496 (lockpick)	2015-09-19 10:02:37 -05:00
Alessandro Foresi	22ac16ead5	Changed: Seeker to aimPoint instead of ASL position	2015-09-19 16:22:36 +02:00
Glowbal	1d7cbf40ca	Fixed incorrect handleDamage call	2015-09-19 11:52:35 +02:00
commy2	e08c6c343e	fix LSD module, cutback on global variable usage	2015-09-19 09:24:28 +02:00
commy2	1357d72f16	fix broken LSD module	2015-09-19 02:44:02 +02:00
commy2	25d1e46422	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:50:37 +02:00
commy2	c7d636a533	more common code cleanup	2015-09-19 01:50:17 +02:00
jokoho48	e7ff41a03c	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:12:20 +02:00
jokoho48	f2070deee8	Change spawn while to CBA PFH	2015-09-19 01:12:03 +02:00
commy2	f8ecf1b8ab	fnc_debug was broken	2015-09-19 00:30:36 +02:00
commy2	30ba4f5586	this append should've been pushBack	2015-09-18 23:34:49 +02:00
commy2	56f4cbb39e	fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513	2015-09-18 23:03:35 +02:00
commy2	2e48a92eef	fix ai seemingly reloading disposable launcher at mission start, fix #2508	2015-09-18 22:25:09 +02:00
commy2	85fd9d9d75	more common code cleanup	2015-09-18 21:46:21 +02:00
PabstMirror	5f0d73bab6	Cleanup more stuff	2015-09-18 14:24:20 -05:00
commy2	f3a175e9d6	remove obsolete private	2015-09-18 21:15:06 +02:00
commy2	5d0a7ed062	more common code cleanup	2015-09-18 21:12:40 +02:00
PabstMirror	c62ea5e406	Fix some nil functions	2015-09-18 13:47:19 -05:00
commy2	a53d158a89	Merge pull request #2501 from acemod/commoncleanup4 ... common code cleanup part 4	2015-09-18 19:54:04 +02:00
PabstMirror	65b8585d60	Use _player instead of ACE_player	2015-09-18 12:48:59 -05:00
commy2	8704cd0321	fix additional bracket, formatting	2015-09-18 19:40:48 +02:00
PabstMirror	c21a5d6f08	Merge pull request #2496 from acemod/fixLockPick ... Fix for #2495	2015-09-18 12:28:51 -05:00
PabstMirror	97921aa665	#2503 - run BFT module on server	2015-09-18 12:18:43 -05:00
commy2	a18f63d861	more common code cleanup	2015-09-18 19:12:38 +02:00
commy2	2674310e65	remove another deprecated function	2015-09-18 18:45:41 +02:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
commy2	1fd2fcafb0	remove old, not working functions	2015-09-18 18:34:29 +02:00
commy2	1b96caedc0	more common code cleanup	2015-09-18 18:28:19 +02:00
esteldunedain	3422f5a7f1	Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation ... Conflicts: addons/medical/stringtable.xml addons/repair/stringtable.xml	2015-09-18 13:20:22 -03:00
commy2	a8ba96a01b	more common code cleanup	2015-09-18 16:41:00 +02:00
commy2	39786420fa	more common cleanup	2015-09-18 16:33:53 +02:00
commy2	c0fdd80ba4	formating	2015-09-18 16:00:58 +02:00
commy2	7efcfcc8a0	more common cleanup	2015-09-18 15:40:51 +02:00
commy2	f83dea6e01	formatting, remove an obsolete private	2015-09-18 14:32:58 +02:00
commy2	b0704e486f	more common cleanup	2015-09-18 13:09:40 +02:00
commy2	3a027ff26f	more common cleanup	2015-09-18 09:38:19 +02:00
commy2	e833c3fc42	more common cleanup	2015-09-18 08:47:14 +02:00
commy2	fc82018c49	more common cleanup	2015-09-18 08:23:18 +02:00
commy2	df2c7dce78	replace old pushback macro	2015-09-18 07:53:36 +02:00
commy2	475c193060	common code cleanup part 2	2015-09-18 07:42:10 +02:00
jokoho48	c5eb6e0070	posible fix for #2495	2015-09-18 04:12:18 +02:00
commy2	37c1dbd6f7	Merge pull request #2490 from acemod/commoncleanup ... cleanup common	2015-09-17 23:59:10 +02:00
PabstMirror	a9946e26a5	Merge pull request #2489 from acemod/fixSpareParts ... only run addSpareParts on server	2015-09-17 16:44:31 -05:00
PabstMirror	81f427ad82	Merge branch 'fixSpareParts' into release	2015-09-17 16:43:54 -05:00
commy2	27ca3dc7bd	Merge pull request #2471 from acemod/340noactionmenu ... optional pbo to hide select weapon actions	2015-09-17 22:47:35 +02:00
commy2	3927103a86	Merge pull request #2483 from acemod/340staticmgfcs ... add fcs to static machine guns	2015-09-17 22:47:23 +02:00
commy2	ca43520b7f	Merge pull request #2482 from acemod/340fixdaylaserlight ... fix daylasers being a virtual light source	2015-09-17 22:47:13 +02:00
commy2	cfc7102cb6	Merge pull request #2481 from acemod/340loadcargohint ... display text when loading / unloading cargo	2015-09-17 22:47:05 +02:00
commy2	7336e694c1	Merge pull request #2480 from acemod/340doanim2tweak ... tweak doAnimation switchMove to do no akward camera jumps whenever possible	2015-09-17 22:46:54 +02:00
PabstMirror	7faee2e6ff	Merge pull request #2492 from acemod/fixCPR ... Fix CPR params	2015-09-17 12:37:45 -05:00
PabstMirror	5fc127e94c	#2491 - fix params	2015-09-17 11:34:32 -05:00
commy2	36a279012c	cleanup common	2015-09-17 18:25:02 +02:00
PabstMirror	3b1a9ab415	#2488 - only run addSpareParts on server	2015-09-17 11:19:47 -05:00
commy2	a03bc44ba0	add fcs to static machine guns, close #1188	2015-09-17 14:40:58 +02:00
commy2	864c0b4baf	fix daylasers being a virtual light source, fix #2416	2015-09-17 14:17:48 +02:00
commy2	42a754a981	display text when loading / unloading cargo	2015-09-17 13:43:55 +02:00
KoffeinFlummi	067b08611e	Fix missing newlines	2015-09-17 12:54:26 +02:00
KoffeinFlummi	49cc207e6b	Merge remote-tracking branch 'origin/pr/2397' into polish-merge	2015-09-17 12:53:47 +02:00
commy2	a09ca8fb80	tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474	2015-09-17 12:23:56 +02:00
kaban	4d2707eae2	Russian Translations - Update	2015-09-17 12:21:21 +03:00
kaban	341e122e4c	Russian Translations - Update	2015-09-17 11:43:14 +03:00
commy2	014203413d	handle optional pbos in checkFiles	2015-09-17 02:13:21 +02:00
commy2	ca72770c48	add english translation to switch units module	2015-09-16 23:49:34 +02:00
commy2	6d80740a20	don't default to english on the switch units module description	2015-09-16 23:29:07 +02:00
PabstMirror	b8c687611e	Merge branch 'release'	2015-09-16 14:10:02 -05:00
ViperMaul	c748e56f4a	bump v3.3.1.2	2015-09-16 11:42:01 -07:00
commy2	b7715152e2	correct cargo capacities for quads, karts, boats and jets	2015-09-16 20:12:56 +02:00
alganthe	49e0befbaf	added diagnose to torso ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-16 19:44:44 +02:00
commy2	f383e8701d	increase trucks cargo space	2015-09-16 19:27:32 +02:00
PabstMirror	06a9f60281	Cleanup Nightvision	2015-09-16 10:55:23 -05:00
PabstMirror	539e158a97	Merge branch 'release'	2015-09-16 10:35:19 -05:00
ViperMaul	e78b59c28a	bump to 3.3.1.1	2015-09-16 05:09:48 -07:00
ViperMaul	f83a76b304	Merge pull request #2458 from acemod/FixAB ... Fix Advaced Basllistic Performance bug	2015-09-16 05:07:26 -07:00
jokoho48	c1baf4f8f7	tweak Vales for B_Truck_01_Base and B_Truck_01_box_F	2015-09-16 12:45:08 +02:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
jokoho48	a24e5b4665	fix Performance issue in AB	2015-09-16 11:54:49 +02:00
gienkov	e2f9b31fb2	small fix + repair translation	2015-09-16 11:53:05 +02:00
gienkov	a66f4d0e09	Merge remote-tracking branch 'origin/master' into pl-translation-8	2015-09-16 11:44:35 +02:00
gienkov	b94df35c08	Revert "fixed duplicate stringtable entries" ... This reverts commit ab02bed1c1.	2015-09-16 11:42:45 +02:00
alganthe	02faf0a104	fixed zeus addobjects ... The module part in CfgVehicles.hpp was missing. Signed-off-by: alganthe <alganthe@live.fr>	2015-09-16 06:20:05 +02:00
ViperMaul	8330aadb6f	bump version to 3.3.1	2015-09-15 17:56:57 -07:00
PabstMirror	2c2d79cfe0	Merge pull request #2439 from acemod/badXEHcheck ... Bad xeh check	2015-09-15 19:46:10 -05:00
PabstMirror	e254af9964	Fix missing )	2015-09-15 19:26:37 -05:00
PabstMirror	1ea1094a73	Merge branch 'release'	2015-09-15 16:16:10 -05:00
Glowbal	a124b05672	Revert "disable a10 tracers, commanche tracers only nvg"	2015-09-15 21:25:01 +02:00
Glowbal	c6c51af548	Updated build version	2015-09-15 21:13:36 +02:00
Glowbal	7e5ab07e32	Merge pull request #2387 from acemod/FixHCPPE ... Fix that PPEffects Throw a error on HC	2015-09-15 21:04:37 +02:00
Glowbal	b2b221db20	Merge pull request #2441 from SzwedzikPL/air_no_tracers ... disable a10 tracers, commanche tracers only nvg	2015-09-15 21:02:40 +02:00
PabstMirror	88f89b8d76	also check allDeadMen	2015-09-15 13:30:04 -05:00
PabstMirror	a8688609d7	Typo	2015-09-15 13:10:06 -05:00
Glowbal	3cc2ccf025	Merge pull request #2438 from acemod/wheelRepairSettingToolkit ... Add Setting for toolkit requirement for wheel repair	2015-09-15 20:04:38 +02:00
PabstMirror	0e32c28552	#2437 - Warn users when mods break XEH	2015-09-15 12:55:08 -05:00
PabstMirror	db37fa0e04	Update stringtable.xml	2015-09-15 11:45:02 -05:00
PabstMirror	c50c53e5bb	remove debug	2015-09-15 09:57:53 -05:00
PabstMirror	9cd470b849	Add Setting for toolkit requirement for wheel repair	2015-09-15 09:54:55 -05:00
commy2	2c7a2b4140	Merge pull request #2406 from acemod/captiveOnRespawn ... Reset captive status on respawn for reliability	2015-09-15 16:37:01 +02:00
gienkov	6588237e8c	stringtable DAGR	2015-09-15 15:05:30 +02:00
PabstMirror	17fdce7196	Cleanup preInit	2015-09-15 08:03:56 -05:00
Glowbal	478b618e4b	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros ... Feature/switch to log macros	2015-09-15 14:51:23 +02:00
PabstMirror	d6d64b58b0	Merge pull request #2430 from acemod/microDagr-customDrawEvents ... microDagr - Add ability to access draw event for minimap	2015-09-14 23:36:07 -05:00
PabstMirror	f419762653	Fix time of flight display	2015-09-14 23:33:32 -05:00
PabstMirror	db41512dc0	#2349 - Don't disable locking for base RocketPods	2015-09-14 22:11:12 -05:00
PabstMirror	61cbe543ee	Fix #2432 - Don't check for null attached when mounted	2015-09-14 18:06:46 -05:00
PabstMirror	e029e8318f	microDagr - Add ability to access draw event for minimap	2015-09-14 16:37:39 -05:00
Glowbal	16b7bb389c	Merge pull request #2428 from acemod/FixMainMenuInfo151 ... Fix main menu info151	2015-09-14 23:30:00 +02:00
Glowbal	d52cc917ea	Merge pull request #2419 from acemod/FixBBTexturePath2 ... Fix Bandage Texture Path and UV	2015-09-14 23:26:00 +02:00
Glowbal	4b6082d836	Merge pull request #2424 from acemod/medical-tweaks ... Medical tweaks	2015-09-14 23:20:50 +02:00
Glowbal	7b7ad6eea8	fixed tweak to basic bandage	2015-09-14 23:18:20 +02:00
PabstMirror	f7bd557a30	Fix some stringtable weirdness	2015-09-14 16:11:43 -05:00
Glowbal	10ac127159	Fixed incorrect new damage value in handleDamage advanced. ... The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.	2015-09-14 21:15:57 +02:00
Glowbal	33ac78dbac	Addresses the large amount of bandages required in basic medical ... This should restore the bandaging behavior back to how it is before the adjustments made to basic medical	2015-09-14 21:14:56 +02:00
Glowbal	8c60e76979	Tweaks made to improve determine if fatal algorithm	2015-09-14 21:13:58 +02:00
Glowbal	37639066c2	Include missing frame in the caching execution	2015-09-14 15:19:58 +02:00
Glowbal	6d4744b9ea	Increased duration of knock down for basic medical	2015-09-14 15:19:18 +02:00
Glowbal	032dd6c87c	Tweaked visual effects.	2015-09-14 15:18:56 +02:00
jokoho48	fb75f6ad9e	Fix Bandage Texture Path and UV	2015-09-13 18:57:07 +02:00
Alessandro Foresi	89eb98a248	Added: IT more translation, medic partial ... Fixed: dup entries (from gienkov)	2015-09-12 23:16:57 +02:00