8653 Commits

Author	SHA1	Message	Date
esteldunedain	ae8cbb4834	Add "check temperature" and "swap barrel" actions for AARs	2016-03-05 23:33:30 -03:00
jonpas	ae3a41e6d8	Move common event handlers closer to their counterparts	2016-03-06 02:38:05 +01:00
Nicolás Badano	de6af27912	Merge pull request #3492 from acemod/Fix3491_MortarBoxes ... Replace transportMax... with maximumLoad for mortar boxes.	2016-03-05 22:09:07 -03:00
Nicolás Badano	9f205b4a54	Merge pull request #3509 from acemod/fix3379 ... Increase interaction distance with explosives from 1m to 1.5m.	2016-03-05 22:08:31 -03:00
Nicolás Badano	1d3950bfff	Merge pull request #3497 from acemod/liteDrag ... Fix portable light floating / dir when carrying	2016-03-05 22:07:43 -03:00
Nicolás Badano	e2c2495d52	Merge pull request #3496 from looterz/bftbug ... Fix for player markers not showing up correctly with BFT_ShowPlayerNames	2016-03-05 22:05:33 -03:00
esteldunedain	e15d534fd1	Rename event, removing prefix. Back to square one.	2016-03-05 21:11:53 -03:00
BaerMitUmlaut	8e895e8cff	Added gantry hiding animation	2016-03-05 23:21:10 +01:00
BaerMitUmlaut	b20e433f43	Fixed bug with fastroping simultaneously	2016-03-05 23:20:44 +01:00
BaerMitUmlaut	8039332743	Switched to preStart + XEH_PREP	2016-03-05 23:19:53 +01:00
BaerMitUmlaut	21d546ac1c	Added note concerning BIS_fnc_guiMessage	2016-03-05 21:22:45 +01:00
PabstMirror	721aa94a29	Merge pull request #3536 from acemod/dediCaps ... Fix captivity system on dedicated	2016-03-05 14:08:53 -06:00
BaerMitUmlaut	b8a4349c10	Added deployment API and waypoint	2016-03-05 20:25:35 +01:00
jonpas	9463b05218	targetEvent -> objectEvent	2016-03-05 18:16:09 +01:00
jonpas	881eaf951a	Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local	2016-03-05 18:07:07 +01:00
jonpas	589ca27b60	Fix missing comma	2016-03-05 18:02:21 +01:00
jonpas	015a60e6c4	Increase fuel update to 1s	2016-03-05 17:44:03 +01:00
jonpas	401d457a46	Replace execRemoteFnc with global/targetEvent in refuel	2016-03-05 17:41:47 +01:00
esteldunedain	6cf9787fd1	Fix travis warning	2016-03-05 13:18:41 -03:00
esteldunedain	ebfd76107e	The function name was changed in CBA	2016-03-05 13:15:56 -03:00
esteldunedain	62f598b2a6	Use the correct CBA function name, defining it in ACE as long as it doesn't exist already.	2016-03-05 13:11:20 -03:00
jonpas	b37b1a39b2	Allow string input for isBackpack	2016-03-05 14:29:04 +01:00
nomisum	e36198561f	Merge remote-tracking branch 'refs/remotes/acemod/master'	2016-03-05 12:43:27 +01:00
PabstMirror	4826a89ef5	Fix captivity system on dedicated ... Fix #3532	2016-03-04 11:45:38 -06:00
GitHawk	0b3abd55d3	Disallow refueling with running engine	2016-03-04 13:59:14 +01:00
esteldunedain	5450954fc2	Rename the event as "ace_tagging_tagCreated"	2016-03-04 09:16:42 -03:00
esteldunedain	02616ebbb2	Throw a globalEvent when a tag is created. Close #3521.	2016-03-03 19:43:26 -03:00
PabstMirror	e3deebff7e	Fix empty callback for hr adjustment ... Fix #3526 Same issue as #3384	2016-03-03 13:23:53 -06:00
PabstMirror	53a36f8783	Add REQUIRED_CBA_VERSION macro to script_mod.hpp	2016-03-03 13:00:47 -06:00
PabstMirror	56c5343bd7	Set sandbag side to civ to show in 3den ... ref #3102 #2633	2016-03-03 12:54:13 -06:00
jonpas	ef95e278f9	Fix Cancel Action by moving it to MouseButtonDown display EH	2016-03-03 17:35:43 +01:00
PabstMirror	137a512a9e	close main display if using incompatible cba	2016-03-02 16:33:29 -06:00
commy2	e6c6e55968	Merge pull request #3507 from acemod/mouseZChangedEH ... Replace addScrollWheelEventHandler with MouseZChanged Display EH	2016-03-02 23:15:50 +01:00
commy2	92fddff833	also fix modifier key	2016-03-02 23:14:23 +01:00
nomisum	76468d326b	fixed license file	2016-03-02 22:49:25 +01:00
nomisum	9b55aa1555	Merge remote-tracking branch 'refs/remotes/acemod/master'	2016-03-02 22:40:33 +01:00
nomisum	48e9e9c9e4	added CBA-PFH, added QUOTE	2016-03-02 22:36:42 +01:00
commy2	9a0c839ced	Merge pull request #3508 from acemod/fix3504 ... Make the FRIES inherit from Helicopter_Base_F. Fix #3504	2016-03-02 22:28:01 +01:00
ColdEvul	80bada0365	Fixed carrying rotation.	2016-03-02 22:27:29 +01:00
nomisum	730e79def0	added fastroping sounds	2016-03-02 22:17:49 +01:00
ColdEvul	8b4892598a	added EventHandlers	2016-03-02 22:17:19 +01:00
commy2	303f8d93b9	simplify inheritance	2016-03-02 22:16:40 +01:00
FFAAMOD	95007d8ccd	Spanish translation of FastRope fixed ... Fixed wrong tag in Spanish Translation of Fast Rope module.	2016-03-02 21:00:46 +01:00
esteldunedain	e0493458c0	Reduce interaction distance for defusing back to 1m	2016-03-02 16:19:38 -03:00
PabstMirror	e6a5d2dacd	Add CBA 2.3.1 to versioning check	2016-03-02 13:19:20 -06:00
FFAAMOD	6b13ea287e	Added Spanish Translation to fastroping module ... Added Spanish Translations, some of these can have multiple translations but according to the context, they match properly their meanings.	2016-03-02 19:56:50 +01:00
esteldunedain	928a9b9485	Increase interaction distance with explosives from 1m to 1.5m. Fix #3379	2016-03-02 15:25:41 -03:00
esteldunedain	0399335a3f	Make the FRIES inherit from Helicopter_Base_F. Fix #3504	2016-03-02 14:41:41 -03:00
jonpas	4918dbacb0	Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH	2016-03-02 17:33:46 +01:00
ColdEvul	b91897de3b	Added comment	2016-03-02 16:41:45 +01:00
ColdEvul	e7ec87d284	Added carry and interaction for case.	2016-03-02 16:38:23 +01:00
commy2	467075ad67	replace timePFH with CBA_missionTime	2016-03-02 11:01:39 +01:00
PabstMirror	8f620f2e61	Fix portable light floating / dir when carrying ... #3486	2016-03-01 18:49:41 -06:00
looterz	b86e5d8ad6	Fixes player markers not showing up correctly when BFT_ShowPlayerNames is enabled in multiplayer	2016-03-01 18:23:33 -06:00
esteldunedain	d886289716	Display the new weapon temperature right after swapping barrels	2016-03-01 19:27:39 -03:00
esteldunedain	850a499c0e	Localize spare barrel's displayName	2016-03-01 19:26:20 -03:00
esteldunedain	e6a2ca7102	Fix typos	2016-03-01 19:25:45 -03:00
esteldunedain	f130d6c253	Increase spare barrel mass to 60 (2.7 Kg)	2016-03-01 18:17:58 -03:00
esteldunedain	b8c8c21a02	Remove spare barrels from starting equipments	2016-03-01 18:17:23 -03:00
esteldunedain	a041555381	Add an animation and progressbar to the "Check spare barrels temperatures" action	2016-03-01 18:16:14 -03:00
esteldunedain	46a96dd5da	Move spare barrel event handlers out of postInit	2016-03-01 18:14:36 -03:00
VKing	353b5e9ef4	Replace transportMax... with maximumLoad for mortar boxes. ... Fixes 3490	2016-03-01 21:58:21 +01:00
esteldunedain	bc4a338d32	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spareBarrelSimulation	2016-03-01 17:15:14 -03:00
Glowbal	e2c7576251	Remove headless client component from ACE. ... The component does not fit properly within the scope of the ACE project. In order to avoid difficulties at a later point in time, project management has decided to pull the HC component from the ACE 3.5.0 release. We are going to look into alternative options for the HC component, such as a separate repository maintained by the ACE team.	2016-03-01 19:09:42 +01:00
commy2	fa3913752b	replace XEH_ENABLED macro with actual class, fix #3482, fix #3483	2016-03-01 17:05:00 +01:00
esteldunedain	bafe714ab5	Remove spare barrels from starting equipment, as they make some grenades not fit in the uniforms.	2016-03-01 10:05:06 -03:00
Jonathan Pereira	309f48ee0b	Added remaining PT-BR translarions	2016-03-01 08:56:43 -03:00
NorXAengell	772c4cc100	Another batch of translations and corrections (Fr)	2016-03-01 02:27:19 +01:00
PabstMirror	2bdeff1639	Fix for all missionVersions	2016-02-29 16:34:51 -06:00
PabstMirror	cb370c4f70	Merge branch 'release' into 3den_-1	2016-02-29 14:16:34 -06:00
PabstMirror	fe967ff2bd	Don't read medic setting that is not in module	2016-02-29 14:07:15 -06:00
PabstMirror	2b3b6083cb	Try to handle bad 3den mission modules	2016-02-29 14:06:14 -06:00
BaerMitUmlaut	5b4072bf50	Added vehicle existance check	2016-02-29 19:29:11 +01:00
BaerMitUmlaut	05c16a5dfb	Removed TOH animations	2016-02-29 19:29:10 +01:00
BaerMitUmlaut	11a66d98e2	Cleanup & fix interaction conditions	2016-02-29 19:29:09 +01:00
PabstMirror	c0c6d3c52f	Merge branch 'release' into fixFastropeRepairError	2016-02-29 12:10:34 -06:00
jonpas	7b96fe6c28	Disable logging in tagging - fix #3468	2016-02-29 16:37:19 +01:00
esteldunedain	9e682253f3	Move the dead body cleanup PFH to a loop using waitAndExecute	2016-02-28 23:33:51 -03:00
esteldunedain	90a54397ae	Move the litter cleanup PFH to a loop using waitAndExecute	2016-02-28 23:20:26 -03:00
esteldunedain	4b702f68df	Make loops non public	2016-02-28 23:10:15 -03:00
esteldunedain	94e8bee348	Move the pfh from setDead to a waitAndExecute loop: reviveStepLoop	2016-02-28 23:08:25 -03:00
esteldunedain	12895e7983	Remove unneeded parameter	2016-02-28 22:58:09 -03:00
esteldunedain	0e82cdfe82	Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance.	2016-02-28 22:50:04 -03:00
esteldunedain	21d4939abb	Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10	2016-02-28 22:08:59 -03:00
esteldunedain	35e13d5357	Fixes	2016-02-28 20:55:05 -03:00
esteldunedain	bbb84ec7d1	Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities	2016-02-28 20:50:28 -03:00
esteldunedain	085860c770	Restore addToInjuredCollection as a deprecated function	2016-02-28 20:32:02 -03:00
esteldunedain	bed51ac8a4	Fix waitAndExecute syntax	2016-02-28 20:26:05 -03:00
esteldunedain	3bbabac2d7	Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance.	2016-02-28 20:12:56 -03:00
jonpas	f5ff593dea	Revert "Convert fastroping animations to Arma 3, fix bone errors"	2016-02-28 23:16:44 +01:00
jonpas	8d326a0a1b	Remove duplicate medical string	2016-02-28 22:54:24 +01:00
PabstMirror	e5b79d7b33	Don't try adding repair actions to fastrope helper	2016-02-28 14:17:14 -06:00
BaerMitUmlaut	75c2e3d032	Added QUOTE macros to fastroping configs	2016-02-28 18:56:45 +01:00
VKing	8bb7b072d4	Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. ... This prevents any possible confusion when the GVARs are used in code.	2016-02-28 15:18:15 +01:00
BlackWindowS	c61e7b5104	Tweaked & added translations ... Translation of almost every STR to French	2016-02-28 14:48:04 +01:00
Thomas Kooi	6bfe86e91a	Merge pull request #3455 from acemod/fix3450 ... Fix #3450	2016-02-28 13:07:03 +01:00
commy2	69f810f32b	add missing pee	2016-02-28 07:25:11 +01:00
commy2	03b8e2b590	fix reloadMutex nil, fix#3450	2016-02-28 06:12:40 +01:00
PabstMirror	147cd1a5af	Hide categories that have no user settable options	2016-02-27 18:06:02 -06:00
jonpas	0e606224c7	Convert fastroping animations to Arma 3, fix bone errors	2016-02-27 22:28:12 +01:00
jonpas	905586bddc	Make unused medical strings be used	2016-02-27 21:04:04 +01:00
Glowbal	428b828c27	Increase version 3.5.0	2016-02-27 20:44:38 +01:00
Thomas Kooi	f758a90351	Merge pull request #3445 from acemod/preventSelfIMFromClosing ... Prevent Self Interact Menu from bugging out during animations	2016-02-27 20:35:18 +01:00
Thomas Kooi	d0b1ac56ba	Merge pull request #3440 from System98/Update-german-translations ... Update german translations	2016-02-27 20:33:51 +01:00
esteldunedain	a86bbdb162	Prevent the interact menu from closing when moving the mouse during animations	2016-02-27 15:47:23 -03:00
ElTyranos	9d50812a65	Fastrope French translation	2016-02-27 19:46:15 +01:00
esteldunedain	121663226c	Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases.	2016-02-27 15:44:53 -03:00
commy2	a7ec4d9d2f	Merge pull request #3398 from acemod/fix3317 ... Resync mine orientations in JIP.	2016-02-27 16:52:53 +01:00
Thomas Kooi	a9fa3a99b8	Merge pull request #3441 from acemod/fixNametagsError ... Fix error in nametags when a player disconnects	2016-02-27 15:17:15 +01:00
esteldunedain	30d62859dc	Fix error in nametags when a player disconnects	2016-02-27 10:17:26 -03:00
esteldunedain	188941a9b7	Filter the GVAR(explosivesOrientations) list before sending it	2016-02-27 10:07:51 -03:00
esteldunedain	fba1a322ac	Yet more fixes	2016-02-27 09:50:44 -03:00
esteldunedain	823eb116ae	more fixes	2016-02-27 09:37:57 -03:00
esteldunedain	8280335d07	Fix event name typo	2016-02-27 09:26:42 -03:00
esteldunedain	b9e1028f23	Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317	2016-02-27 09:14:16 -03:00
esteldunedain	834cbb4d24	Debug stuff	2016-02-27 09:14:07 -03:00
esteldunedain	849fa4f1ee	Redo markers, lost in the merge	2016-02-27 09:06:19 -03:00
System98	df3ec3a179	Fix length of a display name ... - Fix the length of a display name so it doesn't get cut off in the settings.	2016-02-27 12:51:32 +01:00
System98	a13b029b4a	Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations	2016-02-27 12:50:07 +01:00
esteldunedain	db4974eae2	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317 ... Conflicts: addons/medical/CfgEden.hpp addons/repair/CfgEden.hpp	2016-02-27 08:48:57 -03:00
Thomas Kooi	ae136af2d6	Merge pull request #3415 from looterz/bftplayernames ... Added Show Player Names option to Blue Force Tracking Module	2016-02-27 12:43:15 +01:00
Thomas Kooi	a0ea724db4	Merge pull request #3436 from acemod/register-last-damage-source ... Add registering last damage source	2016-02-27 12:42:11 +01:00
Thomas Kooi	adcfec6ff0	Merge pull request #3430 from GitHawk/refuel_ropeImprovement ... Refuel improvements	2016-02-27 12:40:50 +01:00
Thomas Kooi	938c1f4c0a	Merge pull request #2904 from BaerMitUmlaut/fastroping ... Fastroping	2016-02-27 12:36:43 +01:00
System98	05575538e4	Fix format errors in "medical" addon	2016-02-27 12:10:40 +01:00
System98	f7253edec8	Update german translations ... - Fix some german translations - Re-add strings in "medical" addon deleted in PR #3437 - Add german translations for previously deleted strings and update the english texts so the purpose of the function gets clearer	2016-02-27 12:07:57 +01:00
System98	110dd68736	Fix error in slideshow ... - Fix error in slideshow addon	2016-02-27 10:37:52 +01:00
esteldunedain	b8f955468c	First version of "Check spare barrel temperatures" action	2016-02-27 01:46:27 -03:00
esteldunedain	e950552345	Track temperatures of spare barrels	2016-02-27 00:29:30 -03:00
looterz	8b534bb4bf	Fixed ACE_Settings.hpp GVAR's missing category	2016-02-26 19:00:55 -06:00
jonpas	0c79869d7a	Fix duplicated English strings	2016-02-27 01:43:57 +01:00
jonpas	10abe5cd57	Merge branch 'master' into German-translations	2016-02-27 01:36:07 +01:00
Glowbal	e0a65aa543	Add registering last damage source	2016-02-26 22:58:49 +01:00
bux578	db71aa54b8	Merge pull request #3434 from NorXAengell/Traduction-Fr ... Traduction fr	2016-02-26 21:18:40 +01:00
bux578	431b6f872c	Merge pull request #3433 from licht-im-Norden87/patch-54 ... German translation	2016-02-26 21:16:54 +01:00
PabstMirror	6e29beefa1	Remove extra "(" in debug output	2016-02-26 12:48:40 -06:00
licht-im-Norden87	a5864c6f40	Merge pull request #42 from licht-im-Norden87/patch-55 ... refuel	2016-02-26 19:44:50 +01:00
licht-im-Norden87	6a6190b99d	Merge pull request #43 from licht-im-Norden87/patch-57 ... Update stringtable.xml	2016-02-26 19:44:37 +01:00
NorXAengell	0006f72663	Minor correction in explosive	2016-02-26 19:38:51 +01:00
licht-im-Norden87	1c7a25cc38	Update stringtable.xml	2016-02-26 19:36:47 +01:00
licht-im-Norden87	cac13e2f4f	refuel	2016-02-26 19:26:34 +01:00
licht-im-Norden87	21766e10c2	German translation ... Habe gerade Arma gestartet und dabei ist mir das ein oder andere Problem aufgefallen. WIP	2016-02-26 19:25:01 +01:00
NorXAengell	ea461446f9	Translation Fr	2016-02-26 19:24:53 +01:00
Githawk	c8e8a17111	Fixes ... - Fixed `isEngineOn` returning true on static objects - Fixed `fnc_readFuelCounter` for objects with infinite fuel	2016-02-26 16:35:34 +01:00
NorXAengell	8b9865b50d	Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr	2016-02-26 16:33:04 +01:00
NorXAengell	212d8f45ff	Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr	2016-02-26 16:22:00 +01:00
System98	e587744b3e	Fix text errors ... - Fix errors in "map_gestures, medical, overheating, slideshow and zeus" addons	2016-02-26 11:29:55 +01:00
GitHawk	7451d1ee5f	Make setFuel and getFuel API	2016-02-26 10:50:02 +01:00
GitHawk	0b324336ee	Initial pass ... Unified ropeDestruction Added check before ropeCreate	2016-02-26 10:46:12 +01:00
PabstMirror	424c6fe878	Show Cargo Example	2016-02-26 01:37:00 -06:00
PabstMirror	7fc1c87bc4	Global Ai Set Skill Example	2016-02-26 00:57:18 -06:00
bux578	704e858d9c	Merge pull request #3424 from NorXAengell/Traduction-Fr ... Translation Fr Captives	2016-02-26 07:38:05 +01:00
NorXAengell	a5ce95f9c7	Traduction, correction Fr Common	2016-02-26 01:29:37 +01:00
ElTyranos	a79cfa583d	bux578 correction	2016-02-25 23:47:27 +01:00
Nicolás Badano	7646068a8b	Merge pull request #3427 from SuN9491/master ... Spanish Translation (3.5.0)	2016-02-25 17:10:55 -03:00
PabstMirror	f59e8920f9	Fix Mortar Display	2016-02-25 13:59:00 -06:00
SuN9491	9efbdb2e71	Spanish Translation (3.5.0) ... Remaining spanish translations for ACE 3.5.0	2016-02-25 20:50:29 +01:00
NorXAengell	f2fa46ddf0	Translation Fr Captives	2016-02-25 19:36:44 +01:00
gienkov	4a73a0519e	translate fastroping	2016-02-25 19:06:50 +01:00
System98	48d312cb8e	Add german translations ... - add missing german translations - small fixes to existing texts - remove unused strings in "medical" addon	2016-02-25 18:10:26 +01:00
bux578	21ba45d0c9	Merge pull request #3421 from gienkov/pltranslation350 ... Polish translation 3.5.0 (FIXED)	2016-02-25 18:01:01 +01:00
gienkov	8ae1c68d5e	remove tabs	2016-02-25 17:20:45 +01:00
gienkov	d4209b2b42	mk6 tagging and overheating translation, finish	2016-02-25 17:16:36 +01:00
Nicolás Badano	333c8f57bc	Merge pull request #3419 from acemod/addMissingMedicalSettingCategory ... Add missing medical category to delayUnconCaptive	2016-02-25 13:16:23 -03:00
jonpas	6ad107ecc0	Add medical category to delayUnconCaptive	2016-02-25 17:03:38 +01:00
gienkov	04f714e53c	Merge remote-tracking branch 'origin/master' into pltranslation350	2016-02-25 16:41:09 +01:00
gienkov	25561ab2c5	hearing and medical, unwind medical pl shorts	2016-02-25 16:31:47 +01:00
Nicolás Badano	69a3c79756	Merge pull request #3418 from acemod/spanishTranslation3.5.0 ... Remaining Spanish translations	2016-02-25 12:28:30 -03:00
esteldunedain	3fa3512509	Remaining spanish translations	2016-02-25 12:25:42 -03:00
PabstMirror	3b03f84116	Disable debug	2016-02-25 09:12:24 -06:00
looterz	859a4321c6	Actually, nevermind that last commit	2016-02-25 09:03:30 -06:00
jonpas	8375694368	Merge pull request #3403 from acemod/fixCargoEventsParams ... Reimplement old parameter syntax for (Un)LoadCargo events	2016-02-25 16:01:57 +01:00
looterz	e6314eb114	Wrapped _groupsToDrawMarkers filtering with a condition check	2016-02-25 09:00:47 -06:00
esteldunedain	2fc27c553f	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spanishTranslation3.5.0	2016-02-25 11:47:10 -03:00
esteldunedain	64a62d65fc	More spanish translations	2016-02-25 11:46:56 -03:00
bux578	ed05d2f1e7	Merge pull request #3414 from acemod/spanishTranslation3.5.0 ... Spanish translation3.5.0	2016-02-25 15:45:38 +01:00
jonpas	b2b781957f	Reimplement old parameter syntax for (Un)LoadCargo events	2016-02-25 15:35:47 +01:00
looterz	b354fed39a	Moved _playersToDrawMarkers into BFT_ShowPlayerNames code region	2016-02-25 08:35:33 -06:00
looterz	00f06f81d1	Added Show Player Names option to Blue Force Tracking Module	2016-02-25 07:57:32 -06:00
esteldunedain	71707bc81a	Some spanish translations for 3.5.0	2016-02-25 10:54:19 -03:00
jonpas	36d5c40b06	Merge pull request #3411 from GitHawk/refuel_api ... Refuel change documentation header for API fnc	2016-02-25 14:52:25 +01:00
Nicolás Badano	23d35cf9f7	Merge pull request #3412 from GitHawk/rearm_api ... Rearm added API	2016-02-25 10:42:28 -03:00
Nicolás Badano	da46a1c0cd	Merge pull request #3408 from acemod/moduleDescriptions ... Cleanup some module descriptions	2016-02-25 09:56:31 -03:00
Nicolás Badano	d02a590886	Merge pull request #3406 from acemod/diePurista ... Replace Purista with Roboto - everywhere	2016-02-25 09:56:16 -03:00
Nicolás Badano	91e671085e	Merge pull request #3371 from acemod/moreSevereJamming ... More severe jamming	2016-02-25 09:56:08 -03:00
Nicolás Badano	d037512c81	Merge pull request #3405 from acemod/3k404 ... remove unused non API functions	2016-02-25 09:55:22 -03:00
Nicolás Badano	ae2ce0eebc	Merge pull request #3124 from acemod/delayUnconCaptiv ... add delay to Unconsciousness Captivity	2016-02-25 09:54:27 -03:00
bux578	6070d29f59	Merge pull request #3386 from licht-im-Norden87/patch-53 ... German translation Update: MK6 Mortar	2016-02-25 13:38:42 +01:00
GitHawk	6deecb0559	Add missing bracket	2016-02-25 10:25:57 +01:00
GitHawk	2f183548b6	Added API	2016-02-25 10:18:31 +01:00
GitHawk	5af31f6bb3	Remove brackets	2016-02-25 10:11:28 +01:00
GitHawk	53457cfe61	Change documentation header for API fnc	2016-02-25 10:08:20 +01:00
jonpas	1402985133	Fix typos	2016-02-24 19:34:03 +01:00
jonpas	a3d769c410	Cleanup some module descriptions, close #2561	2016-02-24 19:22:16 +01:00
jonpas	804456c722	Sort requiredAddons alphabetically	2016-02-24 18:35:52 +01:00
PabstMirror	8cb1546569	Add threeden to required addons and vers to 1.56	2016-02-24 10:52:34 -06:00
Nicolas Diego Badano	5af4e1ca25	Fix trace	2016-02-24 12:17:48 -03:00
Nicolas Diego Badano	c6f6e4e9f7	Let this finally fix it please	2016-02-24 12:14:47 -03:00
jonpas	8f775dfba4	Rename FontCSE macro to FONT_ACE	2016-02-24 15:08:54 +01:00
jonpas	7f022eda00	Replace Purista with Roboto - everywhere, close #3401	2016-02-24 15:06:27 +01:00
commy2	02b2a21300	remove unused non API functions	2016-02-24 10:10:31 +01:00
commy2	8233661d55	remove unused non API functions	2016-02-24 09:39:39 +01:00
PabstMirror	7cf912222b	Merge pull request #3393 from acemod/3denReplaceDropDown ... Fix 3den attributes	2016-02-23 17:09:03 -06:00
PabstMirror	a437326032	Merge pull request #3400 from acemod/fixLampUnload ... Fix lamp unloading	2016-02-23 17:07:31 -06:00
esteldunedain	b2c672e6c7	Apply the same pattern to ACE_Markers	2016-02-23 19:32:39 -03:00
esteldunedain	b32732cad0	Delete the logic and group after used	2016-02-23 19:29:18 -03:00
esteldunedain	66fa18888e	Use the logic directly to determine client	2016-02-23 18:53:33 -03:00
Nicolás Badano	b55648ccb4	Merge pull request #3402 from acemod/fixCutG ... Fix #3334 replace Purista with Roboto in cargo menu	2016-02-23 18:48:06 -03:00
commy2	b08ae7a266	Merge pull request #3395 from acemod/cba23compile ... Cleanup old cba SLX_XEH_COMPILE_NEW code	2016-02-23 22:43:42 +01:00
jonpas	60fba483fe	Fix #3334 replace Purista with Roboto in cargo menu	2016-02-23 22:30:15 +01:00
jonpas	168ec5344d	Fix #3363 lamp unloading bug, Correct cargo menu button classnames	2016-02-23 22:17:36 +01:00
Thomas Kooi	52108b1737	Merge pull request #3382 from acemod/doAnimEvents ... ObjectEvent Func, swap execRemoteFnc in doAnim	2016-02-23 18:38:43 +01:00
esteldunedain	f9ef100fad	Broadcast client	2016-02-23 11:56:46 -03:00
jokoho48	0956b97dce	remove module settings ... change defualt in ACE_Settings	2016-02-23 15:49:03 +01:00
jokoho48	c61763edc9	fix simicolon ... add stringtable entrys	2016-02-23 15:37:28 +01:00
jokoho48	b2d2bec2cf	Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv ... # Conflicts: # addons/medical/functions/fnc_setUnconscious.sqf	2016-02-23 15:31:38 +01:00
esteldunedain	056244602d	Get the client ID from a new logic object	2016-02-23 10:09:55 -03:00
esteldunedain	ec88e4ad32	Revert "Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031" ... This reverts commit aea02af618.	2016-02-23 09:55:37 -03:00
esteldunedain	645ed3e63d	Resync mine orientations in JIP. Fix #3317	2016-02-23 09:53:38 -03:00
esteldunedain	e6af2864eb	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2016-02-23 09:27:23 -03:00
bux578	aa8d3a3fd0	Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis ... Unified ellipsis	2016-02-23 08:27:28 +01:00
BaerMitUmlaut	74ea79e2cc	Unified ellipsis	2016-02-22 23:51:47 +01:00
PabstMirror	a4391a713d	Cleanup old cba SLX_XEH_COMPILE_NEW code	2016-02-22 15:30:16 -06:00
BaerMitUmlaut	b2337d7485	Config cleanup	2016-02-22 22:21:13 +01:00
PabstMirror	37eb353edf	Cleanup Merge	2016-02-22 15:03:40 -06:00
PabstMirror	6dc0d7d4f5	Merge branch 'master' into moreSevereJamming	2016-02-22 14:57:40 -06:00
BaerMitUmlaut	b72751e693	Fixed macro	2016-02-22 21:06:26 +01:00
BaerMitUmlaut	c2856fd8c7	Fixed scopes	2016-02-22 20:58:55 +01:00
PabstMirror	9ec4135be9	Add prep	2016-02-22 12:27:27 -06:00
PabstMirror	eb08149946	Merge branch 'master' into doAnimEvents	2016-02-22 12:27:07 -06:00
licht-im-Norden87	d13e1272ce	Update stringtable.xml	2016-02-22 18:55:45 +01:00
PabstMirror	330792ba7a	Add medic threeden control	2016-02-22 11:26:32 -06:00
commy2	a09cb1612b	fix error when loading save game, fix #3391	2016-02-22 17:43:34 +01:00
commy2	9712f9c1a4	manual merge	2016-02-22 16:24:10 +01:00
commy2	72fe155cda	manual merge	2016-02-22 16:11:10 +01:00
commy2	ac3385fb83	manual merge	2016-02-22 16:08:24 +01:00
commy2	c45523475f	manual merge	2016-02-22 16:06:30 +01:00
commy2	0f7bfc0f66	Merge pull request #3389 from acemod/precompileongamestart ... precompile on game start	2016-02-22 16:00:19 +01:00
commy2	46a239f9f6	precompile on game start	2016-02-22 15:20:36 +01:00
BaerMitUmlaut	06f8f277ac	Added Eden Integration	2016-02-22 14:40:21 +01:00
BaerMitUmlaut	af834838ef	Moved FRIES equipping into seperate function	2016-02-22 14:40:04 +01:00
PabstMirror	e6052aee1f	Fix captives 3den	2016-02-22 03:00:40 -06:00
PabstMirror	ed96307f2f	3den repair - Replace bad combo with custom control	2016-02-22 02:50:20 -06:00
bux578	55a6ef1937	Merge pull request #3367 from licht-im-Norden87/patch-43 ... Update German Stringtable	2016-02-22 08:26:23 +01:00
esteldunedain	aea02af618	Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031	2016-02-21 23:47:47 -03:00
BaerMitUmlaut	ea92424d15	Added license file for TOH anims	2016-02-22 01:21:02 +01:00
BaerMitUmlaut	05054737ab	Removal of virtual rope anchor, animation fix	2016-02-22 00:31:33 +01:00
BaerMitUmlaut	6b2dc78ea4	Fixed moduleEquipFRIES header	2016-02-22 00:31:32 +01:00
BaerMitUmlaut	671fcd90b4	Integrated new model, fixed config, added Kasatka door animation	2016-02-22 00:31:31 +01:00
BaerMitUmlaut	c917cdab8d	New FRIES model, new animations	2016-02-22 00:31:29 +01:00
BaerMitUmlaut	c1ea6fd327	Fixed locality issues, moved rope creation and simulation to server ... Fix rope cut while fastroping Locality fix pt2 - serverside ropes	2016-02-22 00:31:28 +01:00
BaerMitUmlaut	8f49715ae6	Cleanup function params and headers ... Cleanup function params and headers Removed unecessary param	2016-02-22 00:31:27 +01:00
BaerMitUmlaut	8cfbbe4f1f	Skip FRIES preparation if unnecessary	2016-02-22 00:31:26 +01:00
BaerMitUmlaut	953119a411	Bugfix for static FRIES	2016-02-22 00:31:25 +01:00
BaerMitUmlaut	996a5105fc	Model update	2016-02-22 00:31:25 +01:00
BaerMitUmlaut	b2fd7f93b5	Cleanup privates and function params	2016-02-22 00:31:24 +01:00
BaerMitUmlaut	e5c0b5afd3	Added empty fire LOD to helper	2016-02-22 00:31:23 +01:00
BaerMitUmlaut	7d90f707c0	Improved config	2016-02-22 00:31:22 +01:00
BaerMitUmlaut	cc1a54d900	Updated model	2016-02-22 00:31:22 +01:00
BaerMitUmlaut	7241e703ae	Code cleanup, restructured rope deployment	2016-02-22 00:31:21 +01:00
BaerMitUmlaut	2695fc6beb	Better twitching fix, failsaves and EHs	2016-02-22 00:31:20 +01:00
BaerMitUmlaut	3ec9369a9e	Added FRIES object, FRIES module, debugging code	2016-02-22 00:31:20 +01:00
BaerMitUmlaut	12779b03bf	Glitchy rope fix	2016-02-22 00:31:19 +01:00
BaerMitUmlaut	774984dbac	Added possibility for memory point rope origins	2016-02-22 00:31:18 +01:00
BaerMitUmlaut	554c6b14e0	Tweaked interaction conditions	2016-02-22 00:31:17 +01:00
BaerMitUmlaut	890171e629	Added rope origins for all vanilla helicopters	2016-02-22 00:31:17 +01:00
BaerMitUmlaut	c70ab0b332	Buggy ropes workaround	2016-02-22 00:31:16 +01:00
BaerMitUmlaut	eb028c0d1b	Initial commit fastroping	2016-02-22 00:31:15 +01:00
commy2	f4a985fdfd	Merge pull request #3345 from acemod/jrCompat338 ... Add flashsupressor to asdg_MuzzleSlot_338	2016-02-21 23:46:50 +01:00
commy2	dd10fac470	use DisplayLoad for main menu box and to disable options when world=Empty	2016-02-21 23:28:02 +01:00
commy2	9ac1f8fc47	use DisplayLoad for turretDisplayLoaded event	2016-02-21 23:13:26 +01:00
commy2	4c0a817ba8	use precompiled function for optics display	2016-02-21 22:56:35 +01:00
commy2	e1db193099	remove unused config and remove some wrong base classes	2016-02-21 22:50:15 +01:00
commy2	2b9518bf81	use precompiled function for vector display	2016-02-21 22:41:11 +01:00
commy2	da0d37ed0d	remove commented out code	2016-02-21 22:31:14 +01:00
commy2	3f855298e2	remove unused mapDisplayLoaded event and ACE_dlgMap variable	2016-02-21 22:23:46 +01:00
commy2	f43e88ff25	replace zeusDisplayChanged with DisplayLoad event	2016-02-21 22:16:12 +01:00
commy2	4335bfbfcf	replace inventoryDisplayLoaded with DisplayLoad event	2016-02-21 21:24:39 +01:00
licht-im-Norden87	5e0f109b4c	Update stringtable.xml	2016-02-21 21:15:38 +01:00
commy2	e9808bf20b	remove unused PFH check	2016-02-21 20:42:06 +01:00
licht-im-Norden87	00c8f7bdef	mk6	2016-02-21 20:30:57 +01:00
commy2	5e486869c0	replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help)	2016-02-21 20:26:30 +01:00
licht-im-Norden87	4036dcaa8e	Update stringtable.xml	2016-02-21 20:05:26 +01:00
licht-im-Norden87	62dc2ffd06	Update stringtable.xml	2016-02-21 20:04:32 +01:00
licht-im-Norden87	3c8b3031d8	Update stringtable.xml	2016-02-21 19:59:06 +01:00
licht-im-Norden87	ce97916fbf	Update stringtable.xml	2016-02-21 19:55:08 +01:00
licht-im-Norden87	574a6a32ea	Update stringtable.xml	2016-02-21 19:54:24 +01:00
PabstMirror	2467fa7b0c	Fix empty callbacks in medical/repair	2016-02-21 11:34:25 -06:00
PabstMirror	cb33666091	ObjectEvent Func, swap execRemoteFnc in doAnim ... #3370	2016-02-21 11:08:07 -06:00
commy2	5dcb8707dd	Merge pull request #3359 from gienkov/edenadditions ... integrate captivity modules with 3DEN	2016-02-21 12:44:39 +01:00
bux	38c1b45fb9	properly fix the medical translation file	2016-02-21 11:41:53 +01:00
PabstMirror	3d4602e461	Add all joint muzzles and remove from ballistics	2016-02-20 20:03:10 -06:00
PabstMirror	3fbd6cff18	Merge pull request #3368 from acemod/fixNils ... Fix some undefined functions / strings	2016-02-20 19:49:07 -06:00
Nicolás Badano	d7403976aa	Merge pull request #3337 from acemod/overheatingSilencers ... Substantially increase overheating when using silencers or flash suppresors	2016-02-20 22:06:19 -03:00
licht-im-Norden87	360c35dc9c	Update stringtable.xml	2016-02-21 02:04:58 +01:00
licht-im-Norden87	0a0400a7a2	deleted all lines exept for 2 because of obvious reason.	2016-02-21 02:03:30 +01:00
esteldunedain	e4e2f0d661	Add a 10% chance for the unjam action to fail (like in ACE2)	2016-02-20 21:09:52 -03:00
Glowbal	ea113b8e61	Fix duplicate {	2016-02-21 01:04:12 +01:00
Glowbal	7d063d4dee	Merge branch 'master' into medical-focus-feature ... Conflicts: addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf	2016-02-21 00:37:30 +01:00
commy2	f5ef7b6b2d	displayLoad xeh for imenu	2016-02-21 00:36:46 +01:00
esteldunedain	dc7c4ff4fd	Increase the jam chance of all weapons at high temperatures	2016-02-20 20:26:30 -03:00
esteldunedain	11f3189306	Add an unjam action to the interact menu when the weapon is jammed	2016-02-20 20:19:56 -03:00
esteldunedain	2dbf979ec6	By default, prevent reloading from automatically clearing a weapon jam (like in ACE2)	2016-02-20 20:05:59 -03:00
PabstMirror	8b932fd5a0	Fix some undefined functions / strings	2016-02-20 16:58:45 -06:00
licht-im-Norden87	a977715460	Merge pull request #37 from licht-im-Norden87/patch-49 ... Viewdistance	2016-02-20 23:54:10 +01:00
licht-im-Norden87	82a938113c	Merge pull request #39 from licht-im-Norden87/patch-47 ... hearing	2016-02-20 23:54:04 +01:00
licht-im-Norden87	a4d0c219ac	Merge pull request #40 from licht-im-Norden87/patch-51 ... switchunits	2016-02-20 23:53:52 +01:00
licht-im-Norden87	fb20492573	switchunits	2016-02-20 23:53:02 +01:00
licht-im-Norden87	593ae5495e	Merge pull request #38 from licht-im-Norden87/patch-48 ... interaction	2016-02-20 23:46:17 +01:00
licht-im-Norden87	5996f50490	Merge pull request #36 from licht-im-Norden87/patch-50 ... finger	2016-02-20 23:46:11 +01:00
licht-im-Norden87	50dc6ec341	finger ... Iam not happy with my translation in any way. "Zeige Zeiger" sounds terrible "Zeige Fingerzeig (middlefinger)" can be misunderstood (maybe there is a nice solution Iam not aware of.) This is truely a pain in the ass	2016-02-20 23:43:16 +01:00
licht-im-Norden87	747cd8c4cf	Viewdistance	2016-02-20 23:33:12 +01:00
commy2	9c4121f3b1	replace ace_common_fnc_selectWeaponMode with CBA_fnc_selectWeapon	2016-02-20 23:30:40 +01:00
licht-im-Norden87	91bdceead6	interaction	2016-02-20 23:27:32 +01:00
licht-im-Norden87	5569790e0b	hearing	2016-02-20 23:25:19 +01:00
licht-im-Norden87	7f2dfe1749	Merge pull request #35 from licht-im-Norden87/patch-46 ... explosives	2016-02-20 23:20:21 +01:00
licht-im-Norden87	d4cca14929	explosives	2016-02-20 23:19:51 +01:00
commy2	a67917c590	add deprecate log	2016-02-20 23:11:50 +01:00
licht-im-Norden87	83e17e293b	Merge pull request #33 from licht-im-Norden87/patch-45 ... common	2016-02-20 23:08:47 +01:00
licht-im-Norden87	5294527daa	Merge pull request #32 from licht-im-Norden87/patch-44 ... cargo	2016-02-20 23:07:59 +01:00
licht-im-Norden87	cdb58b6233	common	2016-02-20 23:06:29 +01:00
licht-im-Norden87	b41efc39ff	cargo	2016-02-20 23:02:02 +01:00
licht-im-Norden87	073a476ed1	Update German Stringtable ... Since my other PR was merged I have to open another one to add a few things a fix one or two mistakes. It should be done in <30 minutes. (Guess you guys want to realease 3.5.0 as soon as possible.)	2016-02-20 22:57:45 +01:00
commy2	9cdefae10e	delete sqf file	2016-02-20 22:46:22 +01:00
commy2	73d5b3c77b	relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon	2016-02-20 22:41:24 +01:00
esteldunedain	d00587f367	Minor fixes	2016-02-20 17:40:19 -03:00
ChairborneIT	0021bc08df	Added translation for most Italian stringtable entries	2016-02-20 21:39:05 +01:00
esteldunedain	2d2e95fddc	Merge branch 'master' into overheatingSilencers	2016-02-20 17:25:26 -03:00
esteldunedain	63056ef47a	Merge branch 'master' into fixRHSCompat	2016-02-20 17:02:11 -03:00
esteldunedain	6fd8d8da04	Merge branch 'master' into changeHearingDefaults ... Conflicts: addons/grenades/functions/fnc_flashbangExplosionEH.sqf	2016-02-20 16:59:00 -03:00
PabstMirror	c9aa221b01	Convert other weapons with join muzzles	2016-02-20 12:01:34 -06:00
PabstMirror	84ba6f29f2	Merge pull request #3362 from acemod/delayedCaptivity ... Delay captivity until 0.05s after settings are initialized	2016-02-20 10:34:18 -06:00
Thomas Kooi	f6dfd03bec	Merge pull request #2168 from jokoho48/codeCleanupLaserSelfdesignate ... Code Cleanup laser Self Designate Module	2016-02-20 17:28:41 +01:00
Thomas Kooi	b6b173b03e	Merge pull request #3358 from acemod/darkerSandbags ... Darken and improve sandbag texture, close #2595	2016-02-20 17:26:35 +01:00
Thomas Kooi	2930fab6c6	Merge pull request #3354 from acemod/playerBodybags ... Fix bagging respawning players (alt)	2016-02-20 17:26:07 +01:00
Thomas Kooi	911cba81b7	Merge pull request #3347 from GitHawk/refuel_removedTruck ... Handling disconnect and removal of fuel truck	2016-02-20 17:24:32 +01:00
Thomas Kooi	ff7dbfa9f2	Merge pull request #3305 from GitHawk/dagr_fix ... Disable ACE_Laser for choppers (aka Changes to DAGR)	2016-02-20 17:17:46 +01:00
Thomas Kooi	6048d15847	Merge pull request #3290 from acemod/nametagsOptimization ... Nametags optimization	2016-02-20 17:15:01 +01:00
Thomas Kooi	14b526d417	Merge pull request #3272 from acemod/deadmanBombVest ... Deadman switch - trigger explosives in inventory	2016-02-20 17:11:06 +01:00
PabstMirror	918413030b	Short Circuit Tagging	2016-02-20 10:08:41 -06:00
Thomas Kooi	427b14e3ba	Merge pull request #3245 from GitHawk/rearm_fix ... Fixing setVehicleAmmo for rearm	2016-02-20 17:08:37 +01:00
Thomas Kooi	8055eae580	Merge pull request #3210 from acemod/taggingX ... Tagging X	2016-02-20 17:05:02 +01:00
Thomas Kooi	8d12f1cc08	Merge pull request #3130 from acemod/ab-subsonicAmmo ... AB - Handle subsonic ammo when configs not defined	2016-02-20 17:01:22 +01:00
bux578	76bacf184d	Merge pull request #2237 from gienkov/patch-29 ... Make reserve steerable	2016-02-20 17:00:51 +01:00
Thomas Kooi	2e47cb5b40	Merge pull request #3079 from jonpas/tacticalLadderFixes ... Prevent Tactical Ladder interaction if unit on ladder	2016-02-20 16:59:23 +01:00
Thomas Kooi	1e3596b92a	Merge pull request #3043 from acemod/Mortar_interact ... Mortar interaction and ammunition handling	2016-02-20 16:57:55 +01:00
Thomas Kooi	4f10d551d6	Merge pull request #2949 from gienkov/fixWoundCount ... ceil number of wounds	2016-02-20 16:56:17 +01:00
Thomas Kooi	27c6934ff2	Merge pull request #2230 from SzwedzikPL/interactions_lamps ... Interaction with portable lamps	2016-02-20 16:47:28 +01:00
PabstMirror	b9cf5817b9	Restore delay in modules	2016-02-20 09:39:15 -06:00
esteldunedain	6523b715fe	Delay captivity until 0.05s after settings are initialized	2016-02-20 11:57:47 -03:00
gienkov	1b03ee76fd	tabs	2016-02-20 14:07:39 +01:00
gienkov	54b71cc7ba	integrate captivity modules with 3DEN	2016-02-20 13:36:53 +01:00
bux	d9b452f496	darken and improve sandbag texture	2016-02-20 12:12:32 +01:00
Thomas Kooi	fbcfbb92a6	Merge pull request #3346 from acemod/betterFlashEffects ... Better flash effects	2016-02-20 10:22:57 +01:00
PabstMirror	fc3bb0de6b	Fix #3355 - add missing semi-colons	2016-02-19 18:51:25 -06:00
PabstMirror	dffcbc7650	Cleanup events	2016-02-19 15:45:37 -06:00
PabstMirror	44b526ab6d	bodybag - hide player corpse and delete later ... Fix #1301	2016-02-19 15:41:13 -06:00
PabstMirror	488d24bc01	Fix cargo loading on the big huron containers	2016-02-19 15:30:23 -06:00
PabstMirror	ed653456e5	Merge pull request #3338 from acemod/translations156merge ... Fix Merge Conflicts on More Italian Translations	2016-02-19 15:09:40 -06:00
esteldunedain	f2566afc73	Another 5m of effect	2016-02-19 15:22:24 -03:00
bux578	d601e50b15	Merge pull request #3350 from gienkov/patch-2 ... medical PL translation	2016-02-19 19:21:15 +01:00
Grzegorz	95250c8ecd	medical PL translation ... 3.5.0 ready	2016-02-19 19:10:59 +01:00
Grzegorz	99e24aab6d	frag PL translation ... 3.5.0 ready	2016-02-19 19:07:00 +01:00
Githawk	5b908b4be8	Adding disconnect EH	2016-02-19 17:32:02 +01:00
Githawk	e925c48798	Adding HandleDisconnect EH and deletion of fuel truck	2016-02-19 17:24:32 +01:00
esteldunedain	b420512139	Fix reduction based on looking away from the grenade	2016-02-19 12:34:50 -03:00
esteldunedain	9e5f52d161	Make units heavily affected by the blast turn away from the light.	2016-02-19 12:33:49 -03:00
esteldunedain	0f7853f6c6	Increase the maximum range for blinding effect to 25m, but with a high falloff. Close #1539	2016-02-19 12:18:22 -03:00
esteldunedain	648a0259ec	Improve flashbang effects. Make sure the light effect is rendered even if the grenade explodes further than 20m from the player. Increase the amount of hearing damage.	2016-02-19 12:02:29 -03:00
Thomas Kooi	95532ea521	Merge pull request #3333 from acemod/medicalEvents ... Replace execRemoteFnc in ace_medical	2016-02-19 12:00:00 +01:00
commy2	08e09d5cbd	manual merge	2016-02-19 11:50:17 +01:00
commy2	97008d8fc3	Merge pull request #3131 from acemod/removedep ... remove deprecated functions	2016-02-19 11:48:20 +01:00
commy2	5d0d8576ea	Merge pull request #3288 from SzwedzikPL/edenassignsettings ... Repair & medical object attributes for eden editor	2016-02-19 11:47:26 +01:00
PabstMirror	2c2626aade	Add flashsupressor to asdg_MuzzleSlot_338	2016-02-19 01:33:27 -06:00
esteldunedain	38c4b1dc81	Add a diagnose script to detect incompatibilities between vanilla and ab initial velocities	2016-02-19 00:45:00 -03:00
esteldunedain	ff04ca8981	Uniformize interaction distance for vehicle. Distance is now aprox 4m from the bounding box of the vehicle, consistent with interaction with people.	2016-02-18 20:20:02 -03:00
PabstMirror	d2a3f35c80	Fix deleted czech strings from merge	2016-02-18 13:39:14 -06:00
esteldunedain	e22b1c0d25	Derp	2016-02-18 16:07:39 -03:00
bux	49f565f541	fix merging errors	2016-02-18 20:05:30 +01:00
esteldunedain	2dd835b56b	Substantially increase overheating when using silencers or flash suppresors. Optimize overheating calculations for the player through caching.	2016-02-18 15:58:44 -03:00
ViperMaul	14c5558bbf	Merge branch 'master' of https://github.com/acemod/ACE3	2016-02-18 10:50:52 -08:00
ViperMaul	52b3f1e219	Bump version to 3.4.3	2016-02-18 10:50:33 -08:00
bux578	93e655588b	Merge pull request #3294 from gienkov/pltranslations ... pl translation	2016-02-18 19:38:43 +01:00
esteldunedain	2a8410650a	Swap createLocation by CBA_fnc_createNamespace	2016-02-18 13:58:18 -03:00
esteldunedain	0236c16e8f	Cache volume attenuation due to earplugs and headgear	2016-02-18 13:48:40 -03:00
esteldunedain	87dd607901	Add a category name to frag settings	2016-02-18 12:28:00 -03:00
esteldunedain	a8131f597a	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reflectionsDefaultOff	2016-02-18 12:18:51 -03:00
commy2	50b04d937b	Merge pull request #3278 from acemod/removeragdolls ... remove old ragdoll tweaks	2016-02-18 14:46:21 +01:00
commy2	cf4f47160f	Merge pull request #3275 from acemod/realnamebadger ... correct name for wheeled apc 01 cannon	2016-02-18 14:44:24 +01:00
commy2	be8f7f9cc0	Merge pull request #3276 from acemod/156selectapply ... replace filter and map with select and apply	2016-02-18 14:23:02 +01:00
esteldunedain	88eae19646	Replace execRemoteFnc in ace_medical	2016-02-17 22:54:43 -03:00
PabstMirror	be742c13cd	Merge branch 'master' into 155selectRandom	2016-02-17 15:58:19 -06:00
PabstMirror	c456e1a631	Merge pull request #3214 from acemod/cba23 ... Changes for CBA 2.3	2016-02-17 15:33:42 -06:00
PabstMirror	53d870b62a	Merge pull request #3312 from acemod/passengerInteraction ... Only get passenger actions for selected unit	2016-02-17 15:33:29 -06:00
PabstMirror	77f5aebf73	Merge pull request #3282 from acemod/eventLocationHash ... Use location hash for ace events	2016-02-17 15:32:50 -06:00
Thomas Kooi	a8846e92ee	Merge pull request #2954 from gienkov/nozzleLogic ... nozzle additonal check condition	2016-02-17 21:26:04 +01:00
PabstMirror	dccc1d33fd	Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge	2016-02-17 12:30:03 -06:00
Thomas Kooi	e31e20bd42	Merge pull request #3293 from acemod/fix3270 ... Slightly reduce the distance for which the LOS check is skipped.	2016-02-17 18:39:39 +01:00
Thomas Kooi	26cb6bd6a3	Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant ... Make wound assignment consistent for dll/sqf	2016-02-17 18:34:28 +01:00
Thomas Kooi	8e49c8b1b3	Merge pull request #3323 from acemod/fixVehicleCrashes ... Fix vehicle crashes	2016-02-17 18:32:56 +01:00
PabstMirror	930c2f84c6	Call updateHearingProtection at settings init	2016-02-17 09:49:00 -06:00
PabstMirror	40396fc69e	Remove debug	2016-02-17 09:37:08 -06:00
PabstMirror	649b0c28e2	Calculate hearing protection coefficient on events	2016-02-16 18:17:42 -06:00
PabstMirror	8fed9325c9	Fix flashbang	2016-02-16 13:02:25 -06:00
PabstMirror	749425dfb7	Settings Category, Minor Cleanup	2016-02-16 12:58:42 -06:00
PabstMirror	f1797feead	Make wound assignment consistent for dll/sqf ... Dll now exits on first match for threshold damage (exitWith) Remove random wound in sqf to match dll Fix backblast threshold order Add lower vehiclecrash threshold Add dll version logging	2016-02-16 12:19:18 -06:00
commy2	1bc73af1c9	remove ace fake weapon from 3den cargo editor	2016-02-16 16:11:18 +01:00
PabstMirror	5c9dfd7dc5	Handle enemy causing veh explode, fix revive unload ... Fix #3269	2016-02-15 22:23:37 -06:00
PabstMirror	9441b548be	Fix vehicle crashes not being fatal to non-drivers ... Fix #3306	2016-02-15 17:11:04 -06:00
PabstMirror	d88f10b8e0	Merge pull request #3318 from acemod/restricMagPass ... Don't allow passing mags when not in same veh	2016-02-15 11:41:18 -06:00
PabstMirror	4a8b032c1f	Don't allow passing mags when not in same veh	2016-02-14 14:53:04 -06:00
PabstMirror	985af4502c	Merge pull request #3313 from ivankrouglyi/patch-1 ... Update fnc_treatment_success.sqf	2016-02-14 13:27:08 -06:00
VKing	74d410688f	Add check so vanilla magazines can't be unloaded	2016-02-14 14:10:28 +01:00
VKing	560c509a3a	Changed to using playerVehicleChanged.	2016-02-14 13:51:44 +01:00
Glowbal	ff86359247	Merge branch 'master' into medical-focus-feature	2016-02-13 19:51:45 +01:00
Nicolás Badano	7bbdcbc054	Merge pull request #3280 from acemod/unifiedFiredEH ... Unified fired event handler	2016-02-13 15:13:18 -03:00
esteldunedain	e2ed38609d	Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH)	2016-02-13 15:04:43 -03:00
Ivan Krouglyi	0a226b5ee9	Update fnc_treatment_success.sqf ... Error at 84 line - you forget ";"	2016-02-13 03:29:42 +03:00
PabstMirror	54b350a6c0	Only get passenger actions for selected unit ... Fix #1690 #3309	2016-02-12 15:57:16 -06:00
Githawk	17cba965c3	Deactivate laser_sefldesignate on Comanche	2016-02-11 20:27:46 +01:00
Githawk	c38b028c3a	Fixing driver gun ... Magazines from driver gun don't get removed	2016-02-11 19:06:37 +01:00
Githawk	9619fc7fb5	Changes to DAGR ... Allow laserLock, set weaponLockSystem to Laser and move class ADDON to ACE_Hydra70_DAGR	2016-02-11 16:39:53 +01:00
PabstMirror	ff4ba98e68	Pre-load again on mission load (save game)	2016-02-10 11:50:30 -06:00
licht-im-Norden87	5577a1b4bb	Merge pull request #31 from licht-im-Norden87/patch-42 ... trenches	2016-02-10 18:15:14 +01:00
licht-im-Norden87	4fb705e0f9	Update stringtable.xml ... Eigentlich ist Graben ja das falsche Wort, da es in Arma gar nicht möglich ist in die Tiefe zu graben....	2016-02-10 18:14:51 +01:00
licht-im-Norden87	020deb4407	Update stringtable.xml	2016-02-10 18:14:03 +01:00
licht-im-Norden87	adbfa378b1	Update stringtable.xml	2016-02-10 18:12:36 +01:00
licht-im-Norden87	a5597ade89	Merge pull request #30 from licht-im-Norden87/patch-41 ... spectator	2016-02-10 18:06:13 +01:00
licht-im-Norden87	e8a35f3c20	spectator ... Bitte einmal z. 259,268,377 überprüfen!	2016-02-10 18:05:51 +01:00
licht-im-Norden87	0c268b90dc	Merge pull request #29 from licht-im-Norden87/patch-39 ... overheating	2016-02-10 17:35:56 +01:00
licht-im-Norden87	9419e7daf3	overheating	2016-02-10 17:35:36 +01:00
licht-im-Norden87	7bed10d14b	Merge pull request #28 from licht-im-Norden87/patch-38 ... optionsmenu	2016-02-10 17:32:32 +01:00
licht-im-Norden87	51b57b962b	Update stringtable.xml	2016-02-10 17:32:19 +01:00
licht-im-Norden87	cabbc4b6a9	optionsmenu	2016-02-10 17:31:26 +01:00
licht-im-Norden87	c663feed49	Merge pull request #27 from licht-im-Norden87/patch-37 ... nightvision	2016-02-10 17:26:23 +01:00
licht-im-Norden87	864ae484d4	nightvision	2016-02-10 17:26:08 +01:00
licht-im-Norden87	b352b9b024	Merge pull request #26 from licht-im-Norden87/patch-36 ... captives	2016-02-10 17:20:13 +01:00
licht-im-Norden87	39e26b0f11	captives	2016-02-10 17:19:42 +01:00
licht-im-Norden87	ffb3367a50	Merge pull request #25 from licht-im-Norden87/patch-35 ... common	2016-02-10 17:17:47 +01:00
licht-im-Norden87	b9083f1712	common	2016-02-10 17:17:26 +01:00
licht-im-Norden87	c806bfb721	Merge pull request #24 from licht-im-Norden87/patch-34 ... flashlight	2016-02-10 17:14:37 +01:00
licht-im-Norden87	d52c6cb984	flashlight	2016-02-10 17:13:52 +01:00
licht-im-Norden87	a725553a95	commy2	2016-02-10 17:11:24 +01:00
licht-im-Norden87	b617dee302	Merge pull request #23 from licht-im-Norden87/patch-33 ... cargo	2016-02-10 17:09:05 +01:00
licht-im-Norden87	b1990b1586	Update stringtable.xml	2016-02-10 17:08:48 +01:00
licht-im-Norden87	3583e95e1f	cargo	2016-02-10 17:07:05 +01:00
licht-im-Norden87	35b0b11fff	Merge pull request #22 from licht-im-Norden87/patch-32 ... Gestures	2016-02-10 17:03:21 +01:00
licht-im-Norden87	6481a0fbb8	Gestures	2016-02-10 17:02:54 +01:00
licht-im-Norden87	71682bc2f3	Merge pull request #21 from licht-im-Norden87/patch-31 ... headless	2016-02-10 16:58:21 +01:00
licht-im-Norden87	c0a9d6a0e8	headless	2016-02-10 16:57:56 +01:00
licht-im-Norden87	3eaf466994	Merge pull request #20 from licht-im-Norden87/patch-30 ... hearing	2016-02-10 16:57:24 +01:00
licht-im-Norden87	99f6c79573	Update stringtable.xml	2016-02-10 16:57:12 +01:00
licht-im-Norden87	8971f4db1e	Update stringtable.xml	2016-02-10 16:56:15 +01:00
licht-im-Norden87	a9252c1b5d	Merge pull request #19 from licht-im-Norden87/patch-29 ... Interact menu	2016-02-10 16:49:46 +01:00
licht-im-Norden87	61bd04a390	Interact menu	2016-02-10 16:49:00 +01:00
licht-im-Norden87	e2d4589bb0	Merge pull request #18 from licht-im-Norden87/patch-28 ... Hunt IR	2016-02-10 16:42:35 +01:00
licht-im-Norden87	8ef2905e99	Hunt IR	2016-02-10 16:42:03 +01:00
licht-im-Norden87	53f8b14a7c	Merge pull request #17 from licht-im-Norden87/patch-27 ... Adv. ballistic	2016-02-10 16:41:00 +01:00
licht-im-Norden87	17a16d1bad	Adv. ballistic	2016-02-10 16:40:07 +01:00
licht-im-Norden87	49ee49a5b7	Merge pull request #16 from licht-im-Norden87/patch-26 ... magazine repack	2016-02-10 16:29:32 +01:00
licht-im-Norden87	ed1047e199	magazine repack	2016-02-10 16:26:03 +01:00
licht-im-Norden87	03b4a0e8fb	Update German Stringtable	2016-02-10 16:24:18 +01:00
commy2	82086efca0	manual merge	2016-02-10 10:11:33 +01:00
PabstMirror	e1b83b8172	Manually pre-load for StaticWeapons and Car ... Fix #3168	2016-02-09 22:43:38 -06:00
SzwedzikPL	388b00f58c	remove unnecessary code, aesthetic tweak	2016-02-10 01:38:14 +01:00
SzwedzikPL	0c80551fd8	ace attribute category, lower case classes	2016-02-10 01:17:18 +01:00
gienkov	d5dd718b8d	fix endlines	2016-02-09 12:01:13 +01:00
gienkov	fafd25dee7	pl translation	2016-02-09 11:50:35 +01:00
gienkov	8048b2ecbd	lazy evaluation fix	2016-02-09 09:35:16 +01:00
esteldunedain	b02a67605c	Revert to normal testing for units on foot	2016-02-09 00:19:18 -03:00
esteldunedain	0f41c5bf13	Only test the GEOM LOD for visibility	2016-02-09 00:01:51 -03:00
esteldunedain	d4eda6d4ec	Show tags for units inside the player vehicle. Close #538.	2016-02-08 22:54:24 -03:00
esteldunedain	cebc8a2d07	Slightly reduce the distance for which the LOS check is skipped. Fix #3270	2016-02-08 19:19:10 -03:00
esteldunedain	4c938a050b	Fix for combination of "Only Cursor + Keypress" and "Always Show Sound Waves"	2016-02-08 17:57:24 -03:00
esteldunedain	a47f7b8162	Fix cursor mode	2016-02-08 17:18:03 -03:00
esteldunedain	c43b3bd5c1	Switch	2016-02-08 17:14:18 -03:00
esteldunedain	b2e9dd0149	Fix _vecy	2016-02-08 17:03:18 -03:00
esteldunedain	73499489e0	Revert "Optimized EFUNC(common,cachedCall)" ... This reverts commit b358c4a8af.	2016-02-08 16:45:16 -03:00
esteldunedain	1b912cdca0	Switch back to modelToWorldVisual. Perf is about the same and it moves smoothly with the model.	2016-02-08 16:38:26 -03:00
esteldunedain	b358c4a8af	Optimized EFUNC(common,cachedCall)	2016-02-08 16:09:14 -03:00
esteldunedain	62fb26200f	Nametags optimization	2016-02-08 15:36:56 -03:00
esteldunedain	94977ffe5c	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nametagsOptimization	2016-02-08 12:52:49 -03:00
SzwedzikPL	94ea26c7b9	typo fix	2016-02-08 00:14:55 +01:00
SzwedzikPL	3bfac35b65	ace repair and medical attributes	2016-02-07 23:56:45 +01:00
Glowbal	e754c89c73	Remove non functional event driven handleDamage	2016-02-07 13:18:19 +01:00
Glowbal	575f362fb6	Add setting for limiting usage of Epinephrine in basic medical #1792 ... Part of focus feature medical #3134. Default settings are inline with old default.	2016-02-07 13:10:38 +01:00
VKing	f92b798586	Switch to select (is even slightly faster)	2016-02-07 13:09:01 +01:00
VKing	f1cc2ddd51	Change to apply in fcs	2016-02-07 13:08:31 +01:00
Glowbal	bfd90cd5d3	Add Adenosine to replace atropine #1573	2016-02-07 12:54:23 +01:00
Glowbal	39cf11367f	improve medical bandage configuration	2016-02-07 12:37:00 +01:00
Glowbal	84878c3d8b	Merge branch 'master' into medical-focus-feature	2016-02-07 12:11:25 +01:00
esteldunedain	2b1c312d13	Make explosion reflections optional, default off	2016-02-06 23:46:40 -03:00
esteldunedain	b6058242c8	Fix frag fired EH name	2016-02-06 22:20:08 -03:00
esteldunedain	e4122cf42f	Fix winddeflection fire eh	2016-02-06 21:00:42 -03:00
esteldunedain	8fbb6cd72e	Fixed event parameters	2016-02-06 20:49:18 -03:00
esteldunedain	a51372a6b3	Add the TRACE_10 macro	2016-02-06 20:28:16 -03:00
esteldunedain	b7d94f5363	Apply the ufeh to ACE_Advanced_Ballistics	2016-02-06 18:48:26 -03:00
esteldunedain	94ef0c5659	Apply the ufeh to ACE_WindDeflection	2016-02-06 18:36:20 -03:00
PabstMirror	1e66cd406b	Use location hash for ace events	2016-02-06 15:27:53 -06:00
esteldunedain	25b767a16b	Apply the ufeh to ACE_WeaponSelect	2016-02-06 18:27:43 -03:00
esteldunedain	cdfdfffff6	Apply the ufeh to ACE_Scopes	2016-02-06 18:24:48 -03:00
esteldunedain	12d7a171e5	Apply the ufeh to ACE_Recoil	2016-02-06 18:21:43 -03:00
esteldunedain	69dea087ca	Apply the ufeh to ACE_Overpressure	2016-02-06 18:17:27 -03:00
esteldunedain	5aa763f0c6	Apply the ufeh to ACE_Overheating	2016-02-06 17:59:54 -03:00
esteldunedain	5b3df2bcf7	Apply the ufeh to ACE_Optics	2016-02-06 17:50:35 -03:00
esteldunedain	33bcd6d9f9	Fix	2016-02-06 17:44:34 -03:00
esteldunedain	45b6b8467d	Apply the ufeh to ACE_Nightvision	2016-02-06 17:42:44 -03:00
esteldunedain	7ace1738c0	Apply the ufeh to ACE_HuntIr	2016-02-06 17:29:05 -03:00
esteldunedain	0b9695ce70	Apply the ufeh to ACE_Grenades	2016-02-06 17:20:30 -03:00
esteldunedain	ac3f75c8b4	Apply the ufeh to ACE_Goggles	2016-02-06 17:16:10 -03:00
esteldunedain	b70ae9207c	Apply the ufeh to ACE_Frag	2016-02-06 17:12:28 -03:00
esteldunedain	fe66d93275	Added ignore private warnings + trace	2016-02-06 17:07:05 -03:00
esteldunedain	37bc67c951	Create a _vehicle variable	2016-02-06 16:55:36 -03:00
esteldunedain	efbff8cc23	Pass the turret path too	2016-02-06 16:49:53 -03:00
esteldunedain	59cbc6da10	Remove unneeded test in FCS fireEH	2016-02-06 16:49:27 -03:00
esteldunedain	a084373574	Apply the ufeh to ACE_Disposable	2016-02-06 16:39:08 -03:00
esteldunedain	b2bd11ed77	Apply the ufeh to ACE_FCS	2016-02-06 16:29:58 -03:00
esteldunedain	6d9068e306	gunner to lowercase	2016-02-06 16:26:57 -03:00
esteldunedain	72b262f634	Simplified parameter names	2016-02-06 16:22:23 -03:00
esteldunedain	588f76b3f1	Learning to count	2016-02-06 16:12:18 -03:00
esteldunedain	89354e25c8	Unified fired event handler	2016-02-06 16:09:48 -03:00
esteldunedain	698b934801	Increase the volume of the residual woosh when ringing is disabled	2016-02-06 14:49:56 -03:00
esteldunedain	9a8dd3e2ad	Fix stringtable	2016-02-06 14:49:28 -03:00
esteldunedain	354ed0cab2	Trace instead of sideChat	2016-02-06 14:11:18 -03:00
esteldunedain	2f1e96ae4f	Overhaul ACE_Hearing and change default settings.	2016-02-06 13:59:31 -03:00
commy2	baf979064a	remove old ragdoll tweaks	2016-02-06 17:45:47 +01:00
commy2	0a9048815b	simlify some select CODE statements	2016-02-06 14:59:31 +01:00
commy2	ac007e6995	replace more map with apply	2016-02-06 12:08:04 +01:00
commy2	41e39c9c3a	replace more filter with select	2016-02-06 11:58:31 +01:00
commy2	2ebd2f9046	replace filter and map with select and apply	2016-02-06 11:42:35 +01:00
PabstMirror	d69af47030	Merge branch 'master' of https://github.com/acemod/ACE3	2016-02-05 16:49:39 -06:00
PabstMirror	e3e9d19ca1	Fix "key" capitalization for Interaction_GetOut	2016-02-05 16:49:36 -06:00
commy2	ec4a4ef67f	correct capitalization for German translation	2016-02-05 22:21:27 +01:00
commy2	7f6b17cdbc	correct name for wheeled apc 01 cannon	2016-02-05 22:19:27 +01:00
commy2	0032e7aa9a	Merge pull request #3267 from acemod/removeSwagWalkFix ... Remove Swag Walk Fix	2016-02-05 21:59:57 +01:00
PabstMirror	9b3ca2822f	Change german stringtable	2016-02-05 14:46:30 -06:00
commy2	f33beb9865	update movement config comments	2016-02-05 21:31:08 +01:00
commy2	d89c93de22	setAllGear - abort function and print warning when used on remote units,	2016-02-05 21:14:20 +01:00
PabstMirror	deac4395c1	Deadman switch - trigger explosives in inventory ... Also allow manual triggering of the deadman device	2016-02-05 11:40:11 -06:00
Nicolás Badano	027de27e33	Merge pull request #3268 from acemod/fix3140 ... Document the locality requirements of fnc_setAllGear.	2016-02-05 10:19:57 -03:00
esteldunedain	dbe7e294a5	Document the locality requirements of fnc_setAllGear. Close #3140	2016-02-05 10:18:36 -03:00
esteldunedain	b2d050afca	Close #3188, Close #3260	2016-02-05 09:46:51 -03:00
Nicolás Badano	d26fc4614f	Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix ... Fix overheating stringtable	2016-02-05 09:35:29 -03:00
Thomas Kooi	0850ab35e3	Merge pull request #3262 from acemod/nozzleFixes ... fix some issues with Fuel Nozzle	2016-02-05 09:15:27 +01:00
Thomas Kooi	f47b51c0cb	Merge pull request #3070 from dixon13/newCivInteraction ... Changes to civilian interaction	2016-02-05 09:14:45 +01:00
dixon13	a0e6f97125	Updated condition for ACE_GetOut	2016-02-05 00:32:56 -07:00
SzwedzikPL	270b557084	fix overheating stringtable	2016-02-05 04:55:05 +01:00
SzwedzikPL	5f0a2b1945	use event system, polish translation	2016-02-05 04:26:54 +01:00
Nicolás Badano	dadec15948	Merge pull request #2104 from acemod/trenches ... Trenches	2016-02-04 23:43:06 -03:00
SzwedzikPL	374b015ee4	major cleanup	2016-02-05 03:41:18 +01:00
SzwedzikPL	ab297ff97e	more readable macro	2016-02-05 02:03:25 +01:00
SzwedzikPL	a9d57e0d1c	fnc_switchLamp cleanup	2016-02-05 02:02:46 +01:00
SzwedzikPL	7b8be590b4	Merge branch 'acemod/master' into interactions_lamps	2016-02-05 01:43:06 +01:00
esteldunedain	b6581cf5ef	Fix #3264	2016-02-04 21:00:40 -03:00
esteldunedain	2577992dfc	Progress bar localization	2016-02-04 20:43:32 -03:00
esteldunedain	7da6e2a35f	Reduce the placement distance	2016-02-04 18:47:30 -03:00
esteldunedain	8c187cbf07	Adjust big trench height	2016-02-04 18:47:17 -03:00
esteldunedain	4cd0028794	Add animation and progresive digging	2016-02-04 18:43:47 -03:00
esteldunedain	3d47156547	Rename some variables	2016-02-04 17:42:12 -03:00
esteldunedain	2d45a28863	Merge branch 'master' into trenches	2016-02-04 17:04:09 -03:00
jokoho48	dc3026366a	remove unneeded files ... fix hard edge in model add LOD	2016-02-04 20:52:28 +01:00
Glowbal	8c0472bbeb	Merge branch 'master' of github.com:acemod/ACE3	2016-02-04 20:35:15 +01:00
VKing	f652db1d2f	Add Loadout box for easy conversion	2016-02-04 20:35:00 +01:00
Glowbal	f1ce133d32	Merge branch 'release' ... Conflicts: addons/refuel/functions/fnc_connectNozzle.sqf	2016-02-04 20:34:32 +01:00
Thomas Kooi	653f6567cc	Fix french translation refresh marker interval ... As per @alganthe's comment on #3114	2016-02-04 20:30:51 +01:00
Thomas Kooi	543d54d37e	Merge pull request #3114 from Luigium/master ... Fixed and added French Translation	2016-02-04 20:28:00 +01:00
Glowbal	376b611b89	Merge branch 'master' into Mortar_interact	2016-02-04 20:21:03 +01:00
Thomas Kooi	727cb38be6	Merge pull request #3218 from SzwedzikPL/fix3202 ... Fix laser_selfdesignate does not measure the distance	2016-02-04 20:17:06 +01:00
PabstMirror	54870f872a	Disable Debug	2016-02-04 13:16:41 -06:00
Nicolás Badano	c967bd1ace	Merge pull request #3259 from acemod/fix3denGoggles ... Fix ACE_goggle changing the tint on the 3den camera	2016-02-04 16:08:02 -03:00
Nicolás Badano	cbafe05f76	Merge pull request #3082 from acemod/deterministicOverheatingX ... Deterministic overheating (updated)	2016-02-04 16:03:30 -03:00
Thomas Kooi	dd3613c357	Merge pull request #3190 from acemod/fcs_enableGMG ... Add FCS to more things	2016-02-04 20:03:19 +01:00
Thomas Kooi	893040b08a	Merge pull request #3102 from buddytex/SandbagEditor ... Add Sandbag to editor	2016-02-04 20:00:51 +01:00
Thomas Kooi	f26fb9e9da	Merge pull request #3107 from jonpas/headless ... Add Dynamic AI Group Tranferring to Headless Clients	2016-02-04 20:00:16 +01:00
Thomas Kooi	a3f80dbc30	Merge pull request #3230 from acemod/draggingStuff ... Fix dragging moving object to random location	2016-02-04 19:58:56 +01:00
Thomas Kooi	ce27575de3	Merge pull request #3244 from acemod/fixScopesCapturingKeys ... Fix ace_scopes capturing native adjustment keys for the PSO scope.	2016-02-04 19:58:21 +01:00
Thomas Kooi	508f6a16ae	Merge pull request #3162 from acemod/Refuel_Fuelbladders ... Refuel - Add refuel actions to fuel bladder objects	2016-02-04 19:57:50 +01:00
Thomas Kooi	8c9523e36b	Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers ... Various explosives enhancements	2016-02-04 19:56:27 +01:00
Thomas Kooi	e0946c3fc5	Merge pull request #3106 from acemod/explEvents ... Explosive events, fix #3104	2016-02-04 19:52:10 +01:00
PabstMirror	35333cbe9d	Merge branch 'cargoCleanup'	2016-02-04 12:51:52 -06:00
Thomas Kooi	3e5908faf8	Merge pull request #3018 from jonpas/fixFuelHoseExceededAfterDisconnect ... Fix refuel PFH not exiting on nozzle disconnect	2016-02-04 19:47:52 +01:00
Thomas Kooi	038befbce0	Merge pull request #3191 from acemod/cargoCleanup ... Cargo Cleanup, Add makeLoadable	2016-02-04 19:44:27 +01:00
Thomas Kooi	324edbde6d	Merge pull request #3192 from acemod/getTargetDistance_to_LIS ... Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.	2016-02-04 19:42:32 +01:00
Thomas Kooi	6cf02bd06b	Merge pull request #3193 from acemod/fcs_rewriteRangeFunctions ... Cleaning up the FCS code	2016-02-04 19:39:32 +01:00
Thomas Kooi	d68c79efb1	Merge pull request #3204 from acemod/m67_dns ... Fix Handgrenade DisplayNameShort	2016-02-04 19:37:20 +01:00
Thomas Kooi	69746a133b	Merge pull request #3254 from ProfessorCZ/master ... Czech Translation - Update	2016-02-04 19:36:28 +01:00
Thomas Kooi	8034d91d76	Merge pull request #3249 from GitHawk/refuel_nozzle ... Added a real nozzle	2016-02-04 19:32:17 +01:00
Thomas Kooi	d72c73dc25	Merge pull request #3257 from acemod/flashbangUnderwater ... Flashbangs - pass pos instead of obj reference	2016-02-04 19:31:11 +01:00
Thomas Kooi	dc8e7e2994	Merge pull request #3255 from acemod/tourniquetMedications ... Tourniquets block medication until released	2016-02-04 19:30:40 +01:00
PabstMirror	336184dfaa	Change medication removal from array	2016-02-04 10:00:33 -06:00
esteldunedain	c87f19c8da	Fix #3258	2016-02-04 10:04:26 -03:00
PabstMirror	2cf2cb0e59	Fix statusEffect error in refuel	2016-02-04 01:31:12 -06:00
PabstMirror	7fc84c60dd	Flashbangs - pass pos instead of obj reference ... Fix #3205	2016-02-03 17:53:24 -06:00
PabstMirror	3cc10a27ce	Tourniquets block medication until released ... Close #2704	2016-02-03 14:40:26 -06:00
ProfessorCZ	61611d0ec7	Czech Translation - Update ... Update	2016-02-03 18:31:31 +01:00
PabstMirror	397a12056a	Merge branch 'master' into deterministicOverheatingX	2016-02-02 17:11:00 -06:00
Githawk	979ceb7ad7	Fixed rearm unholster macro	2016-02-02 16:04:50 +01:00
Githawk	cbeac7f154	params stuff	2016-02-02 15:47:05 +01:00
Githawk	4d403d21aa	Fixes ... Moved models into data fixed vehicle attach for certain angles	2016-02-02 15:45:57 +01:00
Githawk	5e103ba398	Added nozzle ... Added code for nozzle object Params and private update	2016-02-02 15:03:06 +01:00
Githawk	475351fcfa	Some bracket errors	2016-02-01 20:21:20 +01:00
Githawk	cc624f58dd	Fixes and updates	2016-02-01 20:05:53 +01:00
esteldunedain	f744e164d3	Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0	2016-02-01 14:58:01 -03:00
PabstMirror	46d6e92bca	Add quick debug defines to all script_components	2016-01-28 23:26:02 -06:00
PabstMirror	af6b084ba3	Don't allow carrying with injured legs ... Fix #2644	2016-01-28 23:05:55 -06:00
PabstMirror	c0eccc67c3	Change all SCALAR to NUMBER in headers	2016-01-28 18:19:15 -06:00
PabstMirror	3f1d6ffeb7	Fix dragging sending objects to random location ... attachTo seems to have weird getpos results for a few frames. also don't show mouse wheel option for carrying man and always use 0 offset for dragging man	2016-01-28 17:11:05 -06:00
PabstMirror	d9eafbdf0f	Privates / Headers	2016-01-28 12:52:53 -06:00
PabstMirror	84e76efc7f	Not needed on CfgMagazines	2016-01-27 15:54:45 -06:00
esteldunedain	2eb91cf2b4	Delete spare models	2016-01-27 18:23:04 -03:00
PabstMirror	7a7e0d689a	Improve underwater cargo unloading	2016-01-27 14:56:25 -06:00
esteldunedain	d2d7e46401	Align trench to ground surface to avoid having to lower them too much on slopes	2016-01-27 17:54:40 -03:00
esteldunedain	b20a2f338b	Replace trench models: bigger and opaque	2016-01-27 17:54:10 -03:00
PabstMirror	17a882fe4d	Add findUnloadPosition integration	2016-01-26 18:01:01 -06:00
esteldunedain	f8a1215264	Align trenches to ground	2016-01-26 11:03:11 -03:00
esteldunedain	0358b10298	Bigger trenches	2016-01-26 11:02:55 -03:00
PabstMirror	b15716860d	Remove VehicleLock Items from Virtual Arsenal ... Close #3215	2016-01-25 14:29:27 -06:00
SzwedzikPL	03fca3c372	fix fcs keyup/down forced params #3202	2016-01-25 09:49:47 +01:00
esteldunedain	3e25f9c5f0	Cache drawIcon3D parameters	2016-01-24 17:12:25 -03:00
esteldunedain	351d20ec32	Cache near object CAManBase that are on LOS instead of recomputing each frame	2016-01-24 17:12:06 -03:00
PabstMirror	276aea04c1	Changes for CBA 2.3	2016-01-24 11:41:10 -06:00
PabstMirror	78729e96ff	Fix bad forceWalk params	2016-01-24 11:39:59 -06:00
esteldunedain	0fd6981809	Don't allow placing is standig above the terrain level	2016-01-23 22:05:29 -03:00
esteldunedain	4970423cd7	Cancel placing if position is no longer suitable	2016-01-23 22:04:49 -03:00
esteldunedain	8ff8204905	Initial code implementation of ace_trenches	2016-01-23 20:45:59 -03:00
esteldunedain	1d886ac624	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2016-01-23 17:39:54 -03:00
esteldunedain	dec9235810	Periodically test all tags on objects for corner cases	2016-01-23 16:47:00 -03:00
esteldunedain	431a21044a	Tabs be damned.	2016-01-23 16:37:30 -03:00
esteldunedain	74b6036f3e	Handle destruction of tags placed on objects that don't support handledamage.	2016-01-23 16:24:55 -03:00
esteldunedain	e31636539a	Allow tagging wrongly configured static objects.	2016-01-23 16:21:43 -03:00
esteldunedain	b020d88963	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into taggingX	2016-01-23 15:14:32 -03:00
esteldunedain	758611d230	Restrict temp update to current weapon, and only primary or handgun	2016-01-23 11:48:23 -03:00
PabstMirror	3a62956e24	Fix wind display angle being reversed	2016-01-22 20:43:22 -06:00
PabstMirror	5df211c586	Merge pull request #3126 from acemod/weatherCleanup ... Weather cleanup, fix wind inversion, add non-color based wind speed indicator	2016-01-22 14:56:21 -06:00
PabstMirror	73b29085e2	Merge pull request #3200 from acemod/moreCache ... Hearing - Cache Weapon/Ammo loudness	2016-01-22 14:56:00 -06:00
PabstMirror	45138aea18	Merge pull request #3163 from acemod/unifiedStatusEffects ... Unified status effect handler	2016-01-22 14:55:25 -06:00
VKing	9501c54530	Fix #3203 IEDs magically changing shape	2016-01-22 14:21:25 +01:00
VKing	68531bd4a9	Merge branch 'master' into explosives_cleanup_plus_minetriggers	2016-01-22 14:15:45 +01:00
VKing	1cf7fc727d	Fix Handgrenade DisplayNameShort	2016-01-22 13:12:20 +01:00
PabstMirror	1a98726716	Add makeLoadable sync module	2016-01-21 22:12:54 -06:00
VKing	999d8ac2ce	Use max	2016-01-22 00:01:13 +01:00
esteldunedain	ad96617d3a	- Tagging cleanup. ... - Replaced "Tag wall" and "Tag ground" for a single "Tag" action. - Added more reliable checks before placing the tag - Allowed non-player units to tag (via API). - Replaced execRemoteFnc by events	2016-01-21 19:59:27 -03:00
esteldunedain	a22203a02a	Replace player for ACE_player	2016-01-21 14:39:20 -03:00
VKing	8482d45d8b	Add FCS to gunner and commander RCWS types for MRAPs, APCs, and arty. ... Lower max range to 5500m (9990 is too damn high!)	2016-01-21 16:00:55 +01:00
VKing	299baf1e4a	Fix shotbullet checking (lost in merge)	2016-01-21 15:56:53 +01:00
VKing	fedfa94dcd	Clean up	2016-01-21 15:01:41 +01:00
VKing	4406f270e2	Fix infantry rangefinders (again)	2016-01-21 14:44:23 +01:00
esteldunedain	91b7c7de61	Change the varname of the weapon data cache to be consistent with other modules	2016-01-20 22:22:53 -03:00
esteldunedain	41f8628917	Change cache location type to ACE_HashLocation	2016-01-20 22:20:16 -03:00
esteldunedain	f7cfbebc49	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX	2016-01-20 22:19:11 -03:00
VKing	bf5eb78788	Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions ... # Conflicts: # addons/fcs/functions/fnc_keyUp.sqf	2016-01-21 02:14:51 +01:00
VKing	b83be88571	Enhance ranging. ... KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal. Sorry in advance for the merge conflicts	2016-01-21 02:02:50 +01:00
VKing	7d3044a5c2	Move display update stuff to fnc_getRange	2016-01-21 00:20:21 +01:00
PabstMirror	be8afe507c	Few more privates	2016-01-20 17:19:08 -06:00
PabstMirror	3dac426bc6	Merge pull request #3132 from acemod/interactionMenuCleanup ... Cleanup Interaction Menu	2016-01-20 17:04:10 -06:00
PabstMirror	abb01e0653	Merge pull request #3129 from acemod/frag-cacheIfWillFrag ... Frag - only run addPfhRound on ammo that will frag (for master)	2016-01-20 17:03:55 -06:00
VKing	43ab126c1f	Add FCS to botes RCWS	2016-01-20 23:06:06 +01:00
esteldunedain	e113853395	Merge branch 'master' into tagging	2016-01-20 18:51:41 -03:00
VKing	5f14d17f98	Another fix for BIS' inconsistent implementations	2016-01-20 22:30:22 +01:00
Thomas Kooi	232fe62d8d	Merge pull request #3195 from acemod/fix3194 ... Fix typo in ACE_hearing config	2016-01-20 22:26:13 +01:00
esteldunedain	9d13cc6f60	Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments.	2016-01-20 15:19:46 -03:00
esteldunedain	851615a234	Inherit custom gesture classes.	2016-01-20 13:44:51 -03:00
esteldunedain	7860f375c2	Better func description	2016-01-20 13:07:51 -03:00
esteldunedain	89106f6953	Replace addPerFrameHandler for waitAndExecute	2016-01-20 13:05:47 -03:00
esteldunedain	80b9a8961a	Improve reload animations	2016-01-20 12:48:39 -03:00
PabstMirror	a140f29784	Remove inherited classes that were not used	2016-01-20 09:45:03 -06:00
esteldunedain	bce572e1df	Derp	2016-01-20 12:15:25 -03:00
esteldunedain	19ccf52425	MRBS to mrbs	2016-01-20 12:05:35 -03:00
VKing	43c9444fb8	Didn't need that isNil check, anyway	2016-01-20 15:51:07 +01:00
esteldunedain	1a115e7f9c	Fix #3194	2016-01-20 11:48:12 -03:00
esteldunedain	6b4b8b707c	Prefix new configs for consistency	2016-01-20 11:42:05 -03:00
esteldunedain	2f7cac68a5	Small fixes	2016-01-20 10:59:58 -03:00
VKing	a9511936fd	LayZ evaluation	2016-01-20 12:35:53 +01:00
Glowbal	34613b42f2	Increase heart rate increase speed #3134	2016-01-20 11:49:10 +01:00
VKing	05ce4f824c	Rewrite fnc_getRange to work with specified minimum and maximum ranges ... Also cleaning up fnc_keyUp a bit	2016-01-20 00:10:27 +01:00
VKing	757436140b	fnc_getTargetDistance rewritten to use LineIntersectsSurfaces. ... Turns out it wasn't really needed after all, but better is better :p	2016-01-20 00:06:06 +01:00
PabstMirror	3d4fc66bb1	Cargo Cleanup, Add makeLoadable	2016-01-19 14:51:58 -06:00
esteldunedain	c78f2f8479	Gotcha travis	2016-01-19 17:29:58 -03:00
esteldunedain	5b90fd8b81	Set default particle effect on for the local player, as per current and historic behaviour.	2016-01-19 17:25:14 -03:00
esteldunedain	9bcabd081b	Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off).	2016-01-19 17:24:01 -03:00
VKing	968f7c000b	Simplify	2016-01-19 21:16:41 +01:00
SilentSpike	ca5f6df3d0	Merge pull request #3147 from acemod/spectatorBandAid ... Restart specatator display if player in unitList	2016-01-19 20:15:24 +00:00
VKing	c8bcf44561	Increase M307 FCS range	2016-01-19 21:08:03 +01:00
esteldunedain	8b7ed38990	Add a PFH to cool down all player weapons at (infrequent) regular intervals	2016-01-19 17:04:51 -03:00
esteldunedain	0313e7b322	Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately	2016-01-19 17:03:47 -03:00
esteldunedain	782934c4b2	Add the setApproximateVariablePublic function to common	2016-01-19 16:58:07 -03:00
VKing	ae576e57e3	Fix the magazine name being broken in later code	2016-01-19 20:21:37 +01:00
esteldunedain	3792acd7f7	Merge branch 'master' into deterministicOverheatingX	2016-01-19 15:57:38 -03:00
VKing	59923710b7	Fix FCS not taking weapon initSpeed into account in some circumstances	2016-01-19 19:52:18 +01:00
VKing	838945c1db	Add FCS for the M307 GMG	2016-01-19 18:53:42 +01:00
PabstMirror	04bccf47d7	Replace all use of deprecated commands	2016-01-19 09:39:07 -06:00
esteldunedain	8e2d489312	Add warnings to deprecated functions	2016-01-19 09:39:06 -06:00
PabstMirror	7e84a9d9b0	Add getter, readd old public funcs, add blockSprint	2016-01-19 09:39:06 -06:00
PabstMirror	d2e006397d	cleanup, don't setVar public if no change	2016-01-19 09:39:05 -06:00
PabstMirror	9a3972de76	Unified Status Effect Handler	2016-01-19 09:39:05 -06:00
Thomas Kooi	b99be6122b	Merge pull request #3187 from acemod/fixFCS ... Add missing FUNC to FCS key (Rangefinders)	2016-01-19 16:05:56 +01:00
PabstMirror	6d6cbec5ef	Add missing FUNC to FCS key (Rangefinders) ... #3160	2016-01-19 09:02:51 -06:00
Thomas Kooi	c439036abe	Deprecate execPersistentFnc 3.7.0 ... Remove functions the second update after deprecation.	2016-01-19 15:55:33 +01:00
Thomas Kooi	a612bdecf2	Deprecate execRemoteFnc in 3.7.0 ... Remove functions the second update after deprecation.	2016-01-19 15:54:59 +01:00
PabstMirror	69771d531d	Merge pull request #3173 from acemod/fixInvintoryLock ... Fix Vehicle inventory is not locked	2016-01-19 08:37:58 -06:00
PabstMirror	0ea1c0c03f	Cleanup non-working code, and documentation	2016-01-19 08:31:52 -06:00
Thomas Kooi	e083e60e8c	Merge pull request #3142 from acemod/switchUnitsCleanup ... Cleanup SwitchUnits, Possible fix for #3122	2016-01-19 09:40:24 +01:00
Thomas Kooi	33479ffcae	Merge pull request #3146 from acemod/Explosives_DetonateTrigger ... Function to detonate explosives via script	2016-01-19 09:38:43 +01:00
Thomas Kooi	aa535c9167	Merge pull request #3177 from acemod/fixJavelinZeus ... Javelin - Fix zeus RC after switchCamera	2016-01-19 09:36:08 +01:00
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
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