8867 Commits

Author	SHA1	Message	Date
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
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
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
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
BaerMitUmlaut	bce92e8d42	Merge pull request #3567 from BaerMitUmlaut/microdagr-microoverhaul ... MicroDAGR Microoverhaul	2016-06-07 09:58:18 +02:00
commy2	f14a1b990b	simplify optics config	2016-06-07 07:38:01 +02:00
Nicolás Badano	527db2bd07	Merge pull request #3884 from acemod/fixShowWindInfoControlsText ... Fix wind info keybind string	2016-06-06 21:39:54 -03:00
jonpas	89db8bef5a	Fix wind info keybind string	2016-06-07 02:22:53 +02:00
jonpas	9287214781	Move Defuse action to main action	2016-06-07 00:51:06 +02:00
commy2	5135d3bedd	delete duplicate files	2016-06-07 00:36:41 +02:00
commy2	3ee10a8c2f	add gunner proxy to FIRE GEO LOD and add it to a component	2016-06-07 00:28:09 +02:00
commy2	f5a96ac2fc	add editor stuff for spotting scope	2016-06-07 00:17:04 +02:00
commy2	12ab4e9fa6	match controls at boarder	2016-06-06 23:33:00 +02:00
commy2	6a5c9cfca7	black periphery	2016-06-06 23:14:19 +02:00
commy2	36d0b78811	coeficient handling interface sizes was inverted	2016-06-06 21:36:29 +02:00
commy2	cd43c17f80	animate the scope	2016-06-06 19:22:24 +02:00
commy2	be260e896b	animated reticle for spotting scope	2016-06-06 17:22:17 +02:00
commy2	a61e4b3a4e	remove BI blood overlay	2016-06-06 14:14:45 +02:00
commy2	fe03272dc6	Merge pull request #3874 from acemod/cleanup_nightvision ... code cleanup fnc_blending	2016-06-06 12:23:42 +02:00
BaerMitUmlaut	27c347eec8	Only play fastroping sounds for player	2016-06-05 19:39:12 +02:00
jonpas	e779bc0cb2	Merge pull request #3877 from acemod/fixUIerror ... Fix selective UI in FFV slots	2016-06-05 14:04:49 +02:00
jonpas	021a123fc6	Fix selective UI in FFV slots, Properly fix config name check	2016-06-05 14:02:55 +02:00
Glowbal	2ad3f57414	Merge pull request #3872 from acemod/fixUIerror ... Fix selective UI script error when changing certain other settings	2016-06-05 13:44:22 +02:00
commy2	e776306295	Merge pull request #3876 from acemod/cleanupMovement ... Cleanup movement and improve debugging	2016-06-05 12:57:34 +02:00
jonpas	2cc1252f81	Remove unused CfgInventoryGlobalVariable in movement and improve debugging	2016-06-05 12:45:53 +02:00
commy2	0424f5db73	cleanup fnc_blending	2016-06-05 10:12:05 +02:00
commy2	8ed2dd11d2	Merge pull request #3871 from acemod/magRepackImprovements ... Add size parameter to displayTextPicture, Improve parameter checking …	2016-06-05 00:05:07 +02:00
commy2	a9a0cfc001	Merge pull request #3873 from voiperr/nvgthrowfix ... Fix NVG overbright when player throws grenades	2016-06-04 23:43:53 +02:00
voiper	354e84e058	Cleanup.	2016-06-04 12:26:38 -07:00
jonpas	b541b0b4f0	Fix selective UI script error when changing certain other settings	2016-06-04 21:20:10 +02:00
jonpas	3124270254	Quote the unquoted	2016-06-04 21:07:24 +02:00
voiper	a10b6ee8e2	Fix thrown blink.	2016-06-04 12:05:47 -07:00
jonpas	5a20f1286b	Change internal event framework names to contain prefix and be as short as possible	2016-06-04 21:05:26 +02:00
jonpas	8ff4a2ecaf	Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style)	2016-06-04 20:40:55 +02:00
jonpas	03a56b1f7d	Fix goKneeling changing animation inside vehicle (1.60)	2016-06-04 19:58:53 +02:00
SilentSpike	90ebf9638b	Update common event names to meet new standard	2016-06-04 11:12:56 +01:00
SilentSpike	1b6bbff139	Revert event names for synced events framework ... Keeping these names as short as possible for network traffic purposes.	2016-06-04 09:46:50 +01:00
Jonathan Pereira	b64b7e431e	Translated remaining strings	2016-06-03 23:11:40 -03:00
SilentSpike	9e4fd77745	Update common event names to meet new standard	2016-06-03 22:39:43 +01:00
SilentSpike	5b8fa4d4f1	Update common status effect framework ... Instead of changing the event names to match the new standards and also changing every single call to `FUNC(statusEffect_set)`/`FUNC(statusEffect_get)` I figured it made sense to only change the event names and the internal workings of `FUNC(statusEffect_sendEffects)` to automatically add the appropriate prefix.	2016-06-03 20:53:43 +01:00
SilentSpike	bd985d57ff	Run event renaming script for new additions	2016-06-03 20:53:43 +01:00
Glowbal	694503c01b	Fix medical events	2016-06-03 20:57:21 +02:00
Glowbal	fa2cf55156	Fix medical related events	2016-06-03 20:22:34 +02:00
PabstMirror	39456003ee	Merge branch 'cbaEventSystem' into removeLineDrawing	2016-06-03 12:55:37 -05:00
BaerMitUmlaut	11f1518220	Fix spottingscope interaction point, add to misc. box (#3862)	2016-06-03 10:21:47 -05:00
jonpas	f90b3b5c54	Merge pull request #3770 from tbeswick96/IRAttachLeftShoulder ... Moved IR Strobe to left shoulder when attached.	2016-06-03 16:33:57 +02:00
jonpas	46b12bd6c3	Merge pull request #3861 from acemod/unify-deployables ... Unify deployables	2016-06-03 16:32:52 +02:00
PabstMirror	77baeda976	Merge branch 'master' into huehuehue	2016-06-03 00:01:13 -05:00
PabstMirror	4915637601	Few more in common	2016-06-02 20:13:09 -05:00
PabstMirror	59ffff406e	Fix missing ;	2016-06-02 20:05:03 -05:00
PabstMirror	240cf4f0b5	Fix merge	2016-06-02 20:02:16 -05:00
PabstMirror	db78dd53a8	Cleanup Merge and remoteFnc events	2016-06-02 19:59:18 -05:00
PabstMirror	d7f9c52c2f	Merge branch 'master' into cbaEventSystem	2016-06-02 19:29:30 -05:00
PabstMirror	7970979a18	Fix removed var in Map Gestures	2016-06-02 15:04:03 -05:00
PabstMirror	73215b707d	Remove Line Drawing from MapTools ... And change map tools key to ALT from CTRL	2016-06-02 14:36:25 -05:00
jonpas	c110121b1a	Merge pull request #3811 from acemod/abolishExecRemoteFnc ... Replace execRemoteFnc with events	2016-06-02 17:08:01 +02:00
jonpas	b0352fdeb9	Merge branch 'master' into eol-lf	2016-06-02 17:02:09 +02:00
PabstMirror	b6aaba7f90	Integrate 1.60 marker shape color map interface (#3860) ... 1.60 adds ability to set color and marker type from the map interface Luckily they use the same values and indexes as ACE, This PR connects the two systems, Selecting a color from the 1.60 map display will set the color in the ace marker display and vice versa	2016-06-02 09:28:52 -05:00
PabstMirror	637b5e02e9	Update 3den attributes to use 1.60 scaling (#3857)	2016-06-02 09:26:57 -05:00
PabstMirror	675214cfb9	Allow drivers of vehicles to show microDagr (#3808)	2016-06-02 09:26:43 -05:00
PabstMirror	68d6c1969b	Cleanup transistion to CBA's waitAndExec (#3858)	2016-06-02 09:22:40 -05:00
jonpas	4c995d4c5c	Improve selective UI API (#3805) ... * Improve selective UI API, Disable ammo count when reload component is loaded, Fix stance UI * Upgrade Selective UI framework for controls that share IDCs for gunner and soldier * Separate more soldier and gunner settings sharing same IDCs, Remove vehicle gunner weapon which has no effect anymore * Separate more soldier and gunner IDC sharing elements, Fix typo, Fix API setting not being respected in case where selective type is not the same on load * Rework Selective UI using ACE_UI config, Cleanup, Add ACE_UI to FCS component to mark it (is already disabled due to other necessary settings for FCS to function) * Do location check in function, Rename condition to location, change to number * Use macros in ACE_UI location	2016-06-02 14:32:39 +02:00
jonpas	590d4fa70b	Merge branch 'master' into abolishExecRemoteFnc	2016-06-02 14:28:43 +02:00
Glowbal	603d07ddc2	Fix incorrect indentation ... Should be using 4 spaces instead of a tab. Quick, before flummi sees this.	2016-06-02 10:53:09 +02:00
Glowbal	2e54310ff4	Merge pull request #3844 from acemod/fixShowHud ... Fix showHud if set before display loaded	2016-06-02 10:39:46 +02:00
Glowbal	5c7148de1f	Merge pull request #3851 from acemod/huntIR-multipara-fix ... Fixed HuntIR deployment	2016-06-02 10:38:37 +02:00
BaerMitUmlaut	cc83bf64d6	Moved all deployables to equipment submenu	2016-06-02 10:35:33 +02:00
BaerMitUmlaut	9d4bd0f8dd	Added custom dogtag model and images	2016-06-02 00:59:15 +02:00
PabstMirror	b949440eb1	Goggles - Fix script error from CBA_fnc_waitAndExecute	2016-06-01 17:27:55 -05:00
jonpas	95573ee711	Stringtable URL (#3855) ... * Move url into stringtable to display it properly, Add some missing author and url entries * Fix main * Remove duplicate author	2016-06-01 23:45:51 +02:00
jonpas	ba27c8f914	Fix WEB_URL end of line error (#3854) ... * Fix WEB_URL end of line error * Change location of quote macro * Fix medical_menu VERSION_CONFIG error	2016-06-01 14:41:33 +02:00
commy2	9d61dd6159	Merge pull request #3850 from acemod/fixCfgPatchesAuthor ... Fix CfgPatches author/ is not a value	2016-06-01 14:24:17 +02:00
jonpas	1354826d56	Put semi-colon to the correct place	2016-06-01 14:11:32 +02:00
commy2	e6000807ee	Merge pull request #3849 from acemod/fix160ubc ... Fix 1.60 UBC (slingloads)	2016-06-01 13:57:07 +02:00
jonpas	1331265e65	Move url into a macro	2016-06-01 13:49:10 +02:00
jonpas	6730d016c2	Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility	2016-06-01 13:27:02 +02:00
BaerMitUmlaut	7a8506cefd	Update handleFired header comment	2016-05-31 23:12:57 +02:00
jonpas	26fbc36cab	Merge branch 'master' into cbaEventSystem	2016-05-31 22:36:08 +02:00
BaerMitUmlaut	f3fbb6cbdd	Fixed HuntIR deployment	2016-05-31 22:13:01 +02:00
jonpas	fa9384ffb4	Fix vanilla CCIP on A-10	2016-05-31 20:35:38 +02:00
Glowbal	d7b239f487	Merge pull request #3795 from acemod/deprecate-components ... Add Deprecate components support	2016-05-31 10:40:24 +02:00
PabstMirror	6905e6f97f	Fix showHud if set before display loaded	2016-05-31 01:53:28 -05:00
PabstMirror	598c3dc181	Fix 1.60 UBC (slingloads)	2016-05-30 17:11:06 -05:00
commy2	fd26e2e44e	Merge pull request #3516 from acemod/cbamissiontime ... replace timePFH with CBA_missionTime	2016-05-30 21:23:57 +02:00
commy2	7512c4e52e	manual merge	2016-05-30 21:14:34 +02:00
jonpas	7a307393a4	Merge branch 'master' into useQuotedPathMacros	2016-05-30 21:14:17 +02:00
commy2	e7fa02d0d9	Merge pull request #3812 from acemod/cbaDelayedExecFnc ... Use new CBA delayed execution functions and deprecate ACE functions	2016-05-30 21:02:29 +02:00
commy2	94b5cea3cf	Merge pull request #3814 from acemod/cbaBinocularMagazineFnc ... Use new binocular magazine CBA functions and deprecate ACE functions	2016-05-30 21:00:43 +02:00
commy2	272775445f	Merge pull request #3670 from acemod/useQuotedFuncMacros ... Use new quoted function macros	2016-05-30 21:00:23 +02:00
commy2	882aa26ab2	Merge pull request #3813 from acemod/cbaGetItemObjectConfig ... Use new CBA get config functions and deprecate ACE functions	2016-05-30 21:00:05 +02:00
PabstMirror	4df30327ac	Flashsuppressors - use next CBA's JM configs (#3709) ... #3700	2016-05-30 13:49:08 -05:00
jonpas	816da2aef1	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
PabstMirror	3163b53710	gforces - Fix missing ace_settings.hpp include (#3837)	2016-05-29 11:54:44 -05:00
bux578	b4cb49ffec	Merge pull request #3836 from acemod/fix_null_rallypoint ... fix rallypoint being objNull, when created via 'createvehicle'	2016-05-29 13:57:44 +02:00
commy2	bc6f756df4	fix rallypoint being objNull, when created via 'createvehicle'	2016-05-29 13:22:49 +02:00
commy2	1bd44e562a	replace a comma with semi colon	2016-05-29 11:44:00 +02:00
Grey-Soldierman	9f588d283c	Fixed indentation again	2016-05-27 19:10:44 +01:00
Grey-Soldierman	d92b5fb459	Fixed indentation	2016-05-27 19:08:34 +01:00
Grey-Soldierman	b0363d4ba9	Removed Valon from any vest configured for holsters	2016-05-27 18:52:30 +01:00
voiperr	52ea640c4b	ace_map: More realistic flashlight glow + minor fix (#3824) ... * -Converted flashlight glow object to chemlight type (emits light without sprite) -Fixed issue where glow object was being deleted without being first detached * Cleanup of temp classes. * Spaces before and after = * Moved effects into Effects.hpp.	2016-05-27 19:16:15 +02:00
jonpas	4f515ec4e1	QGVAR captives, interaction	2016-05-25 20:23:53 +02:00
jonpas	5d36f84eb1	qGVAR overheating and reloadlaunchers	2016-05-25 20:13:36 +02:00
gpgpgpgp	cfb3d7f0a9	add a line to support JSRS Eden (getting rid of JSRS explosion sound effect) ... JSRS Eden defines a SoundSetExplosion[] on ShellBase to define explosion sounds, which gives huntir unexpected exploding sound when used together. Adding SoundSetExplosion[] = {}; shall fix the problem.	2016-05-25 09:17:19 +08:00
PabstMirror	87ee34ba35	vehicleLock - Use QGVAR	2016-05-24 19:37:24 -05:00
PabstMirror	fef50ae48f	Fix duplicate event	2016-05-24 19:25:38 -05:00
jonpas	c4999c13e4	QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus	2016-05-25 02:19:50 +02:00
jonpas	7ede53bbdd	QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics	2016-05-25 02:09:11 +02:00
jonpas	b54d1985f1	QGVAR and fix gforces, goggles, grenades, hearing, interact_menu	2016-05-25 01:57:41 +02:00
jonpas	99675417c6	QGVAR and fix events in concertina_wire, disarming and explosives	2016-05-25 01:51:58 +02:00
jonpas	dd2e9140ae	Q(E)GVAR rangefinderData event	2016-05-25 01:44:56 +02:00
jonpas	da4c08fb6c	QGVAR all reload events	2016-05-24 20:51:10 +02:00
jonpas	30b15ee3d3	Fix quotes in cargo	2016-05-24 19:22:48 +02:00
jonpas	331c3c70cb	Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's	2016-05-24 18:58:27 +02:00
SilentSpike	207d6612da	Remove duplicate ACE_newEvents entries	2016-05-24 15:06:17 +01:00
SilentSpike	c4b75160a4	Run event renaming script	2016-05-24 14:13:11 +01:00
PabstMirror	ccbd52e811	Fix Can't toggle safemode in FFV seats #3819 ... Also block safemode when no weapon	2016-05-23 15:51:09 -05:00
PabstMirror	84eca899a9	Add event renaming system ... Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0	2016-05-23 14:03:55 +01:00
PabstMirror	86b9022322	Fix VehLock Macros	2016-05-22 23:13:15 -05:00
SilentSpike	108ff4f644	Replace ACE event system calls with CBA counterparts ... Regex used: \[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\) [$1,$3,$2] call CBA_fnc_targetEvent E?FUNC\((common,)?(server|global|local)Event\) CBA_fnc_$2Event E?FUNC\((common,)?(add|remove)EventHandler\) CBA_fnc_$2EventHandler	2016-05-22 16:47:39 +01:00
SilentSpike	f0b8da33c4	Deprecate ACE events framework ... CBA 2.4.0 entirely replaces the ACE events framework. Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.	2016-05-22 16:09:49 +01:00
jonpas	bd0e05d7d6	Use CBA config functions, return correct value	2016-05-22 16:18:24 +02:00
jonpas	38b48390b5	Call CBA binocular functions - leave as wrapper	2016-05-22 16:03:41 +02:00
jonpas	bbd96f9e71	Call CBA delayed execution functions, remove ACE's PFH for handling them	2016-05-22 16:01:12 +02:00
jonpas	4b121480bb	Use new binocular magazine CBA functions, deprecate ACE functions	2016-05-22 15:48:03 +02:00
jonpas	d35e89892c	Use new get item and object config CBA functions, deprecate ACE functions	2016-05-22 15:36:31 +02:00
jonpas	e7dbcd7b58	Replace delayed execution functions with new CBA counterparts	2016-05-22 15:29:01 +02:00
jonpas	472e4631d6	Deprecate delayed execution functions	2016-05-22 15:25:59 +02:00
jonpas	d902d1182a	Replace ace_common_fnc_execRemoteFunc with events	2016-05-21 23:55:48 +02:00
SilentSpike	a7c1d0e5bf	Remove erroneous tabs	2016-05-21 17:45:50 +01:00
SilentSpike	3e16142ff6	Merge branch 'master' into zeusModuleUiExample	2016-05-21 17:37:49 +01:00
SilentSpike	b3192adbb7	Add support for a zeus module position attribute ... Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present. Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group. I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708	2016-05-21 17:29:53 +01:00
commy2	c9ea5676ea	travis test	2016-05-21 13:29:42 +02:00
commy2	e40c814b04	Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX	2016-05-21 13:27:51 +02:00
commy2	d395fcd792	travis pls	2016-05-21 13:22:13 +02:00
commy2	aee4d23bdb	fullCrew new parameter to improve FUNC(getTurretX)	2016-05-21 13:07:17 +02:00
Glowbal	dd60ac8170	Remove isEnabled check in sitting ... IsEnabled check is not necessary here. It should not have been included, as it was a left over from testing for migrating sitting to ACEX.	2016-05-21 00:41:49 +02:00
PabstMirror	f69142dd45	Hearing - New XEH, Fix dead effects, Medical var (#3802) ... * Hearing - New XEH, Fix dead effects, Medical var * Use setHearingCapability * Cleanup dead player vol update * Don't change global hearing in medical * Fix exitWith	2016-05-20 11:23:14 -05:00
PabstMirror	d464a23d21	Use the lovely CBA_fnc_canUseWeapon function	2016-05-20 01:10:12 -05:00
PabstMirror	0d5385ffaf	Update FCS hud when manually setting range.	2016-05-19 21:50:51 -05:00
PabstMirror	508b71e7ba	Scopes - Allow Scope Adjust from FFV	2016-05-19 21:39:15 -05:00
SilentSpike	adaa10aea5	Adjust center of zeus AI task modules ... The tasks should center on the logic rather than the group leader. The search nearby module is also deleted after it's processed.	2016-05-19 22:32:05 +01:00
SilentSpike	3a1dba4486	Add zeus defend, patrol and search modules ... Using a shared `radius` attribute for all of these displays so a generalized method of initializing and retrieving the value associated that was implemented.	2016-05-19 01:24:08 +01:00
SilentSpike	e05f2ca637	Add search nearby building zeus module	2016-05-19 01:24:07 +01:00
SilentSpike	600b71817f	Update zeus module logic deletion behaviour ... The teleport players module is reusable, while the global AI skill and group side modules should be deleted appropriately once the display is closed.	2016-05-18 16:30:14 +01:00
SilentSpike	8a70cfbcd8	Clean new zeus module config and functions ... Adds function headers, stringtables and renames some display control classes.	2016-05-18 16:16:35 +01:00
commy2	25876d82ca	manual merge	2016-05-18 12:21:53 +02:00
commy2	230f0ab85e	manual merge	2016-05-18 12:20:33 +02:00
commy2	08bafd535f	deleted to much	2016-05-18 12:00:13 +02:00
commy2	655277cc17	remove previously deleted block	2016-05-18 11:58:42 +02:00
commy2	d93132dac8	more replacing	2016-05-18 11:57:40 +02:00
commy2	da70854568	manual merge	2016-05-18 11:48:27 +02:00
SilentSpike	81d854c56a	Add group side zeus module ... The module is placed on a unit in order to switch the side of that unit's group. A "simple" dialog is used to select the new side. The dialog code is a little ugly to say the least.	2016-05-17 23:44:17 +01:00
SilentSpike	4cbded1811	Fix zeus cargo display for empty vehicles ... The cargo wasn't displaying for empty vehicles because they use a different display.	2016-05-17 23:44:16 +01:00
ir0n1e	4a7f5529f6	added gunbag to ACE_Box_Misc	2016-05-17 12:56:48 +02:00
ir0n1e	3e9cf73b0d	added readme	2016-05-17 12:24:18 +02:00
ir0n1e	1302ccb3fe	clean up	2016-05-17 12:19:17 +02:00
ir0n1e	7ef02400dc	adapted to #3378 and added support for UGL	2016-05-17 12:14:57 +02:00
ir0n1e	c89163316c	fixed idention tabs are 4 spaces now	2016-05-17 11:21:48 +02:00
ir0n1e	6d988524d3	Merge branch 'master' of https://github.com/acemod/ACE3 into gunbag	2016-05-17 11:03:57 +02:00
ir0n1e	1a14634b41	dissolved some edges	2016-05-17 10:57:24 +02:00
SilentSpike	d90d5a7ac1	Rewrite global AI skill zeus module ... Remove the use of ace settings and makes the module more zeus specific. It might be worth adding a similar module or mission settings to ace_ai for mission editing.	2016-05-16 15:16:53 +01:00
commy2	473149b8ca	revert changes from other PR to make it compatible	2016-05-16 15:22:37 +02:00
commy2	cac7b9c0c3	optional param to skip deprecated warning	2016-05-16 15:15:51 +02:00
Glowbal	32055401d3	Add backwards compatability for InventoryChanged ... The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.	2016-05-16 00:09:53 +02:00
SilentSpike	5b460205a9	Add teleport player zeus module	2016-05-15 21:02:40 +01:00
Glowbal	487400b142	Add different warning messages based on current version of component	2016-05-15 20:13:10 +02:00
Glowbal	7a7e930024	Add deprecate sitting component	2016-05-15 19:38:37 +02:00
Glowbal	3d74c25c97	Add deprecate component solution	2016-05-15 19:38:24 +02:00
SilentSpike	4d028be876	Cleanup zeus display modules ... Replaces display size and position defines with macros for readability and compactness. Changes naming convention of functions and displays to distinguish categories and make more readable. Converts the global set skill module to use display events rather than waiting in a loop for the module to be set and confirmed.	2016-05-15 18:08:54 +01:00
SilentSpike	77de1ec6eb	Update vanilla zeus functions ... Merges the changes introduced by arma updates to vanilla functions with our overwrites. I also reverted some of the command capitalization since it makes the process of going through differences quicker in future.	2016-05-15 12:48:32 +01:00
Glowbal	da3f6113d6	Merge branch 'master' into add-mine-detector	2016-05-15 00:20:46 +02:00
commy2	07caf1b0bd	fix for null player	2016-05-14 20:33:33 +02:00
PabstMirror	7628f9a4ab	Fix nils in array	2016-05-14 13:08:58 -05:00
commy2	e4c86a8af5	don't do 'playerInventoryChanged' just because ammo decreased after firing	2016-05-14 19:50:08 +02:00
commy2	cc9e128e74	Merge pull request #3792 from acemod/useGetUnitLoadout ... use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it	2016-05-14 13:04:35 +02:00
commy2	c5275813a4	use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it	2016-05-14 10:49:09 +02:00
Glowbal	04b61ff32e	Fix missing semicolon	2016-05-14 10:37:29 +02:00
Glowbal	180a0f9d84	Merge pull request #3462 from acemod/medicalLoops ... Cleanup medical PFHs	2016-05-14 09:39:14 +02:00
Glowbal	36e48554c2	Merge pull request #3787 from acemod/motorcycleInteraction ... Add interaction support to Motorcycle class	2016-05-14 09:33:41 +02:00
Glowbal	4e109ae93b	Merge pull request #3781 from acemod/specTree ... Fix spectator unit tree refreshing	2016-05-14 09:26:42 +02:00
Glowbal	e867db3a24	Merge pull request #3780 from acemod/lighter-bodybags ... Adjusted weight of bodybag	2016-05-14 09:24:25 +02:00
Glowbal	eb8390741b	Change round down mass of body bag ... Mass is an integer.	2016-05-14 09:23:29 +02:00
Glowbal	57e83f8b35	Merge pull request #3791 from acemod/dropTestMission ... Remove old test-mission	2016-05-14 09:18:06 +02:00
PabstMirror	d48bd3ca83	Remove old testmission addon	2016-05-13 19:54:14 -05:00
PabstMirror	895bf2580a	Merge pull request #3773 from J3aLeiNe/master ... fnc_getMGRSdata.sqf update3	2016-05-13 15:59:24 -05:00
jonpas	a950b2c2fe	Add canPush config entry to enable pushing on boats with mass higher than 2600	2016-05-13 16:33:15 +02:00
SilentSpike	ce3787b3c3	Merge pull request #3768 from acemod/add-zeus-objects-setting ... Add zeus objects setting	2016-05-13 10:39:20 +01:00
jonpas	e984fcf715	Fix part name for Tank class	2016-05-12 21:56:12 +02:00
jonpas	2d2d5bc828	Readd mistakenly removed spare part adding	2016-05-12 21:52:06 +02:00
jonpas	58cc686aac	Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts	2016-05-12 21:49:45 +02:00
jonpas	f6e4bd7a6b	Remove redundant spare part adding	2016-05-12 21:37:54 +02:00
jonpas	c591c7af64	Add interaction support to Motorcycle class	2016-05-12 21:30:32 +02:00
Glowbal	721b161161	Remove useless if statement	2016-05-12 19:56:07 +02:00
Glowbal	7ba02a21ec	Merge remote-tracking branch 'refs/remotes/origin/add-mine-detector' ... Conflicts: addons/minedetector/functions/fnc_detectorLoop.sqf	2016-05-12 19:49:32 +02:00
Glowbal	7cc423d48f	Change mindetector sound	2016-05-12 19:44:43 +02:00
jonpas	5147f366a5	Execute take nozzle actions only on progress bar success (#3783) ... * Execute take nozzle actions only on progress bar success - fix #3739, Prettify params * Fix animation on holster	2016-05-12 17:11:35 +02:00
PabstMirror	09371bce96	Merge pull request #3776 from acemod/cleanupFastRopeSounds ... FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution	2016-05-11 22:29:28 -05:00
commy2	7304bd3fda	Merge pull request #3779 from acemod/showvirtualloadingearmenu ... show virtual load in inventory menu	2016-05-11 22:57:37 +02:00
commy2	dd6241e376	Merge pull request #3778 from acemod/fixGetWeaponState ... fix getWeaponState, fix #3777	2016-05-11 22:57:25 +02:00
BaerMitUmlaut	f9c643b941	Modified fastroping thud sound	2016-05-11 21:05:59 +02:00
SilentSpike	1b1329b350	Increase spectator unit tree refresh rate ... Reduce the time between automated refreshing of the unit tree. Also makes an initial call to the tree populating code upon first opening to remove the initial delay.	2016-05-11 16:01:07 +01:00
SilentSpike	9364ae60df	Fix spectator unit tree refreshing ... - Account for decrement in node index when culling the tree of sides/groups/units - Fix non-zero-based index `to` value when navigating the units in the tree	2016-05-11 13:30:17 +01:00
J3aLeiNe	078c1d585f	Add Kerama Islands by "Les Vétérans" ... add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)	2016-05-11 00:01:35 +02:00
BaerMitUmlaut	38bb4f6c29	Adjusted weight of bodybag	2016-05-10 23:40:03 +02:00
commy2	f738b17db7	show virtual load in inventory menu	2016-05-10 22:32:40 +02:00
commy2	53c9a96c77	fix getWeaponState, fix #3777	2016-05-10 22:14:01 +02:00
J3aLeiNe	c619bcb5a3	Fix "jacobi" latitude and elevationOffset	2016-05-10 19:39:01 +02:00
PabstMirror	518a873efd	Add module readme	2016-05-10 10:14:15 -05:00
PabstMirror	980da16826	FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution	2016-05-10 10:09:52 -05:00
J3aLeiNe	29e7dbf757	fnc_getMGRSdata.sqf update3	2016-05-10 12:39:56 +02:00
commy2	be99d4b3d7	Merge pull request #3772 from acemod/fixmissingmags ... add missing magazines, fix #3685	2016-05-10 11:57:32 +02:00
commy2	505fa0d773	add missing magazines, fix #3685	2016-05-10 11:50:59 +02:00
Tim Beswick	19df821ff5	Moved IR Strobe to left shoulder when attached.	2016-05-09 11:51:28 +01:00
BaerMitUmlaut	3f96e11cbb	Made icons grey	2016-05-08 18:52:33 +02:00
Glowbal	74fd4b4b52	Add run at settings initialized auto add objects	2016-05-08 13:47:35 +02:00
Glowbal	a526d33aba	Fix inconsistent name for module setting	2016-05-08 13:44:51 +02:00
Glowbal	b08af3fea6	Add read auto add objects setting from module	2016-05-08 13:42:45 +02:00
Glowbal	220b8b6352	Merge pull request #3767 from alganthe/zeus_fix ... Add new zeus addObjects setting to settings module (#2451)	2016-05-08 13:41:13 +02:00
jonpas	a0bd521a40	Remove difficulties component	2016-05-07 23:48:31 +02:00
PabstMirror	2a5ec42148	Repair - Improve wheel detection for RHS (#3760) ... * Repair - Improve backup wheel detection Fix #3759 * Cleanup	2016-05-07 16:04:27 -05:00
Glowbal	dbe70a7094	Merge pull request #3761 from acemod/cleanupExplosiveSync ... Fix explosive sync on dedicated server	2016-05-07 22:46:35 +02:00
Glowbal	ed9d05d6dd	Merge pull request #3753 from acemod/blockEngine-statusEffect ... Add blockEngine status effect	2016-05-07 22:40:05 +02:00
J3aLeiNe	d79cbe0844	Getmgrsdata update2 (#3736) ... * correct mildot reticle LRPS/AMS/KHS correct mildot reticle LRPS/AMS/KHS * replace 1 tab with 1 space replace 1 tab with 1 space * fix tab * ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes, same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ (4meter for 1000meter), LRPS : variable magnification / SOS : 2 magnifications * fnc_getMGRSdata.sqf update2 fnc_getMGRSdata.sqf update2 * fnc_getMGRSdata.sqf update2 add new maps, in alphabetic order now	2016-05-07 22:37:58 +02:00
PabstMirror	9f6661f4db	Make 40mm Grenades Frag (#3679) ... * Make 40mm Grenades Frag * Just use existing force cfg instead of adding new Add RHS compat entries	2016-05-07 15:35:39 -05:00
BaerMitUmlaut	4eb2ecb0b6	Fixed getting stuck on rope whilst fastroping (#3734)	2016-05-07 22:35:18 +02:00
BaerMitUmlaut	82f8eb758c	Removed remaining usage of player (#3710)	2016-05-07 22:27:33 +02:00
PabstMirror	1742629045	Add NonSteerable Reserve Parachute (#3689) ... * Add NonSteerable Reserve Parachute Close #3364 * Use params	2016-05-07 22:26:02 +02:00
Rebel	8bd4afed6b	Drag and carry icons. (#3676)	2016-05-07 22:23:38 +02:00
J3aLeiNe	fd8167b7e7	AB - correct mildot reticle LRPS/AMS/KHS (#3664) ... * correct mildot reticle LRPS/AMS/KHS correct mildot reticle LRPS/AMS/KHS * replace 1 tab with 1 space replace 1 tab with 1 space * fix tab * ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes, same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ (4meter for 1000meter), LRPS : variable magnification / SOS : 2 magnifications	2016-05-07 22:20:50 +02:00
commy2	4a8e727ba5	end spectator by global mission end event from server (#3659) ... * end spectator by global mission end event from server * add ;	2016-05-07 22:17:21 +02:00
Ozan Eğitmen	b8abec0c61	Fix Capitalization of ACE Settings classes. (#3627)	2016-05-07 22:14:56 +02:00
Glowbal	f34d890e7a	Merge pull request #3612 from SzwedzikPL/trenchestweaks ... Add remove trench and continue digging trench actions	2016-05-07 22:12:15 +02:00
Glowbal	1ad348d415	Merge pull request #3517 from gruppe-adler/master ... Added fastroping sounds	2016-05-07 22:01:21 +02:00
Glowbal	5ff91484ed	Merge pull request #3438 from acemod/spareBarrelSimulation ... AAR actions + track temperatures of spare barrels	2016-05-07 21:48:03 +02:00
PabstMirror	dd858c7e6b	Stringtables, Add Detector Pos Deubg	2016-05-07 12:08:36 -05:00
PabstMirror	dd049a9699	Merge pull request #3762 from acemod/toggleWindDisplay ... Add key to toggle wind info display	2016-05-07 10:58:43 -05:00
PabstMirror	71b86a7525	Merge pull request #3746 from acemod/fixTacLaderModelCfg ... Tactical Ladder - Update model cfg	2016-05-07 10:58:29 -05:00
PabstMirror	9b46e77f66	Add key to toggle wind info display	2016-05-06 12:47:59 -05:00
PabstMirror	28c65c4bed	Fix explosive sync on dedi	2016-05-05 14:36:56 -05:00
jonpas	59e412032e	Merge pull request #3756 from acemod/uiShowHud ... UI - Don't overwrite other showHud indexes	2016-05-04 21:50:42 +00:00
PabstMirror	cf92ba9c46	Overheating - Add Master Enabled Setting (barrelPR)	2016-05-04 14:59:04 -05:00
ir0n1e	13dc56c435	added opening sounds	2016-05-04 20:06:56 +02:00
PabstMirror	bc584b4c95	Merge remote-tracking branch 'refs/remotes/origin/master' into spareBarrelSimulation	2016-05-04 13:00:34 -05:00
commy2	01cf551aba	Merge pull request #3730 from acemod/cleanupReloadLaunchers ... Cleanup reload launchers	2016-05-04 16:18:37 +02:00
Glowbal	83a8c488d9	Merge pull request #3751 from acemod/wipeoutWhitespace ... Cleaned up excessive whitespace	2016-05-04 11:46:56 +02:00
Glowbal	59d101ea75	Merge pull request #3754 from acemod/removeLegacy ... Removed old occurances of AGM and CSE	2016-05-04 11:46:11 +02:00
ir0n1e	9af55d741b	added new load handling	2016-05-04 09:56:33 +02:00
ir0n1e	cbabae9253	Merge branch 'master' into gunbag	2016-05-04 06:39:26 +02:00
ir0n1e	ad7bd3efc1	Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into gunbag	2016-05-04 06:32:17 +02:00
ir0n1e	ffbc5ca07d	fixed idention and code style	2016-05-04 06:31:35 +02:00
PabstMirror	398b76f30b	Get reload time from QGVAR(buddyReloadTime)	2016-05-03 23:13:43 -05:00
PabstMirror	98a74aca6e	UI - Don't overwrite other showHud indexes	2016-05-03 22:49:05 -05:00
Glowbal	0652978c86	Merge branch 'master' into add-mine-detector	2016-05-03 22:44:16 +02:00
Glowbal	b4fca958aa	Add mine detector port from ACE2	2016-05-03 22:37:02 +02:00
BaerMitUmlaut	012ce9fb16	Removed old occurances of AGM and CSE	2016-05-03 21:38:36 +02:00
BaerMitUmlaut	b6324e61e9	Improved params formatting	2016-05-03 21:24:10 +02:00
BaerMitUmlaut	304f1a22b4	Use blockeEngine status effect in refuel	2016-05-03 21:08:22 +02:00
BaerMitUmlaut	e125911c3b	Added blockEngine status effect	2016-05-03 20:52:43 +02:00
Cuel	66c2bf0506	Fix dead bodies removal, when forced = 1 ... - Removed unused(?) GVAR(Module) - Removed "white space alignment" in module.sqf	2016-05-03 20:10:28 +02:00
commy2	736807f994	fix typo, make variable global	2016-05-03 18:16:39 +02:00
commy2	8585ea5688	add framework to add virtual mass to containers	2016-05-03 18:12:47 +02:00
ir0n1e	cd58eaf974	wrong command (removeAllPrimaryWeaponItems)	2016-05-03 12:52:06 +02:00
ir0n1e	def1d46152	remove weapon items player	2016-05-03 12:49:16 +02:00
ir0n1e	920b9b8e62	Update script_component.hpp	2016-05-03 12:44:58 +02:00
ir0n1e	a34490aca8	added missing }	2016-05-03 10:58:01 +02:00
ir0n1e	d3500d4bee	ACE syntax	2016-05-03 10:51:41 +02:00
ir0n1e	9567b587c6	added gunbag	2016-05-03 10:21:21 +02:00
BaerMitUmlaut	7fcbe93b71	Cleaned up excessive whitespace	2016-05-03 02:32:44 +02:00
PabstMirror	33b624c896	Tactical Ladder - Update model cfg ... #3745	2016-05-02 12:10:44 -05:00
PabstMirror	7cc2da2bb1	Fix self swap action	2016-04-29 23:38:01 -05:00
ProfessorCZ	7d0fcde9fa	CZ Translate - Update ... 04/30/2016	2016-04-30 00:57:24 +02:00
PabstMirror	4eb657bfc7	Merge pull request #3718 from acemod/vehLockACRE ... vehicle inventory lock - compatibility with acre	2016-04-29 13:10:21 -05:00
PabstMirror	7665935641	Use constant reload time value instead of config	2016-04-29 13:00:35 -05:00
commy2	ab09e0989b	Merge pull request #3722 from acemod/fixmacro ... fix wrong macro names	2016-04-28 07:48:25 +02:00
PabstMirror	d826c91c99	Cleanup reload launchers	2016-04-28 00:43:33 -05:00
jonpas	3389bc5e1b	Add cargo to Taru pods	2016-04-28 04:44:57 +02:00
PabstMirror	d40735d5c2	Improve synced event error logging	2016-04-25 15:48:24 -05:00
commy2	5c3f5f5751	fix wrong macro names	2016-04-25 21:34:25 +02:00
PabstMirror	27c5598135	vehicle inventory lock - compatibility with acre	2016-04-24 11:26:13 -05:00
jonpas	b06659a2e4	Fix params error	2016-04-23 00:29:58 +02:00
jonpas	dbe4c6ae26	Merge branch 'master' into uiSettings	2016-04-23 00:17:16 +02:00
PabstMirror	efc956eb99	Merge pull request #3692 from acemod/unloadOnSlopes ... Better handle unloading on slopes	2016-04-22 10:40:16 -05:00
PabstMirror	7366133629	Merge pull request #3699 from acemod/cWireFixes ... Concertina Wire - Don't recoil broken wire, fix killer	2016-04-22 10:40:04 -05:00