7550 Commits

Author	SHA1	Message	Date
ulteq	a1ee99cc8a	Remove debug code	2015-12-28 16:04:53 -06:00
ulteq	7858b65fde	Fixed misspelled function name	2015-12-28 16:04:53 -06:00
ulteq	0a27c309cb	Added missing variable definitions	2015-12-28 16:04:52 -06:00
commy2	f83206353d	jamming	2015-12-28 16:04:52 -06:00
Nicolás Badano	4264789631	Refactored code so the weapon temperature is correctly updated when checking it	2015-12-28 16:04:52 -06:00
Nicolás Badano	ac67e45098	overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion	2015-12-28 16:04:51 -06:00
Nicolás Badano	932e17cea4	fix	2015-12-28 16:04:51 -06:00
Nicolás Badano	fb56350217	small fixes	2015-12-28 16:04:51 -06:00
Nicolás Badano	de902ca4fd	Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again.	2015-12-28 16:04:50 -06:00
jonpas	c0aaf05eaf	Prevent interaction if unit(s) climbing the ladder, Disable tilting, Split adjust string into adjust and tilt	2015-12-27 19:28:29 +01:00
PabstMirror	dc60860421	Fix Third Person Goggle Effect Not Displaying ... #3074	2015-12-26 23:31:49 -06:00
dixon13	a4781a20d3	Authors	2015-12-23 19:27:55 -07:00
dixon13	2a98aa57ed	Delete fnc_canInteractWithCivilianVehicle.sqf ... No need to create another funciton	2015-12-23 11:54:41 -07:00
dixon13	d3a1110250	Removed a portion of the condition	2015-12-23 11:52:23 -07:00
dixon13	5f7e833d43	Removed "PREP(canInteractWithCivilianVehicle)" ... Function is being removed	2015-12-23 11:51:19 -07:00
dixon13	21daa331dc	Changes to ACE_Unload ... - added semi-colon - changed the condition - changed the statement	2015-12-23 11:49:17 -07:00
dixon13	1aa192f7e0	Extract civilans from vehicles, rmeoved actions from civilians in vehicles	2015-12-23 00:19:41 -07:00
Githawk	2432ac3319	Changed scope for carried objects	2015-12-22 17:54:16 +01:00
Githawk	d16417a00b	Changed scope on nozzle	2015-12-22 17:49:58 +01:00
Githawk	ebb28177b1	More fixes to make jerryCan work	2015-12-21 17:54:52 +01:00
Glowbal	c1fa81f28b	Fix tabs in sqf files	2015-12-21 17:05:48 +01:00
Githawk	d9e7a43bf7	Fixes error with new interact_menu	2015-12-21 16:53:25 +01:00
jokoho48	0addb592d3	remove Unused Varaible in AB ... fix private in AB	2015-12-21 02:29:10 +01:00
VKing	38fb97aeac	Fixed init problem; added mortar ammo boxes	2015-12-20 20:51:44 +01:00
VKing	73720f9313	Too hasty	2015-12-20 18:20:34 +01:00
VKing	b7bd468fdd	That ought to not have worked before	2015-12-20 18:18:33 +01:00
freghar	a383da5b2d	fix inverted isTurnedOut for map lighting ... According to the comment, the idea is to provide unobscured map when inside an enclosed vehicle (!isTurnedOut). Signed-off-by: freghar <freghcz@gmail.com>	2015-12-20 11:53:08 +01:00
PabstMirror	9b0641c06f	Add nil return for count	2015-12-19 21:17:36 -06:00
PabstMirror	74aec45921	Fix medical menu not closing on range, litter dir ... - Medical Menu didn't close when target moved out of range - Litter was always created in the same direction	2015-12-19 20:50:57 -06:00
VKing	450a18e13a	Forgot to disable in case the setting's set to "no" (but why would you ever want to	2015-12-19 21:29:37 +01:00
VKing	f75311917c	Upped mortar round mass	2015-12-19 20:49:09 +01:00
VKing	b4cb5c2ba7	Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init.	2015-12-19 19:54:45 +01:00
VKing	85270e4521	Fix init issue	2015-12-19 18:22:54 +01:00
VKing	a37d97103f	Erk	2015-12-19 16:37:30 +01:00
VKing	a336707623	Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars)	2015-12-19 16:30:01 +01:00
VKing	dfe7c07936	Fix fnc_mortarInit, fnc_loadMagazine, some other stuff	2015-12-19 12:10:12 +01:00
VKing	2c4a25a6c0	Mortar init functions	2015-12-19 02:18:35 +01:00
PabstMirror	4d041c3c94	Merge pull request #3049 from acemod/fixlaserdesignator ... Remove undefined laser selfdesignate macro	2015-12-18 12:09:04 -06:00
Jonathan Pereira	ad48f51ec7	Added PT-BR translations ... All remaining translations of gestures, hearing, interact_menu, interaction, nightvision, rearm, refuel, viewdistance were done!	2015-12-18 15:14:19 -02:00
PabstMirror	c53a0541a4	Add support for non local Zeus RC in common-isPlayer	2015-12-18 11:08:10 -06:00
Jonathan Pereira	db7074b6cf	Removed duplicated German entry	2015-12-18 14:45:20 -02:00
commy2	e3ecc64771	remove undefined macro	2015-12-18 13:53:25 +01:00
VKing	579f861b8f	Unload to player inventory	2015-12-17 19:25:22 +01:00
VKing	27890a8dab	First try at some module control	2015-12-17 11:00:46 +01:00
VKing	a0fdc58ed7	Remove unused variables, spaces	2015-12-17 09:13:23 +01:00
VKing	d8c8d02177	Port inventory picture and model	2015-12-17 00:21:54 +01:00
VKing	e0a21ce144	Completed code porting and interaction	2015-12-16 23:47:14 +01:00
VKing	3e6fc52733	First working iteration. ... Todo: Implement in module (Choose new or old/don't break old missions) Magazine UI+model Add preparing delay Fix function readmes Cleanup in functions? Credits MP Testing	2015-12-16 20:22:18 +01:00
PabstMirror	43a9865fa2	Use isNil for better future compatiblity	2015-12-16 12:10:53 -06:00
PabstMirror	360bdcb50e	Optics - Don't modify camera for ThreeDen Editor ... Fix broken ThreeDen Camera when returning to editor from preview. PIP will still work in preview. Will have to take a look at 1.56 RC to see if command exists and eventually cleanup.	2015-12-16 11:28:43 -06:00
PabstMirror	ff3ddbe287	Building Interact - Dummy object instead of hiding ... Fix #3038 InteractiMenu now checks `isObjectHidden`, So now use dummy object instead of hiding a real one	2015-12-15 12:04:03 -06:00
PabstMirror	7258a0084a	Merge pull request #2995 from acemod/repairThreshholdToolkit ... Fix PostRepairDamage and toolkit consumtion setting	2015-12-14 19:30:19 -06:00
PabstMirror	f2bcd66784	Toolkit also consumed on fullRepair	2015-12-14 19:28:31 -06:00
PabstMirror	886c13f6a9	Merge pull request #3013 from acemod/bloodyLitter ... Fix litter for adv - Add bloody p3d for Pack/qClot	2015-12-14 19:23:51 -06:00
PabstMirror	0b5b11c966	Merge pull request #3014 from acemod/fixNameSanatize ... Sanitize less/greater-than symbol to square	2015-12-14 19:23:07 -06:00
PabstMirror	e5abb59f1d	Merge pull request #3011 from acemod/rhsMergeERA ... RHS Compat - Combine all ERA Hitpoints	2015-12-14 19:22:51 -06:00
commy2	e6be1537cd	replace more private with private keyword in common	2015-12-14 13:17:48 +01:00
commy2	bfa29246be	replace private with private keyword in other half of common	2015-12-14 13:08:19 +01:00
PabstMirror	9064579a65	Send string to serverLog instead of strucText ... Fix `Performance warning: SimpleSerialization::Read 'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized by simple serialization, falling back to generic serialization, use generic type or ask for optimizations for these types`	2015-12-13 13:27:46 -06:00
VKing	170095ae35	Initial commit for mortar ammunition handling.	2015-12-13 18:27:13 +01:00
commy2	bd3c79f739	add function to retrieve the control of the stamina bar	2015-12-12 20:25:42 +01:00
commy2	7f63d51ccb	add event for placing units in body bags	2015-12-12 18:21:11 +01:00
commy2	2839cff753	common code fixes	2015-12-12 17:26:47 +01:00
commy2	3d5ea74c7e	replace private with private keyword in first half of common	2015-12-12 16:48:54 +01:00
jonpas	4c2d92d360	Negate fuel hose connected condition	2015-12-12 15:12:50 +01:00
PabstMirror	a501c7e1c3	Remove new models and just combine existing litter	2015-12-11 19:47:40 -06:00
jonpas	e5f64bcdc1	Fix refuel PFH not exiting on nozzle disconnect	2015-12-11 22:45:28 +01:00
PabstMirror	24d77d1b7c	Fix Typo	2015-12-11 12:17:05 -06:00
PabstMirror	db50b5313d	getName can return raw or sanatized html tags	2015-12-11 12:01:50 -06:00
commy2	ff95aab100	remove helmets from items filter	2015-12-11 15:05:43 +01:00
commy2	ee7f8f82f5	remove debug	2015-12-11 14:24:54 +01:00
commy2	5d9a057165	add more filters to ammo boxes	2015-12-11 14:18:11 +01:00
commy2	2b63b2efa8	add more filters to ammo boxes	2015-12-11 13:14:58 +01:00
PabstMirror	c7b6375092	Sanitize less/greater-than symbol to square ... Fix #2912 The raw `&lt;` showed up in nametags and anything besides strucText `[ / ]` is fairly close and will work in either text mode.	2015-12-10 23:29:05 -06:00
PabstMirror	e9be05209a	Fix litter for adv - Add bloody p3d for Pack/qClot ... Fix #2950 Get correct bloodLossOnSelection for both basic and advanced Adds bloody versions of packing bandage and quickClot	2015-12-10 22:58:44 -06:00
PabstMirror	ee0812ad15	RHS Compat - Combine all ERA Hitpoints ... Put all ERA hitpoints (up to 46 of them) onto a single point and put that point on the main interaction point	2015-12-10 20:57:23 -06:00
commy2	68388bc976	add more filters to ammo boxes	2015-12-11 01:02:15 +01:00
bux	8e6a057f52	fix common stringtable	2015-12-10 18:48:00 +01:00
kaban	fd06472f4d	Russian Translations - Update	2015-12-10 20:32:16 +03:00
[OMCB]kaban	aec2c3fef2	HotFix: removed duplicated key. ... Removed duplicated German key for STR_ACE_Common_DoNotForce. It caused Tabler.exe couldn't read stringtable files.	2015-12-10 18:24:28 +03:00
PabstMirror	f3b7b3b94f	Merge pull request #2994 from acemod/microDagrListBoxKeyblock ... MicroDagr - Prevent Home Key being blocked	2015-12-10 09:20:06 -06:00
PabstMirror	a71cce1981	Merge pull request #2987 from acemod/gesturesCleanup ... Setting For Gestures - Fix BI* gestures	2015-12-10 09:19:35 -06:00
commy2	077b9827e8	code cleanup fcs	2015-12-10 16:00:14 +01:00
commy2	7748131e73	code cleanup markers	2015-12-10 15:32:31 +01:00
commy2	a08cf69149	tweak size of laserpointer, fix #2975	2015-12-09 22:56:14 +01:00
havena	6f0568c370	fix Unexpected stringtable format ... Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>	2015-12-09 20:18:15 +01:00
PabstMirror	3ae7cd15bd	cleanup stringtable phrasing	2015-12-09 12:27:47 -06:00
PabstMirror	3d560108a3	Setting For Gestures - Fix BI* gestures	2015-12-08 23:08:09 -06:00
PabstMirror	0eed4799af	MicroDagr - Prevent Home Key being blocked ... Fix #2974	2015-12-08 21:31:03 -06:00
PabstMirror	e964b2c135	Fix PostRepairDamage and toolkit consumtion setting ... Fix #2982	2015-12-08 20:31:40 -06:00
PabstMirror	cae9f436f6	Merge branch 'release'	2015-12-08 15:14:33 -06:00
Glowbal	0599b35fc6	Bump version to 3.4.1	2015-12-08 14:47:48 +01:00
PabstMirror	38bf869f07	Also Fix Rearm	2015-12-07 14:07:03 -06:00
PabstMirror	cd68f9b320	Fix refuel unconc error - Man unloading for air	2015-12-07 13:54:41 -06:00
Thomas Kooi	05c56f73b5	Change disable NVG with sights by default ... As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.	2015-12-07 18:33:20 +01:00
PabstMirror	39edd205f0	Merge pull request #2942 from acemod/CzechTables ... Czech Translations - Update	2015-12-07 09:32:00 -06:00
bux578	fbde1dd794	Merge pull request #2941 from acemod/DieStringtables ... Update German Stringtables	2015-12-07 10:27:11 +01:00
bux578	821ccf5726	fix medical menu stringtable name	2015-12-07 10:21:48 +01:00
bux578	af31d43567	fix german typos	2015-12-07 10:20:35 +01:00
PabstMirror	358228f5bb	Cleanup De Stringtables	2015-12-06 15:03:15 -06:00
commy2	9fa62c6d2a	clean up vehicles config	2015-12-06 11:18:07 +01:00
gienkov	56e919dccc	nozzle additonal check condition	2015-12-06 06:47:19 +01:00
gienkov	1132efaf48	ceil number of wounds	2015-12-06 02:57:21 +01:00
gienkov	f6e7cad678	remove Original entries	2015-12-05 22:08:39 +01:00
PabstMirror	b13656e54b	addDamageToUnit - Disable debug / testing code	2015-12-05 12:19:34 -06:00
Thomas Kooi	761d6e28d8	Merge pull request #2939 from acemod/fixMicroDagrDefines ... MicroDagr - Add #undef to config for pboProject	2015-12-05 11:29:25 +01:00
Thomas Kooi	8e88740730	Merge pull request #2924 from acemod/woundReopeningArray ... Don't update openWounds if not bandaged	2015-12-05 11:28:56 +01:00
ProfessorCZ	cf41ac5fba	Czech Translations - Update	2015-12-04 22:28:10 -06:00
licht-im-Norden87	291f4df072	Update German Stringtables ... Update stringtable.xml Update stringtable.xml Update stringtable.xml kommas........................................................................................................................................................... Rallypoint Update stringtable.xml slideshow, not finished yet Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml What does Curator mean in this context? l. 294, l 302 cargo Update stringtable.xml Update stringtable.xml I left a few things out. I'd like if someone gives me advice Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma? Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört... Update stringtable.xml Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden. Update stringtable.xml Update stringtable.xml Update stringtable.xml Fix Mistakes from merge Fix Empty Entries Fix Mistake Fix	2015-12-04 22:06:44 -06:00
PabstMirror	f5aae81465	MicroDagr - Add #undef to config for pboProject ... #2936	2015-12-04 20:08:30 -06:00
PabstMirror	43a168f0b9	Flashbangs - Make event radius match effect radius	2015-12-04 15:16:17 -06:00
commy2	e418cfcf11	Merge pull request #2935 from acemod/fixbinoculars2 ... Fix binocular related bugs	2015-12-04 21:27:53 +01:00
commy2	5d43fa93c6	fix FUNC(binocularMagazine), fix #2916, fix #2917, fix #2918, fix #2922, fix #2928, fix #2933	2015-12-04 19:37:37 +01:00
PabstMirror	875b3980ac	Don't update openWounds if not bandaged ... Fix #2921	2015-12-03 15:23:38 -06:00
PabstMirror	91ace4fc9b	Fix whitelist string -> array error in checkPbo ... Fix #2913 Use splitString instead of call compile to convert string into an array	2015-12-02 23:58:41 -06:00
PabstMirror	c928a0d6cb	Remove Sleep/WaitUntil from checkPBO ... Fix #2910	2015-12-01 22:50:28 -06:00
PabstMirror	46c43b56db	Merge branch 'release'	2015-12-01 15:54:57 -06:00
PabstMirror	419af195e9	#2902 - Remove error and don't exit if veh has no hit points ... B_UAV_01_F has no hitpoints and would throw error Don't exit so "fullRepair" action still gets added	2015-12-01 13:43:27 -06:00
Glowbal	dacfe4d6cb	Bump version to 3.4.0	2015-12-01 17:05:08 +01:00
commy2	861262e41c	revert false captitalization change	2015-11-30 17:56:25 +01:00
commy2	411a8d58f3	fix more setVariable and getVariable capitalization	2015-11-30 17:53:57 +01:00
commy2	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	e422388484	fix waitUntil capitalization	2015-11-30 17:28:01 +01:00
commy2	a9ebcf8543	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
commy2	d037f00a92	fix forEachIndex capitalization	2015-11-30 17:25:16 +01:00
commy2	b3950bd7f0	fix forEach capitalization	2015-11-30 17:23:48 +01:00
commy2	a8228f60c2	fix configFile capitalization	2015-11-30 17:23:02 +01:00
commy2	2b05f6f451	fix isNil capitalization	2015-11-30 17:22:16 +01:00
commy2	5e41643cff	fix pushBack capitalization	2015-11-30 17:21:28 +01:00
commy2	d9b90258bc	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
commy2	0b84bb514b	fix Cfg capitalization	2015-11-30 17:09:26 +01:00
commy2	dcf0a68b80	Revert "fix Cfg capitalization" ... This reverts commit 43bda9c462.	2015-11-30 17:00:32 +01:00
commy2	43bda9c462	fix Cfg capitalization	2015-11-30 16:52:20 +01:00
commy2	ca9b909e75	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
commy2	ae1f35c042	remove superfluous private	2015-11-29 16:55:44 +01:00
commy2	caa5585044	simplify getRandomAnimation in sitting	2015-11-29 16:50:08 +01:00
commy2	ff4406e411	manual merge, more selectRandom command useage	2015-11-29 16:48:23 +01:00
commy2	e5c4d35969	1.55 use new selectRandom command	2015-11-29 16:33:25 +01:00
Thomas Kooi	02eee05cf4	Merge pull request #2884 from acemod/speedLimiterUGVFix ... fix that in UGV dont work speedLimiter	2015-11-29 12:41:13 +01:00
Thomas Kooi	081106d6a3	Merge pull request #2892 from acemod/TheHidden ... Remove nametags and actions on hidden units	2015-11-29 12:38:27 +01:00
bux578	35ecef454f	Merge pull request #2825 from gienkov/pl-translation ... pl translation	2015-11-29 07:35:04 +01:00
PabstMirror	8d2b612570	Remove nametags and actions on hidden units ... Fix #2596	2015-11-28 21:35:25 -06:00
SilentSpike	c426bfc9c1	Merge pull request #2888 from acemod/repairPositions ... Define custom repair points for a few vehicles	2015-11-28 20:09:37 +00:00
Thomas Kooi	5282e95668	Merge pull request #2876 from acemod/medicalTranslateHP ... Medical Fixes	2015-11-28 20:58:08 +01:00
Thomas Kooi	ced94d73a7	Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone ... [REMADE] RoadCone_F and its inhered RoadBarrier_F intractable	2015-11-28 20:51:39 +01:00
Thomas Kooi	d7a19cf0a6	Merge pull request #2882 from acemod/fixUGVNametag ... fix UGV Nametag issue	2015-11-28 20:50:23 +01:00
Thomas Kooi	7dd0af33b4	Merge pull request #2871 from acemod/cleanupLaserpointer ... cleanup laserpointer	2015-11-28 20:43:31 +01:00
Thomas Kooi	c132ef86cf	Merge pull request #2133 from jonpas/dynamicViewDistance ... Mk 1 eyeballs Integration	2015-11-28 20:40:29 +01:00
Thomas Kooi	e669f3e2cb	Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight ... Disable nvgs in sight	2015-11-28 20:37:30 +01:00
gienkov	f25a181d8e	fix my error	2015-11-28 20:37:29 +01:00
Thomas Kooi	cef01baf0b	Merge pull request #2856 from acemod/isEqualTypeRepalcement ... 1.54 - Replace typeName with isEqualType	2015-11-28 20:36:07 +01:00
Thomas Kooi	b807d1db48	Merge pull request #2886 from acemod/bandageReopen ... Add all wound types to bandage treatment configs	2015-11-28 20:32:13 +01:00
SilentSpike	a8cf9c6f48	Fix missing boolean inversion	2015-11-28 13:58:56 +00:00
gienkov	2c83fe4a11	refuel translation fixes	2015-11-28 13:45:59 +01:00
gienkov	a906c180ce	remove alpha entries	2015-11-28 13:34:54 +01:00
PabstMirror	a42c2153cc	Error handling for bad setting values array	2015-11-28 01:57:15 -06:00
PabstMirror	f676e6d9c9	Add some more typeNames replacements	2015-11-27 21:23:27 -06:00
PabstMirror	5850f78c1f	Merge branch 'master' into isEqualTypeRepalcement	2015-11-27 21:08:21 -06:00
gienkov	adae379445	fixes	2015-11-27 21:55:05 +01:00
gienkov	b091b73e24	fixes	2015-11-27 21:54:04 +01:00
gienkov	3250245587	3.4.0 translations and fixes	2015-11-27 21:50:57 +01:00
PabstMirror	6031eb8c6e	Add all wound types to bandage treatment configs ... Fix by adding all config entries; instead of trying to modify classname	2015-11-27 14:19:26 -06:00
gienkov	7eecff4296	Merge remote-tracking branch 'origin' into pl-translation ... Conflicts: addons/captives/stringtable.xml addons/map_gestures/stringtable.xml addons/zeus/stringtable.xml	2015-11-27 21:19:25 +01:00
SilentSpike	0ffb9ea5ad	Define custom repair points for a few vehicles ... Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.	2015-11-27 20:06:57 +00:00
ViperMaul	8d4364350c	Fix for "double semicolon detected" error	2015-11-27 10:43:30 -08:00
jokoho48	76435ec228	posible fix for overlapping Speedlimiters	2015-11-27 15:48:03 +01:00
PabstMirror	e51f658ce0	Try base wound class in bandage treatment configs ... Gets the correct wound for the bandage treatment config Used for selecting most effective bandage and reopening _className was something like "velocityWoundMedium" but configs only had base class "velocityWound"	2015-11-26 23:18:39 -06:00
jokoho48	f364c2a5c3	fix some stuff i mixed up	2015-11-26 23:44:42 +01:00
jokoho48	5f2840bf39	fix that in UGV dont work speedLimiter	2015-11-26 23:39:17 +01:00
jokoho48	5df7eba1eb	remove debug Code	2015-11-26 22:27:46 +01:00
jokoho48	59708ec2f7	fix UGV Nametag RPT Issue #2873	2015-11-26 22:24:06 +01:00
jokoho48	52a6eddb44	fix missing PBOPREFIX	2015-11-26 20:53:14 +01:00
PabstMirror	4aeeefdfe8	Fix UBC and increase Heli_04 Pod interaction distance	2015-11-26 11:47:25 -06:00
PabstMirror	a5c45c137f	Medical - addDamageToUnit Helper	2015-11-26 09:53:12 -06:00
Thomas Kooi	581f71f8a1	Merge pull request #2141 from GitHawk/refuel ... Adding vehicle refueling	2015-11-26 16:16:13 +01:00
Thomas Kooi	bba0e999ff	Merge pull request #2164 from GitHawk/rearm ... Adding vehicle rearming	2015-11-26 16:15:09 +01:00
Thomas Kooi	81ab280cb4	Merge pull request #2670 from acemod/simplifyFragConfig ... Simplify frag config	2015-11-26 16:13:21 +01:00
Thomas Kooi	15267c0433	Merge pull request #2219 from acemod/handSignals ... Hand signals enhancement	2015-11-26 16:04:41 +01:00
PabstMirror	ca0cfc9bbf	Merge pull request #2861 from acemod/repairRebass ... Repair Overhaul	2015-11-25 17:00:32 -06:00
PabstMirror	988a5c76bb	Medical - 1.54 Changes ... 1.54 Armor Translate selectiosn to hitpoints Calc newDamage using hitIndex (because sel is translated) Fix isFalling never being reset Cache hitpointIndex to reset damage Normalize Limb Armor to 1.54 Cleanup Cleanup	2015-11-25 11:49:20 -06:00
PabstMirror	0b9044e3c7	Merge pull request #2753 from acemod/showHudSetter ... Showhud setter	2015-11-25 11:16:21 -06:00
PabstMirror	ac6390c0b3	Add array info to header	2015-11-25 11:07:56 -06:00
PabstMirror	185cae2fe5	Remove Old Gestures from interaction	2015-11-25 11:00:45 -06:00
PabstMirror	095252ef76	Cleanup ... revert `format ["'%1'", QGVAR()];` as it crashes the game	2015-11-25 10:16:37 -06:00
SilentSpike	c731d83642	Merge pull request #2848 from acemod/fixForEachDeleteAt ... fix Issue with forEach Loops and deleteAt Index	2015-11-25 14:00:37 +00:00
Thomas Kooi	08c5374a99	Merge pull request #2390 from BaerMitUmlaut/pass-magazine ... Added interaction to quickly pass a magazine	2015-11-25 14:04:07 +01:00
PabstMirror	36bf2d9cb5	Merge pull request #2803 from BaerMitUmlaut/remove-team-synching ... Remove manual team synching	2015-11-24 21:37:50 -06:00
PabstMirror	20bf90f3e9	Medical - Fix Hitpoints Macro when building	2015-11-24 16:30:09 -06:00
PabstMirror	575fabb69d	#2872-Map time support for subclasses of ItemWatch	2015-11-24 16:17:06 -06:00
jokoho48	fd1c38c612	Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals	2015-11-24 22:44:32 +01:00
jokoho48	352db4cb66	remove some crap code ... replace some variables with macros	2015-11-24 22:43:42 +01:00
PabstMirror	cfefb1c40e	Cleanup spotting scope configs	2015-11-24 15:24:14 -06:00
PabstMirror	2c6cfcf294	Merge pull request #2832 from p1nga/Spotting-Scope-Update ... Updated spotting scope model.	2015-11-24 15:23:12 -06:00
PabstMirror	9ecffcd133	Merge pull request #2746 from acemod/fixFlashlightPrivates ... fix privates in Map module	2015-11-24 15:18:38 -06:00
IngoKauffmann	f9266764fb	Moved module to ACE_Logistics	2015-11-24 21:33:38 +01:00
IngoKauffmann	1a6730340c	Move module to ACE_Logistics category, removed single interact point	2015-11-24 21:30:08 +01:00
PabstMirror	2c76bc3b10	Merge pull request #2605 from TheNiner/master ... Fixed Laser Update Position Bug	2015-11-24 13:43:53 -06:00
BaerMitUmlaut	818466d296	Added ACE setting to hide interaction	2015-11-24 19:07:17 +01:00
PabstMirror	51a463de24	Fix tap shoulder msg display ... Missing efunc on displayTextStructured Calculate a shoulder side when using keybind	2015-11-24 11:25:56 -06:00
IngoKauffmann	8fc52a4dfb	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel	2015-11-24 17:57:21 +01:00
PabstMirror	86f7ee2ad2	Merge pull request #2834 from acemod/addEarPlugsLoudness ... Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues	2015-11-24 10:52:11 -06:00
IngoKauffmann	d4c708e731	Missing ;	2015-11-24 17:33:33 +01:00
PabstMirror	ddc8b16db2	Merge pull request #2857 from acemod/invResize154 ... Inventory Resize UI - changes for 154 GL-Mags	2015-11-24 10:24:06 -06:00
PabstMirror	4ae209ab44	Merge pull request #2865 from acemod/154UBC ... Fix UBC for 1.54	2015-11-24 10:23:48 -06:00
jokoho48	773b30df33	Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals	2015-11-24 15:14:30 +01:00
PabstMirror	7981faad64	private -> local	2015-11-23 17:47:58 -06:00
PabstMirror	0273dd1d4d	Merge branch 'master' into fixFlashlightPrivates	2015-11-23 17:45:41 -06:00
commy2	1d315bee6f	cleanup laserpointer	2015-11-23 20:52:04 +01:00
IngoKauffmann	fd2fd3241e	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm	2015-11-23 19:37:10 +01:00
IngoKauffmann	cbe8d98f86	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel	2015-11-23 19:29:05 +01:00
IngoKauffmann	931c6830fc	Added reset ... It's now possible to reset a fuel truck by console command: [fuel_truck] call ace_refuel_fnc_reset	2015-11-23 19:28:51 +01:00
IngoKauffmann	763df43fbc	Added possibility to disallow rearm ... > vehicle setVariable ["ace_rearm_disabled", true, true]; Also added ammo compatibility for RHS Mi24 with turret	2015-11-23 17:08:06 +01:00
commy2	3be60a2f6e	Merge pull request #2842 from acemod/fcsUpdateDisplay ... Update FCS display after distance adjust	2015-11-23 16:34:09 +01:00
SilentSpike	d2538c6ff2	Add spectator text chat ... Turns out custom radio channels are kind of a pain to work with. However this should work fine assuming the radioChannelAdd commands will work on client machines.	2015-11-22 20:03:10 +00:00
IngoKauffmann	113ac0f370	Minor improvements ... fnc_reset is still WIP	2015-11-21 23:24:24 +01:00
SilentSpike	f07f06c843	Merge pull request #2760 from acemod/spectatorUpdates ... Spectator updates	2015-11-21 15:00:44 +00:00
PabstMirror	c2564de5ef	Fix UBC for 1.54 ... Soldiers no longer inherit hitpoints from CaManBase Adds a macro to deal with them	2015-11-20 23:27:29 -06:00
PabstMirror	ab769757d9	Skip Depends Hitpoints - Use HitPoints selPos for wheels ... Stuff Normalize Depends - Skip Glass Repair Fix spawned wheel/track not having correct damage getHitpointString robustness, hatchback fuelHitpoint, fix count errors - Formatting local -> private Fix Stuff	2015-11-20 21:11:50 -06:00
SilentSpike	839c022b84	Fix broken repair point selection code ... Only valid hit selection + hit point combinations are usable for repair points: - Empty hit points mean there isn't enough information to display to the user - Empty hit selections mean that the hit point doesn't actually exist	2015-11-20 21:11:23 -06:00
PabstMirror	4e93b9c72d	2307 - Repair sub-turrets ... Privates Cleanup debug Add repair actions for sub turrets Cleanup Fix Header Error Handling Cleanup setHitpointDamage Fix common ACE_isEngineer to handle scalar or bool Claim and release repair objects (wheel/track) Repair sub-turrets	2015-11-20 21:11:05 -06:00
Glowbal	d0cb09196d	Merge branch 'master' of github.com:acemod/ACE3	2015-11-20 23:29:33 +01:00
Glowbal	67345b0178	Fix incorrect variable ... _items was the old variable name.	2015-11-20 23:28:52 +01:00
PabstMirror	979ff8b479	Local -> private	2015-11-20 16:13:20 -06:00
PabstMirror	0f62168250	Merge pull request #2840 from acemod/fixOverpressure ... Overpresure - Misc fixes	2015-11-20 15:38:24 -06:00
PabstMirror	08813c1b75	Convert local keywords to private	2015-11-20 15:36:37 -06:00
Thomas Kooi	801120fb39	Merge pull request #2841 from acemod/medicalAiBandage ... Move bandage log before basic exit	2015-11-20 22:28:55 +01:00
Thomas Kooi	4a19fcc5a5	Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation ... inWater -> isUnderwater	2015-11-20 22:28:43 +01:00
Thomas Kooi	a652be8248	Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound ... Cleanup ambient sounds module	2015-11-20 22:27:57 +01:00
PabstMirror	063042cb36	Merge pull request #2777 from acemod/interactionAnimationSetting ... Interaction Menu Animation Setting And PreExpand First Level	2015-11-20 14:56:37 -06:00
PabstMirror	7b526a99a3	Cleanup	2015-11-20 14:53:16 -06:00
PabstMirror	c4117e1283	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-20 14:37:23 -06:00
PabstMirror	69b53af1d3	1.54 - Replace typeName with isEqualType	2015-11-20 11:40:31 -06:00
PabstMirror	9a9029fa49	Merge pull request #2839 from acemod/abFixTwist ... AB - Fix ACE_twistDirection	2015-11-20 10:32:28 -06:00
PabstMirror	e81dd0729e	Inventory Resize UI - changes for 154 GL-Mags	2015-11-19 15:54:43 -06:00
SilentSpike	f8e293d04d	Localise spectator hotkeys in help window	2015-11-18 15:18:21 +00:00
SilentSpike	0567d1c2a1	Fix spectator unit list key press handling ... By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.	2015-11-18 15:02:17 +00:00
SilentSpike	0110ada1b5	Fix zeus waypoint formation actions	2015-11-18 14:54:17 +00:00
SilentSpike	d1dff4a24a	Merge branch 'master' into fixForEachDeleteAt ... # Conflicts: # addons/common/XEH_postInit.sqf	2015-11-18 13:27:04 +00:00
SilentSpike	49d4f233d9	Revert commit a718c82780	2015-11-18 13:19:12 +00:00
bux578	3b2b7fd78d	Merge pull request #2821 from dudakov/master ... Russian Translations - Update	2015-11-18 08:30:46 +01:00
PabstMirror	ebbf2b373a	goggles - prevent CBA PFEH warning ... fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING: Invalid or not existing PFH ID."	2015-11-17 23:44:50 -06:00
kaban	da16fc1038	\addons\captives\stringtable.xml - resolving conflicts.	2015-11-18 06:50:00 +03:00
kaban	f8481ae5f2	Merge branch 'master' of https://github.com/acemod/ACE3.git into develop ... Conflicts: addons/captives/stringtable.xml	2015-11-18 06:39:58 +03:00
PabstMirror	d6000ae985	local -> private	2015-11-17 14:33:17 -06:00
PabstMirror	3ec9fca73e	local -> private	2015-11-17 14:06:12 -06:00
PabstMirror	75d80be143	Merge branch 'master' into interactionAnimationSetting	2015-11-17 14:05:31 -06:00
PabstMirror	5cbfe4f2a5	local -> private	2015-11-17 14:02:20 -06:00
PabstMirror	896615beb1	Merge pull request #2826 from acemod/settingsParamsArray ... Read settings from paramsArray (params in description.ext)	2015-11-17 14:01:16 -06:00
PabstMirror	5823749f0c	Merge branch 'master' into settingsErrorChecking	2015-11-17 14:00:22 -06:00
PabstMirror	6d04156f69	local -> private	2015-11-17 13:56:55 -06:00
commy2	a57d1bca75	replace local keyword with private	2015-11-17 17:43:07 +01:00
SilentSpike	a718c82780	Implement nice index deletion iteration solution ... Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements. This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.	2015-11-17 16:02:56 +00:00
SilentSpike	23e110d7ce	Remove depreciated spectator hotkey	2015-11-17 15:26:34 +00:00
commy2	b6f9a2b776	Merge pull request #2703 from jonpas/removeAdjustedProneOptics ... Remove enable optics in adjusted prone stances	2015-11-17 16:24:27 +01:00
jokoho48	561f6126dc	fix missing bracket	2015-11-17 13:34:34 +01:00
jokoho48	f3c5c64390	fix Issue with forEach Loops and deleteAt Index	2015-11-17 04:31:17 +01:00
BaerMitUmlaut	e008f87fb8	Cleanup ambience sound module	2015-11-16 19:00:02 +01:00
Jonathan Pereira	6ebd76ff2f	Added PT-BR translations to Cargo	2015-11-14 12:24:01 -02:00
SilentSpike	cf368f240f	Remove ear ringing upon spectator entry ... Volume updating was disabled, however any existing ringing would persist. Setting the volume to 0 should make the hearing PFH stop playing sound.	2015-11-13 13:00:04 +00:00
PabstMirror	a621eaab24	#2750 - Update FCS display after distance adjust	2015-11-13 02:57:06 -06:00
PabstMirror	c3e6990d00	#2528 (6) - Move bandage log before basic exit ... In advanced medical without enableFor AI. Bandaging an AI would exit before adding log.	2015-11-12 01:06:29 -06:00
PabstMirror	9b2c79e7e1	getDistance - use lineIntersectsSurfaces	2015-11-11 14:12:42 -06:00
PabstMirror	391bfc160a	Overpresure - Misc fixes ... - Fix passing magazine/ammo to overpressure event - Use AGL for nearEntities - Fix getDistance returning nil	2015-11-11 13:24:27 -06:00
PabstMirror	9d2d5b9c7c	AdvanBalls - Fix ACE_twistDirection	2015-11-11 01:58:12 -06:00
PabstMirror	e72c1d874a	Merge branch 'master' into fixFlashlightPrivates ... Conflicts: addons/map/functions/fnc_determineMapLight.sqf	2015-11-10 21:21:06 -06:00
PabstMirror	99852f2071	Merge pull request #2718 from acemod/rangeCards-scriptError ... RangeCard / AB fixes	2015-11-10 21:02:16 -06:00
PabstMirror	4ff31771d3	DAGR - missing (	2015-11-10 20:51:00 -06:00
PabstMirror	87b9ff9785	Hearing - Reset earplugs on respawn, addItem setting ... Fix #2835 - readd item on respawn Fix #2837 - setVariable false on respawn	2015-11-10 20:44:55 -06:00
PabstMirror	e2e74e0f5d	DAGR - Fix degrees (° - seems to need UTF-8 BOM)	2015-11-10 16:17:22 -06:00
PabstMirror	830e7d9be4	Merge pull request #2278 from jokoho48/codeCleanUpDagr ... Code cleanup of Dagr module	2015-11-10 16:15:12 -06:00
Thomas Kooi	d91ae9082e	Merge pull request #2628 from acemod/cargoClassnames ... Add support for virtual cargo	2015-11-10 08:38:17 +01:00
Thomas Kooi	ec1187e79b	Merge pull request #2830 from acemod/mixedMedicalDisplay ... Display basicMed wounds for AI in mixed mode	2015-11-10 08:33:21 +01:00
PabstMirror	845909f8af	#2833 - Add earplugs based on loudness (+MGs) ... Use same loudness calc as firedNear (replacing old audibleFire) Give ear plugs to machine gunners (depends on magzine size)	2015-11-08 14:02:00 -06:00
PabstMirror	28738517e8	Merge pull request #2829 from acemod/FlashlightProxyModel ... Fix empty flashlightProxy model + Delete map glow lights from disconnecting players	2015-11-08 11:25:06 -06:00
PabstMirror	5b16638ae5	Always force param settings	2015-11-08 11:22:41 -06:00
P1NGA	6dd3aebe63	Authors....	2015-11-08 15:26:17 +11:00
P1NGA	5ffa646ded	updated spotting scope model and textures.	2015-11-08 15:18:31 +11:00
PabstMirror	dad1388eec	RealisticNames - add ka-60 v2 (black and white)	2015-11-07 18:34:46 -06:00
[OMCB]kaban	2dd90824aa	Map Gestures translations update	2015-11-08 02:52:16 +03:00
PabstMirror	01d679c5dc	#2810 - Delete map glow light from DC players	2015-11-07 14:33:41 -06:00
PabstMirror	ff60cdcfa3	#2828 - Fix empty flashlightProxy model	2015-11-07 11:44:31 -06:00
[OMCB]kaban	34163b5e56	Nametags translations are rolled back	2015-11-07 19:54:48 +03:00
Jonathan Pereira	7ec480c98e	Added ace_captives translation to PT-BR	2015-11-07 11:39:02 -02:00
Glowbal	caa36aa4f6	Merge pull request #2819 from acemod/medicalTranslateHitpoints ... Medical - Better handle odd selection/hitpoint names	2015-11-07 11:06:49 +01:00
PabstMirror	4a6730341a	Fix p3d paths	2015-11-07 00:16:08 -06:00
PabstMirror	826b4fd20b	Cleanup	2015-11-06 20:53:05 -06:00
PabstMirror	e0506f29bc	Read settings from paramsArray (params in description.ext) ... for now just limited to SCALAR/BOOL	2015-11-06 20:46:06 -06:00
PabstMirror	c91789f3c4	Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking	2015-11-06 20:30:12 -06:00
SilentSpike	6e30e9e0df	Fix overpressure priority evaluation ... The code was checking the wrong configs for priority because of some missing variables.	2015-11-06 19:02:54 +00:00
PabstMirror	9161f8e2fb	Merge pull request #2824 from acemod/acreIsSpeaking ... Nametags - Cleanup isSpeaking for ACRE	2015-11-06 09:58:16 -06:00
PabstMirror	c326bc2f87	#2772 - Display basicMed wounds for AI in mixed mode	2015-11-06 01:05:25 -06:00
gienkov	0b6fcacaf0	pl translation	2015-11-06 00:56:15 +01:00
ViperMaul	4b200d6909	bump to v3.3.3	2015-11-05 14:00:01 -08:00
PabstMirror	fabbf6d14d	Nametags - Cleanup isSpeaking for ACRE	2015-11-05 13:13:37 -06:00
[OMCB]kaban	59b9e9a7df	Missing periods added.	2015-11-05 03:45:34 +03:00
kaban	e2763dde27	Russian Translations - Update	2015-11-05 03:28:53 +03:00
PabstMirror	38105136fa	#2820 - Fix target event error	2015-11-04 17:43:51 -06:00
PabstMirror	1cebe613fa	Fix Capitialzation	2015-11-04 14:38:32 -06:00
PabstMirror	c5da32e470	Medical Handle Damage - check hitpoints if selection is weird	2015-11-04 14:36:26 -06:00
PabstMirror	39d4383a04	Merge pull request #2781 from acemod/updateWirecutters ... Wirecutters - Update Fence Configs, Use faster getModelInfo	2015-11-04 13:17:15 -06:00
PabstMirror	c88f77403b	Merge pull request #2805 from jonpas/cleanupMacros ... Cleanup Macro Definitions	2015-11-04 13:16:14 -06:00
PabstMirror	a3443cae43	Merge pull request #2780 from acemod/fixTimeInComments ... Changed ACE_time back to time in comments where appropriate	2015-11-04 13:04:05 -06:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
PabstMirror	50ab2aa904	MicroDagr - move drawEH array define to preInit ... Fix load order problems (init.sqf can be before postInit)	2015-11-02 15:21:34 -06:00
Glowbal	ac22ca3637	Merge pull request #2813 from acemod/medical-hitpoints-fix ... Add method to deal with new hitpoints	2015-11-02 20:20:23 +01:00
Joko	bd97c1ee96	fix Docu in waitUntilAndExecute	2015-11-02 12:05:43 +01:00
ColdEvul	03b82e5859	Adjusted interaction nod, changed carrying height for he barrier.	2015-11-01 22:38:55 +01:00
Broström.A | Evul	100c20fc83	Fixed missing strings ... XEH_ENABLED carryPosition carryDirection dragPosition dragDirection	2015-11-01 20:33:18 +01:00
Glowbal	8f6e9be636	Add method to deal with new hitpoints ... This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names. This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.	2015-11-01 16:35:25 +01:00
bux578	03d3d1c764	Merge pull request #2789 from ToasterBR/translation02 ... Remaining PT-BR translations	2015-10-31 06:14:37 +01:00
jonpas	998f3e996c	Cleanup macro definitions	2015-10-30 21:59:46 +01:00
BaerMitUmlaut	8f473b4a27	Removed all assignTeam occurrences	2015-10-30 16:50:13 +01:00
ColdEvul	b82350baa2	Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable. ... I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.	2015-10-28 21:33:00 +01:00
PabstMirror	10d17a8117	Merge pull request #2783 from acemod/captivesStuff ... Captives Fix duplicate animEH and add handcuffing module	2015-10-28 14:09:13 -05:00
commy2	7d69b7a3f4	fix merkava, patria tracer color	2015-10-28 19:48:49 +01:00
commy2	97999cde04	Merge pull request #2708 from acemod/amvGunSmoke ... - Fix gun smoke on AMV	2015-10-28 19:33:47 +01:00
commy2	d424eadd48	delete superfluous space ocd	2015-10-28 19:25:59 +01:00
commy2	09ba2c8216	Merge pull request #2793 from ColdEvul/CargoFixForTheAutonomus ... Fixed small UAV carrying allot of cargo.	2015-10-28 19:10:56 +01:00
commy2	049d40b96e	change description in function header	2015-10-28 19:02:54 +01:00
commy2	a0bfcdd04c	Revert "rename hasHatch to canTurnOut, change description in function header" ... This reverts commit 932f09ce60.	2015-10-28 19:01:47 +01:00
commy2	932f09ce60	rename hasHatch to canTurnOut, change description in function header	2015-10-28 18:57:47 +01:00
BaerMitUmlaut	7d7aa5b67f	!hasHatch condition part 2	2015-10-28 17:15:46 +01:00
BaerMitUmlaut	a1d72b81bf	Switch to unit namespace, added !hasHatch condition	2015-10-28 17:13:05 +01:00
ColdEvul	6ac1d8361d	Fixed small UAV carrying allot of cargo.	2015-10-28 16:00:24 +01:00
commy2	643f4d36dc	add FUNC(hasHatch)	2015-10-28 08:01:25 +01:00
Jonathan Pereira	ce5364d7af	Added PT-BR translations ... Added all remaining translations, including dagr, dragging, map, map_gestures, medical, repair, tacticalladder and zeus.	2015-10-26 22:04:03 -02:00
PabstMirror	2c995f9c2c	Minor Cleanup	2015-10-26 10:49:39 -05:00
PabstMirror	fefe24b7eb	Disable debug in parachute	2015-10-24 19:07:23 -05:00
Glowbal	b5539db27f	Merge pull request #2767 from acemod/canTreatLocation ... Fix medical location check when set to disabled for PAK/Surgical	2015-10-24 00:55:51 +02:00
PabstMirror	1c26f6c9f5	Captives - Module to set handcuffing ... also add player check for GVAR(requireSurrender) in canApplyHandcuffes	2015-10-23 14:17:31 -05:00
PabstMirror	ef681e4332	Captives - Fix adding duplicate animEH	2015-10-23 13:11:11 -05:00
PabstMirror	e340f5164c	Wirecutters - Update Fence Configs, Use faster getModelInfo	2015-10-22 20:54:09 -05:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
VKing	a899c74133	ace_fcs_ace_time -> ace_fcs_time	2015-10-21 22:17:28 +02:00
VKing	0936238862	Fix lead calculation for vehicle FCS	2015-10-21 21:52:48 +02:00
PabstMirror	554c303be0	InteractionMenu - Auto Expand First Level	2015-10-20 13:31:09 -05:00
PabstMirror	7db5a34b24	Interaction Menu - Add setting for animation speed	2015-10-20 13:26:42 -05:00
jonpas	349447c5ea	Readd prone down optics removal	2015-10-20 19:37:49 +02:00
BaerMitUmlaut	c227f05f8a	Deprecated isWater	2015-10-19 23:28:50 +02:00
Glowbal	57abe3b885	Merge pull request #2743 from acemod/medicalStuff ... Medical Menu Fixes	2015-10-19 22:47:13 +02:00
PabstMirror	acc3504d7b	Merge branch 'master' into fixFlashlightPrivates ... Conflicts: addons/map/stringtable.xml	2015-10-19 13:59:15 -05:00
PabstMirror	cfde11d2fa	Fix medic treatment location check as well	2015-10-19 01:45:30 -05:00
PabstMirror	aad6cab896	#2765 - Fix location check when set to disabled	2015-10-19 01:20:11 -05:00
bux578	602832cc0c	adjust german translations	2015-10-19 07:29:02 +02:00
bux578	f7b717db64	Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11	2015-10-19 07:23:51 +02:00
PabstMirror	af80635a3f	ST Map Gesture Force Color Settings	2015-10-18 23:59:40 -05:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
PabstMirror	16180686d2	PV GVAR(settings) after modules, add error debug	2015-10-18 18:49:03 -05:00
PabstMirror	26c051d397	Sitting - Fix missing semicolon	2015-10-18 11:48:21 -05:00
IngoKauffmann	1804215dbb	Readded caliber for ACE_Hydra70_DAGR	2015-10-18 13:21:20 +02:00
IngoKauffmann	f02c57b599	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm ... Conflicts: addons/missileguidance/CfgAmmo.hpp	2015-10-18 13:19:27 +02:00
IngoKauffmann	5a453a7074	Fixed flying ... Moved attached ammo further away	2015-10-18 13:11:28 +02:00
IngoKauffmann	8a4b3a117a	Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm	2015-10-18 12:49:36 +02:00
Glowbal	843eb16837	Merge pull request #2650 from acemod/setDefaultChannel ... Set Default Channel at mission start	2015-10-18 12:28:13 +02:00
Glowbal	f57eb08ce5	Merge pull request #2620 from jonpas/sittingFramework ... Sitting Framework	2015-10-18 12:26:53 +02:00
Glowbal	8e4bc264cc	Merge branch 'master' into map_gestures ... Conflicts: AUTHORS.txt	2015-10-18 12:20:54 +02:00
Glowbal	9a0aa2b14c	Merge pull request #2152 from jokoho48/codeCleanupKestrel4500 ... Code cleanup of Kestrel 4500 module	2015-10-18 12:16:44 +02:00
Glowbal	76efdbcc1c	Merge pull request #2257 from jonpas/parseList ... Parse List Common Function	2015-10-18 12:14:18 +02:00
Glowbal	ebe2bf96cd	Merge pull request #2277 from jokoho48/codeCleanUpConcertina_wire ... Code cleanup of Concertina_wire Module	2015-10-18 12:13:44 +02:00
Glowbal	3682a1710b	Merge pull request #2527 from alef/issues/titan_miss ... Fix: Titan hitting ground instead of vehicle	2015-10-18 12:11:09 +02:00
PabstMirror	da2d140a39	Cleanup unnecessary statement	2015-10-17 14:30:59 -05:00
jokoho48	bfcf057dab	extract Gestures to own Module and Port THS to ACE	2015-10-17 21:17:37 +02:00
SilentSpike	b6dd7b941f	Reduce overhead of spectator map icons ... Fixes #2514 by only rendering individual unit icons when zoomed in and only rendering the units currently within the screen bounds. Behaves as expected, but whether or not it has a significant performance increase under scaled up testing conditions remains to be seen.	2015-10-17 13:23:51 +01:00
PabstMirror	fa7299ba1b	Add array info to header	2015-10-16 08:28:54 -05:00
PabstMirror	94e3cd1f79	Replace old use of showHud	2015-10-15 22:45:35 -05:00
PabstMirror	bec884e581	showHud handler	2015-10-15 22:33:05 -05:00
SzwedzikPL	98f6bb3589	Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps ... Conflicts: addons/cargo/CfgVehicles.hpp addons/interaction/CfgVehicles.hpp addons/interaction/XEH_preInit.sqf addons/interaction/stringtable.xml	2015-10-15 11:49:08 +02:00
PabstMirror	6ffde8150f	Simplify Map Light Interactions	2015-10-14 14:36:40 -05:00
jokoho48	2dcdd224bd	fix privates in Map module	2015-10-14 19:56:54 +02:00
PabstMirror	f7fe0c08e0	#2391 - Use AGL for sitting setPos	2015-10-14 11:15:44 -05:00
PabstMirror	680f52cd27	Handle Distance when mounted	2015-10-13 13:40:16 -05:00
PabstMirror	8ffe1b4e01	#2528 (2) - Integrate Dragging	2015-10-13 02:20:19 -05:00
PabstMirror	ad1191cdd5	#2528 - Medical Menu Work ... (1) Verify target is valid and in reasonable range	2015-10-13 02:01:59 -05:00
PabstMirror	5d76395914	#2734 - Map effects / flashlights for TrippleHead	2015-10-12 11:27:38 -05:00
PabstMirror	7062f60f0a	Fix UBC from #2726	2015-10-12 01:07:20 -05:00
Glowbal	1e26fee3ba	Merge pull request #2683 from acemod/commonCleanupX ... Common cleanup x	2015-10-11 12:15:27 +02:00
Glowbal	8db8e87c53	Merge pull request #2560 from acemod/lockingMissles ... #2349 - Don't disable locking for base RocketPods	2015-10-11 12:06:11 +02:00
Glowbal	94ed78a173	Merge pull request #2578 from alganthe/strings_fix ... PAK and Surgical Kit strings normalized inside modules.	2015-10-11 12:05:11 +02:00
PabstMirror	4ba0d72bfd	#2580 (1) - Fix bandages always created at terrain level.	2015-10-10 23:09:52 -05:00
IngoKauffmann	b5568ca0db	Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel ... Conflicts: optionals/compat_bwa3/config.cpp	2015-10-10 13:13:30 +02:00
PabstMirror	53f833b68c	#2702 - Cargo: Make "Supply Box" pallets heavy	2015-10-10 00:19:09 -05:00
PabstMirror	f2c66240ca	#2717 - Cleanup Coax Weapon Mempoints	2015-10-08 22:32:07 -05:00
PabstMirror	f8ca3693fd	#2709 - Fix AB handleFired _muzzleVelocityShift	2015-10-08 21:22:00 -05:00
PabstMirror	326d549510	#2696 - Rangecard check bounds before select	2015-10-08 20:32:14 -05:00
BaerMitUmlaut	2fe53431c7	Split event handlers	2015-10-08 19:29:30 +02:00
BaerMitUmlaut	e50a28874f	Fix for BI bug, FFV support	2015-10-08 11:31:29 +02:00
PabstMirror	f3c4ff66ca	#2701 - Fix gun smoke on AMV	2015-10-08 02:51:54 -05:00
jonpas	e6a5d8c990	Remove enable optics in adjusted prone stances	2015-10-07 23:00:35 +02:00
BaerMitUmlaut	edb76ffae4	Initial commit	2015-10-07 20:11:07 +02:00
PabstMirror	39b838c7ab	Merge pull request #2681 from acemod/vehDetachLocalfix ... Attach getIn/Out run on local unit	2015-10-06 13:49:58 -05:00
commy2	9c22052871	Merge pull request #2685 from acemod/340removeactionsondead ... remove check ammo action on destroyed static weapons	2015-10-06 19:36:19 +02:00
BaerMitUmlaut	1effe61aa9	Removed parent condition	2015-10-06 19:09:51 +02:00
BaerMitUmlaut	090384c014	Fixed canPassMagazine header	2015-10-06 17:56:32 +02:00
BaerMitUmlaut	d6dcd4112e	Resolved merge conflicts	2015-10-06 17:50:55 +02:00
SilentSpike	e5b29727a5	Merge pull request #2617 from jonpas/zeusSpareparts ... Add Zeus Modules for Adding Spare Parts	2015-10-05 19:01:50 +01:00
SilentSpike	780e0aa270	Add vision mode support to spectator external cam ... Since external view is actually another camera, vision modes should also apply to it too.	2015-10-04 19:26:53 +01:00
SilentSpike	4079ca354e	Update spectator function headers	2015-10-04 18:30:07 +01:00
SilentSpike	c1dc8a6493	Fix spectator 3D icons not rendering ... Fixes #2676 as per voiperr's suggestion (working with camera can be really strange, I swear this worked before)	2015-10-04 18:17:07 +01:00
SilentSpike	52d703c2eb	Improve spectator seagull handling ... Previously they were only hidden, but this didn't account for the annoying audio they play so now they're entirely staged like a spectator unit would be.	2015-10-04 18:17:02 +01:00
SilentSpike	f0f822b4bc	Decrease default spectator camera speed	2015-10-04 18:17:01 +01:00
SilentSpike	b1dda86cb2	End spectator interface when the mission ends ... Fixes #2592 (in theory) by forcing spectator closed on mission end	2015-10-04 18:17:01 +01:00
PabstMirror	616bc9f8a0	local-private waitAndXX PFEH	2015-10-04 11:38:31 -05:00
PabstMirror	f3e61e2136	Merge branch 'master' into commonCleanupX	2015-10-04 11:31:05 -05:00
SilentSpike	0beaa40fbc	Add API parameter to allow for unforced spectator ... Adds an optional boolean paremeter to the setSpectator function for forcing the interface. It is forced by default, so if `false` is passed as the value the spectator will be able to close the interface with the escape button.	2015-10-04 13:52:54 +01:00
gienkov	b6d2cdee69	Merge remote-tracking branch 'origin/master' into pl-strings	2015-10-04 12:25:55 +02:00
commy2	d9595b6176	fix fnc_binocularMagazine on remote and dead units	2015-10-04 12:10:08 +02:00
commy2	92ed7eeac2	remove check ammo action on destroyed static weapons, fix #2671	2015-10-04 11:58:26 +02:00
commy2	42ce11cfee	Merge pull request #2679 from acemod/340missingmags ... fix missing magazines after certain scenarios	2015-10-04 11:46:36 +02:00
commy2	5ed290362d	Merge pull request #2663 from acemod/340rallypointminutes ... fix broken time format for rallypoints, fix #2662	2015-10-04 11:46:25 +02:00
commy2	040a63bd8f	Merge pull request #2254 from acemod/waitUntilAndExecute ... Add WaitUntilAndExecute Function	2015-10-04 11:45:54 +02:00
commy2	a2b6166aa0	optimization waitUntilAndExecute, add comments	2015-10-04 11:43:13 +02:00
Glowbal	f8cebd9403	Merge pull request #2007 from jokoho48/codeCleanupWeather ... Code cleanup Weather module	2015-10-04 09:36:32 +02:00
Glowbal	58ea8d5e2c	Merge pull request #2543 from alef/feature/death_short_diagnose ... Remove: pain diagnosis on dead patients	2015-10-04 09:34:10 +02:00
Glowbal	9ce4ce6cdd	Merge pull request #2582 from acemod/fixLitterFloating ... fix Littergeneric fly over ground	2015-10-04 09:32:03 +02:00
Glowbal	e36df978ec	Merge pull request #2646 from DerekSauer/FixArmaInjury ... Fix healHitPointAfterAdvBandage - Issue #2498.	2015-10-04 09:28:47 +02:00
Glowbal	2c292af77e	Merge pull request #2680 from acemod/cargoLockedVeh ... Disable loading into locked vehicles.	2015-10-04 09:26:53 +02:00
Glowbal	4445ecd7c4	Merge pull request #2581 from acemod/invisibleLadder ... Invisible Tactical Ladder	2015-10-04 09:26:34 +02:00
Glowbal	a823eff37f	Merge pull request #2674 from acemod/triageCardGameTime ... Use ACE_gameTime for triage card	2015-10-04 09:22:18 +02:00
PabstMirror	59da3e1c35	Optimize PFEH Funcs	2015-10-03 23:05:46 -05:00
PabstMirror	c75d219b65	Cleanup Undefined Functions	2015-10-03 21:34:46 -05:00
PabstMirror	7315dd650f	Merge branch 'master' into vehDetachLocalfix	2015-10-03 19:44:20 -05:00
PabstMirror	21f35dc7d0	#2664 - Disable loading into locked vehicles.	2015-10-03 19:42:40 -05:00
commy2	f0036fabbb	use BIS fnc for time format	2015-10-04 02:15:38 +02:00
commy2	38422e6586	fix missing magazines after certain scenarios	2015-10-04 01:26:38 +02:00
PabstMirror	10950d5fab	Merge pull request #2623 from acemod/interactMenuSet ... Interact menu settings after init	2015-10-03 12:49:04 -05:00
PabstMirror	12c663978a	Merge pull request #2649 from acemod/captiveEvents ... Global Event for "CaptiveStatusChange"	2015-10-03 12:47:58 -05:00
PabstMirror	b0b755720c	#2672 - Use ACE_gameTime for triage card	2015-10-03 12:28:54 -05:00
jokoho48	25166226a0	change by idea from @jonpas	2015-10-03 17:38:24 +02:00
jokoho48	1de012b7a7	simplify frag config(Macros FTW)	2015-10-03 12:34:04 +02:00
gienkov	3d4a37614c	Merge remote-tracking branch 'origin/master' into pl-strings	2015-10-03 12:19:48 +02:00
commy2	573279bd30	add selection, collision, fall and drowning damage events	2015-10-02 23:19:14 +02:00
commy2	94eaeb38cc	move variable out of params	2015-10-01 21:34:40 +02:00
commy2	7f1f56c121	fix broken time format for rallypoints, fix #2662	2015-10-01 21:28:00 +02:00
commy2	ea01db4030	Merge pull request #2648 from acemod/340goggles ... Code cleanup / refactoring Goggles	2015-10-01 16:54:57 +02:00
licht-im-Norden87	66e8914360	Update stringtable.xml	2015-10-01 04:38:21 +02:00
Derek Sauer	f9352de489	Clarified comment slightly.	2015-09-30 20:34:51 -04:00
Derek Sauer	0a788a282e	Improved efficiency of wound counting. ... Using a switch/case conditional since it offers early termination if a matching condition is found before all conditions are checked. It also unnecessary to use a conditional to confirm whether a limb is wounded or not. Number of Wounds multiplied by Blood loss will return zero for a fully bandaged body part, not incrementing the wound counter; or it will return some other number which will increment the wound counter.	2015-09-30 20:27:40 -04:00
licht-im-Norden87	88ee846d7d	Update Stringtable, german: "captives"	2015-10-01 01:36:27 +02:00
commy2	1fdedb5785	delay scroll wheel init	2015-09-30 19:29:17 +02:00
Derek Sauer	f69f4066e9	Fix capitalization on forEach and getVariable.	2015-09-30 06:17:54 -04:00
commy2	945ec7a388	more goggles code cleanup	2015-09-30 01:31:45 +02:00
commy2	dc882a3c66	more goggles code cleanup	2015-09-30 01:26:08 +02:00
commy2	c0105bf083	Merge branch 'master' of https://github.com/acemod/ACE3 into 340goggles	2015-09-30 00:28:26 +02:00
commy2	75d1ea7df3	Merge branch 'master' of https://github.com/acemod/ACE3	2015-09-30 00:14:41 +02:00
commy2	9f3615ea06	change function header of removeEventhandler and waitAndExecute to public: yes	2015-09-30 00:14:21 +02:00
commy2	8bbd6b69f0	change function header of removeEventhandler and waitAndExecute to public: yes	2015-09-30 00:12:35 +02:00
commy2	28e0e781f5	Merge pull request #2645 from acemod/340fixopticszeus ... fix zeus forced interface broken, fix #2642	2015-09-29 23:04:51 +02:00
Derek Sauer	2824009317	Incorrectly retrieving list of current wounds. ... Used the wrong method to retrieve the target's current wounds and was getting an empty array. This caused bandaging any wound even once to completely heal the target on the Arma side.	2015-09-29 17:00:49 -04:00
commy2	8d5ce1dbe2	more goggles code cleanup	2015-09-29 22:24:25 +02:00
Derek Sauer	8d05214eb0	Resolve merge conflict from upstream pull.	2015-09-29 16:24:17 -04:00
gienkov	ba42e3e295	pl string for dragging, tactical ladder	2015-09-29 22:12:11 +02:00
commy2	62349f685c	more goggles code cleanup	2015-09-29 22:01:40 +02:00
gienkov	d88d2fe578	Merge remote-tracking branch 'origin' into pl-strings	2015-09-29 21:56:29 +02:00
commy2	b7ce315240	more goggles code cleanup	2015-09-29 21:28:57 +02:00
gienkov	251437c415	pl translation	2015-09-29 20:37:30 +02:00
commy2	d1aacf3fef	more goggles code cleanup	2015-09-29 19:51:41 +02:00
commy2	53bfcdb61e	more goggles code cleanup	2015-09-29 18:51:24 +02:00
PabstMirror	d454271fb9	Give the event the D	2015-09-29 11:40:32 -05:00
PabstMirror	c0b78ecf3a	Set Default Channel at mission start	2015-09-29 11:36:30 -05:00
commy2	d051d4c208	more goggles code cleanup	2015-09-29 17:57:09 +02:00
PabstMirror	16b1244b0a	Global Event for "CaptiveStatusChange"	2015-09-29 10:17:17 -05:00
commy2	477e9f06b6	more goggles code cleanup	2015-09-29 17:09:23 +02:00
commy2	2731ac360a	more goggles code cleanup	2015-09-29 16:56:10 +02:00
commy2	d25d79c485	Goggles Code refactoring initial commit	2015-09-29 16:22:57 +02:00
Derek Sauer	954fad615a	Reformatted to follow ACE3 coding guidelines.	2015-09-29 06:36:36 -04:00
Derek Sauer	8619f02538	Take into account wounds that do no cause blood loss.	2015-09-29 06:19:49 -04:00
PabstMirror	6e24d2868c	Fix playerChanged event	2015-09-28 22:41:45 -05:00
Derek Sauer	a864a3411c	Clarified a comment.	2015-09-28 21:32:04 -04:00
commy2	1ec4556bb8	fix zeus forced interface broken, fix #2642	2015-09-29 02:48:22 +02:00
Derek Sauer	488541bba6	Fix for Arma wounds not being healed with healHitPointAfterAdvBandage.	2015-09-28 20:08:07 -04:00
commy2	19131f001d	fix error in handleplayerchanged for tacticl ladder	2015-09-28 21:16:13 +02:00
commy2	bc8cefa5e7	manual merge	2015-09-28 21:06:40 +02:00
commy2	34793ce044	Merge pull request #2635 from acemod/340interactcleanup ... Code Cleanup Interaction	2015-09-28 21:04:28 +02:00
commy2	6c968d8bc7	per frame handler for incremental door opening	2015-09-28 20:07:01 +02:00
commy2	443cbf8be3	fix compile error when trying to open a locked door by shortcut	2015-09-28 19:03:37 +02:00
commy2	6f64fcd0fb	search for door in geometry lod (lineintersectssurface)	2015-09-28 18:45:10 +02:00
commy2	6289a0cadb	Merge pull request #2626 from acemod/340weaponselectcleanup ... Code Cleanup WeaponSelect	2015-09-28 18:10:16 +02:00
commy2	5a3a32f236	more interaction cleanup	2015-09-28 18:06:25 +02:00
commy2	9bf7b68d76	fix errors on game start	2015-09-28 17:28:51 +02:00
commy2	5c5a65443b	more interaction cleanup	2015-09-28 17:20:56 +02:00
commy2	f48636e633	more interaction cleanup, remove dead code	2015-09-28 17:11:53 +02:00
Glowbal	e1bbc06ef8	Merge pull request #2613 from jonpas/improveSlideshowParams ... Improved Slideshow API	2015-09-28 16:38:00 +02:00
jonpas	4521df0a57	Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter	2015-09-28 16:17:12 +02:00
jonpas	db2572acfd	Merge branch 'master' into parseList ... Conflicts: addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf	2015-09-28 16:06:32 +02:00
jonpas	e4d8f13c89	Change may to must in slideshow error log	2015-09-28 16:02:18 +02:00
Glowbal	7215dd9082	Merge pull request #2368 from jonpas/removeVignetteAndCleanUI ... Removed Vignette and Cleaned up UI component	2015-09-28 15:56:34 +02:00
commy2	9189148b3f	more interaction cleanup	2015-09-28 15:37:18 +02:00
Glowbal	74805caa5d	Merge pull request #2565 from acemod/medVehAssignFix ... assign vehicle module fix for prefilled veh	2015-09-28 15:02:48 +02:00
commy2	4b536425b1	Code Cleanup Interaction	2015-09-28 14:36:51 +02:00
SilentSpike	f5e46bf089	Merge remote-tracking branch 'origin/master' into cargoClassnames	2015-09-27 17:41:38 +01:00
SilentSpike	f65f6e9b72	Add support for virtual cargo ... Allows cargo objects to be added via classname and reduces simulation/synchronization overhead. Objects become physical upon unloading and cannot be re-made virtual, only scripts can add such virtual objects. Also separates the player feedback from the loading/unloading code and adds a progress bar.	2015-09-27 17:34:37 +01:00
commy2	e9770fcb97	remove obsolete functions	2015-09-27 17:15:59 +02:00
commy2	1613ce3ff6	correct comment	2015-09-27 16:55:43 +02:00
commy2	b6532a05cc	new function to select a grenade	2015-09-27 16:47:02 +02:00
commy2	f8819d3ee4	WeaponSelect cleanup	2015-09-27 14:55:36 +02:00
commy2	e3b926296f	Merge branch 'master' of https://github.com/acemod/ACE3 into 340weaponselectcleanup	2015-09-27 13:53:00 +02:00
commy2	af24428363	Merge pull request #2607 from acemod/340cleanupBackpacks ... Code cleanup Backpacks	2015-09-27 13:50:20 +02:00
commy2	1a5f65ec5a	Merge pull request #2625 from acemod/340safetymodecleanup ... Code Cleanup SafetyMode, also fixes "cannot load sound .wss" RPT error	2015-09-27 13:50:11 +02:00
commy2	92ae1da660	Merge pull request #2622 from jonpas/aliveCommand ... Replaced isAlive function with alive command	2015-09-27 13:49:58 +02:00
commy2	5387700460	Merge pull request #2610 from acemod/340cleanupNoRadio ... Code Cleanup NoRadio	2015-09-27 13:49:08 +02:00
commy2	0500d4385d	Merge pull request #2611 from acemod/340cleanupHitReactions ... Code Cleanup HitReactions	2015-09-27 13:48:57 +02:00
commy2	fbe157614b	Merge pull request #2612 from acemod/340cleanupGrenades ... Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing	2015-09-27 13:48:46 +02:00
commy2	3211e6432e	Merge pull request #2614 from jonpas/loadCargoOptionalHint ... Optionalized Cargo Loaded Hint	2015-09-27 13:48:27 +02:00
commy2	a078d73230	Code Cleanup WeaponSelect	2015-09-27 08:51:42 +02:00
commy2	50046decf3	Code Cleanup SafetyMode	2015-09-27 08:28:55 +02:00
PabstMirror	4a935eb129	Remove debug	2015-09-26 22:02:44 -05:00
PabstMirror	174d8ac306	#2486 - Run color setup on settingsInit	2015-09-26 22:02:05 -05:00
jonpas	2ab58ab9ce	Replaced common,isAlive function with alive command	2015-09-27 02:23:56 +02:00
jonpas	f35b13bf29	Merge branch 'master' into sittingFramework	2015-09-27 02:16:51 +02:00
jonpas	ae07a71b0d	Minimized XEH to ThingX config level	2015-09-27 02:13:32 +02:00
jonpas	cd510c8ff7	Added carrying to chairs	2015-09-27 02:05:38 +02:00
jonpas	85cff04e0c	Stored scroll-wheel action ID into already existing player setVariable instead of having 2	2015-09-27 01:37:19 +02:00
jonpas	dbd0beb514	Stored a global variable in player setVariable	2015-09-27 01:31:23 +02:00
jonpas	a7a716ca8d	Better sitting framework in terms of interactions	2015-09-27 01:20:40 +02:00
jonpas	e3985dce3e	Cleanup sitRotation as it's no longer needed	2015-09-27 00:40:59 +02:00
jonpas	151903ace4	Expanded optional hint to addCargoItem and AddCargoByClass event	2015-09-27 00:31:23 +02:00
jonpas	b345db4ae9	Added Zeus modules for adding Spare Tracks and Wheels	2015-09-27 00:29:19 +02:00
jonpas	30544dc757	Make cargo loaded hint optional, disable it when not loading manually	2015-09-26 23:16:05 +02:00
jonpas	498dddcc26	Used isEqualTo	2015-09-26 23:06:35 +02:00
jonpas	b787286837	Fixed allowed data types	2015-09-26 23:02:18 +02:00
jonpas	4a5d6cade1	Bracket to Brace	2015-09-26 22:54:31 +02:00
jonpas	64d6a172c7	Improved public function parameter handling, Fixed issue with synchronized objects	2015-09-26 22:53:49 +02:00
commy2	cd839a0ddc	remove superfluous brackets	2015-09-26 22:42:47 +02:00
commy2	6cc920dc34	Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing	2015-09-26 22:39:12 +02:00
commy2	028aa404e9	change description in function header	2015-09-26 21:27:00 +02:00
commy2	c12584e15c	Code Cleanup HitReactions	2015-09-26 21:23:18 +02:00
commy2	0509e26690	Code Cleanup NoRadio	2015-09-26 20:45:19 +02:00
commy2	9ae215704c	Code cleanup Backpacks	2015-09-26 20:29:08 +02:00
commy2	f77242fce3	Merge pull request #2604 from acemod/340fixunconaftersettngsinit ... delay setUnconscious until the settings are inited	2015-09-26 19:54:09 +02:00
commy2	07774647e9	delay setUnconscious until the settings are inited, fix #148	2015-09-26 19:30:13 +02:00
Niner1309	1a43341506	Fixed Laser Update Position Bug	2015-09-26 19:15:09 +02:00
commy2	93114802d2	Merge pull request #2603 from acemod/340fixcargodestroyed ... dont access cargo of destroyed vehicles, fix #2523	2015-09-26 18:29:56 +02:00
commy2	8affae9f7a	dont access cargo of destroyed vehicles, fix #2523	2015-09-26 18:16:38 +02:00
commy2	777ac05d16	Merge pull request #2602 from acemod/340respawncleanup ... Code cleanup respawn module, close #2184	2015-09-26 17:58:17 +02:00
commy2	6d9943ff2e	fix wrong macro, missing ;	2015-09-26 16:45:39 +02:00
commy2	b1fb7befe8	remove wrong isServer check	2015-09-26 16:32:29 +02:00
commy2	5425836e47	cleanup respawn module, close #2184	2015-09-26 16:28:18 +02:00
commy2	f0584adeff	Merge pull request #2601 from acemod/340fixfixfloatingSelections ... fix fixFloating resetting reflector hitpoints, close #2279	2015-09-26 14:45:50 +02:00
commy2	dc7d24a3fd	fix fixFloating resetting reflector hitpoints, close #2279	2015-09-26 14:38:50 +02:00
PabstMirror	8bb5f71ba1	Macro for non spawned CBA Debug Logging	2015-09-25 22:30:57 -05:00
commy2	2fe142032e	rework modifier key, cleanup sandbags, tripod, ladder, fix #2590	2015-09-26 03:16:55 +02:00
SilentSpike	5f7c30dd7c	Merge pull request #2597 from Cuel/delay-spectator ... fix spectator view if called instantly	2015-09-25 13:34:37 +01:00
jokoho48	4ad16ed938	fix that waitUntilAndExecute have a return	2015-09-25 13:29:39 +02:00
jokoho48	998fbcc403	Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-25 13:19:19 +02:00
Cuel	dcbf977d6d	fix spectator view if called instantly ... If you call setSpectator directly from init.sqf you'll be put into some weird limbo mode with borders and spectator not working. This should fix it	2015-09-25 12:51:13 +02:00
commy2	43cdfaecc0	Merge branch 'master' of https://github.com/acemod/ACE3	2015-09-25 11:15:46 +02:00
commy2	412685e0ff	fix some code was commented out in loadPersonLocal and unloadPersonLocal	2015-09-25 11:15:25 +02:00
jokoho48	f7787730e1	fix Littergeneric fly over ground(add Landcontact Points)	2015-09-23 20:17:16 +02:00
jokoho48	d6203d0f2e	Posible Fix for Invisible Tactical Ladder V2	2015-09-23 19:54:12 +02:00
jokoho48	dce49721e4	Posible Fix for Invisible Tactical Ladder	2015-09-23 19:17:57 +02:00
KoffeinFlummi	3471ebef16	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
alganthe	10296d2883	PAK and Surgical Kit strings normalized inside modules. ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-23 15:50:50 +02:00
bux578	95ec25736e	Merge pull request #2563 from gienkov/missing-strings ... Missing english strings	2015-09-23 09:48:54 +02:00
PabstMirror	ebcc540943	Merge pull request #2572 from acemod/fixClickExplosivePlace ... Delay one frame when selecting explosives	2015-09-22 13:23:33 -05:00
PabstMirror	5add8d6789	#2537 - Delay one frame when selecting explosives	2015-09-22 11:31:58 -05:00
jonpas	a42685af2e	Removed copy/pasted maintainer intruder	2015-09-22 18:04:27 +02:00
Grzegorz	1848ea6325	fixez	2015-09-22 14:58:59 +02:00
[OMCB]kaban	49d1355ad8	Fix due to review	2015-09-22 11:52:06 +03:00
PabstMirror	cf8a7f742e	#2541 - Attach getIn/Out run on local unit	2015-09-21 22:50:48 -05:00
PabstMirror	f93538eb9a	#2423 - assign vehicle module fix for prefilled veh	2015-09-21 21:44:52 -05:00
PabstMirror	079d88ded7	Merge pull request #2509 from acemod/miscFixNilFunctions ... Fix some nil functions	2015-09-21 20:36:09 -05:00
PabstMirror	bf0cdbaf77	Merge pull request #2534 from acemod/unconcHandcuffs ... Take Unconscious captive	2015-09-21 20:35:02 -05:00
Grzegorz	55eae90484	tabz	2015-09-22 02:35:06 +02:00
gienkov	bbccfbaa35	pl medical string	2015-09-22 01:04:46 +02:00
commy2	24f0df55a2	Merge pull request #2559 from acemod/340disableuserinputcleanup ... Use CBA PFH in disableUserInput	2015-09-22 00:52:58 +02:00
commy2	617b1ec78d	Merge pull request #2556 from acemod/340deprecation ... add deprecated warnings	2015-09-22 00:52:43 +02:00
gienkov	229ba1f758	Merge remote-tracking branch 'upstream/master' into missing-strings	2015-09-22 00:36:32 +02:00
gienkov	b05f0c62ff	missing english respawn strings	2015-09-22 00:36:10 +02:00
PabstMirror	45e44251b6	Merge branch 'release' ... Conflicts: addons/repair/stringtable.xml	2015-09-21 17:14:53 -05:00
PabstMirror	6702a1faa4	Fix warnings for WeaponHolderSimulated	2015-09-21 16:34:02 -05:00
jonpas	2e3014daa3	Merge branch 'master' into parseList ... Conflicts: addons/common/functions/fnc_assignObjectsInList.sqf	2015-09-21 22:46:01 +02:00
commy2	23e3db9cc0	use CBA pfh in disableUserInput and fix key input weirdness	2015-09-21 22:42:31 +02:00
Glowbal	62ad9d4284	Version 3.3.2	2015-09-21 22:31:01 +02:00
Glowbal	42b2c18509	Merge pull request #2542 from acemod/FixSparePartsCargo ... Fix cargo setVariable on server with InitPost	2015-09-21 22:28:59 +02:00
Glowbal	6b93760f9b	Merge pull request #2557 from alganthe/torso_diag_fix ... Torso diag fix	2015-09-21 22:27:13 +02:00
Glowbal	bbed98fbef	Merge pull request #2394 from jonpas/cleanupRepairRelease ... Minor Repair Cleanup for release	2015-09-21 22:25:58 +02:00
commy2	f1abd4698f	remove superfluous ;	2015-09-21 22:12:17 +02:00
commy2	08a6da7ed5	Merge branch '340deprecation' of https://github.com/acemod/ACE3 into 340deprecation	2015-09-21 22:10:11 +02:00
commy2	f134a77e98	add and use deprecated macro	2015-09-21 22:09:54 +02:00
PabstMirror	d3c2420381	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_doAnimation.sqf	2015-09-21 15:08:43 -05:00
PabstMirror	9996aa22ab	Replace googles - isTurnedOut	2015-09-21 15:03:34 -05:00
commy2	a98e490f5c	Merge pull request #2512 from acemod/340fixaidisposable ... fix ai seemingly reloading disposable launcher at mission start, fix #2508	2015-09-21 22:00:55 +02:00
commy2	f8676afca4	use correct macro for rpt writing	2015-09-21 21:56:18 +02:00
commy2	020915a52a	Revert "fix broken log warning macro" ... This reverts commit b1f79f0383.	2015-09-21 21:51:05 +02:00
commy2	441efcd65f	change version number in deprecated log	2015-09-21 21:48:18 +02:00
commy2	b1f79f0383	fix broken log warning macro	2015-09-21 21:39:45 +02:00
commy2	af309b937b	add depracted warnings	2015-09-21 21:25:18 +02:00
commy2	a1b2d63417	Merge pull request #2551 from acemod/commoncleanup11 ... common code cleanup part 11	2015-09-21 21:12:42 +02:00
commy2	0070ba113c	Merge pull request #2546 from acemod/overheatJamFFV ... Allow fixing jam when in FFV slot	2015-09-21 19:51:14 +02:00
PabstMirror	1d5217d165	Medical - delayedUnconsicous fix waitAndExecute	2015-09-21 12:43:35 -05:00
commy2	5a5242f1c9	more common code cleanup	2015-09-21 19:19:49 +02:00
PabstMirror	4cc9b91d68	Merge pull request #2463 from acemod/cleanupNightvision ... Cleanup Nightvision	2015-09-21 12:06:15 -05:00
PabstMirror	5a67b00540	Merge pull request #2507 from acemod/pythonSearchNilFuncs ... Script to search for undefined functions	2015-09-21 12:05:27 -05:00
commy2	8503d15c9b	more common code cleanup	2015-09-21 18:37:19 +02:00
commy2	1a4ebdac51	more common code cleanup	2015-09-21 17:32:21 +02:00
commy2	13b487e13b	fix missing ;	2015-09-21 17:13:28 +02:00
commy2	b5b5c761c4	fix missing '' in info log macro	2015-09-21 17:09:10 +02:00
commy2	3037181fc2	more common code cleanup	2015-09-21 17:00:53 +02:00
commy2	df3211cc42	more common code cleanup	2015-09-21 14:20:53 +02:00
commy2	b0f9eab1f7	more common code cleanup	2015-09-21 13:53:12 +02:00
commy2	5adca6616d	Merge branch '323cleanuphitpoints' into commoncleanup10	2015-09-21 13:24:12 +02:00
commy2	9fa6eb0651	more common code cleanup	2015-09-21 13:08:10 +02:00
commy2	ef099861a3	Merge pull request #2545 from acemod/commoncleanup9 ... common code cleanup part 9	2015-09-21 09:24:41 +02:00
bux578	9be4072a10	Merge pull request #2547 from gienkov/patch-34 ... Add missing english string	2015-09-21 08:44:31 +02:00
bux578	549a3e0a2a	Merge pull request #2548 from gienkov/patch-35 ... Add missing english string	2015-09-21 08:44:16 +02:00
commy2	d802cdfb23	more common code cleanup	2015-09-21 01:41:17 +02:00
commy2	d449e4bd83	more common code cleanup	2015-09-21 01:07:49 +02:00
PabstMirror	5555eb195a	Also search for missing stringtable entries	2015-09-20 17:46:43 -05:00
Grzegorz	89a1495534	Add missing english string	2015-09-21 00:42:08 +02:00
Grzegorz	29db26eb58	Add missing english string	2015-09-21 00:40:14 +02:00
Grzegorz	fe75aa55cf	Add missing english string	2015-09-21 00:39:13 +02:00
commy2	5f7d8c0095	more common code cleanup	2015-09-21 00:34:04 +02:00
commy2	1679235b51	more common code cleanup	2015-09-21 00:28:25 +02:00
PabstMirror	345b1f0f98	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_execPersistentFnc.sqf addons/common/functions/fnc_execRemoteFnc.sqf	2015-09-20 17:02:49 -05:00
PabstMirror	79d4eb62be	Allow fixing jam when in FFV slot	2015-09-20 16:55:33 -05:00
commy2	1d4eb209a4	fix missing ; in dumpPerformanceCounters	2015-09-20 23:50:30 +02:00
commy2	ffc5a16384	more common code cleanup	2015-09-20 23:40:51 +02:00
commy2	a98a45e5d1	more common code cleanup	2015-09-20 23:18:51 +02:00
commy2	62ec00a251	more common code cleanup	2015-09-20 22:36:05 +02:00
commy2	5fd1938f25	more common code cleanup	2015-09-20 22:29:38 +02:00
commy2	493ce1b092	more common code cleanup	2015-09-20 22:16:51 +02:00
commy2	2348c25e1a	more common code cleanup	2015-09-20 20:25:25 +02:00
PabstMirror	86fae2c251	#2528 - addToLog date / missing string fullHeal	2015-09-20 13:19:51 -05:00
PabstMirror	0c8a694b96	Medical_menu settings under medical category	2015-09-20 12:07:44 -05:00
PabstMirror	610fb0bb2c	Fix Merge	2015-09-20 11:28:43 -05:00
PabstMirror	7687374fcf	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_resetAllDefaults.sqf	2015-09-20 11:25:33 -05:00
Alessandro Foresi	aabc437314	Remove: pain diagnosis on dead patients	2015-09-20 17:37:33 +02:00
PabstMirror	9c61f256bc	Rem debug	2015-09-20 10:06:24 -05:00
PabstMirror	789f3843d5	#2488 - Fix cargo setVariable on server with InitPost	2015-09-20 10:05:34 -05:00
commy2	0a01bbdc76	more common code cleanup	2015-09-20 16:56:35 +02:00
commy2	e62683a0c4	more common code cleanup	2015-09-20 16:40:49 +02:00
commy2	e8ebe87450	more common code cleanup	2015-09-20 15:52:40 +02:00
alganthe	4265b11d51	wrong target fixed ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-20 14:13:22 +02:00
Glowbal	461028b4e8	Merge pull request #2521 from acemod/fix-ctd-medical ... Fixed CTD on overpressure with advanced medical enabled	2015-09-20 12:44:58 +02:00
Glowbal	8279f60d09	Merge pull request #2529 from acemod/repairCanInteractCheck ... Add CanInteractWith checks for repair	2015-09-20 11:48:10 +02:00
Glowbal	409c2d5f78	Merge pull request #2505 from acemod/fixBFT ... Run BFT module on server	2015-09-20 11:46:03 +02:00
commy2	4c4785c140	Merge pull request #2535 from acemod/commoncleanup7 ... common code cleanup part 7	2015-09-20 11:06:38 +02:00
commy2	d33a98c612	set variable public didn't work / didn't work on server and headless client	2015-09-20 11:02:15 +02:00
commy2	8c8b23ec18	Merge pull request #2530 from acemod/commoncleanup6 ... common code cleanup part 6	2015-09-20 10:44:31 +02:00
PabstMirror	05f4dad764	maptools - Remove debug	2015-09-19 20:42:46 -05:00
commy2	dfa6d71a64	more common code cleanup	2015-09-20 00:55:58 +02:00
commy2	73a9c1b5f8	more common code cleanup	2015-09-19 23:18:07 +02:00
commy2	6b96c7fd7c	more common code cleanup	2015-09-19 22:27:23 +02:00
commy2	bfd5d13de8	more common code cleanup	2015-09-19 21:33:25 +02:00
bux578	450ee98004	Merge pull request #2515 from acemod/340fixinventoryeh ... fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513	2015-09-19 21:04:48 +02:00
PabstMirror	db41537f56	#2524 - Take Unconscious captive	2015-09-19 13:58:34 -05:00
commy2	09f133b7f8	more common code cleanup	2015-09-19 20:55:35 +02:00
SilentSpike	35d94e8d5c	Fix medical litter scopeCurator values ... Solves #2526 where medical litter would appear in zeus with no name.	2015-09-19 19:37:38 +01:00
commy2	3ddaa5ed4a	more common code cleanup	2015-09-19 20:34:07 +02:00
commy2	1636e3976d	more common code cleanup	2015-09-19 20:17:38 +02:00
commy2	cbc7f961b2	more common code cleanup	2015-09-19 19:40:56 +02:00
commy2	20a5c79431	more common code cleanup	2015-09-19 19:26:45 +02:00
commy2	6ee5c6d9f8	Merge pull request #2510 from acemod/commoncleanup5 ... common code cleanup part 5	2015-09-19 18:50:28 +02:00
commy2	fb71e0594e	lsd module, use global variable for color	2015-09-19 18:47:00 +02:00
PabstMirror	8573238cff	Merge branch 'release'	2015-09-19 11:21:33 -05:00
PabstMirror	3c93c2c95c	#2525 - Add CanInteractWith checks for repair	2015-09-19 11:07:03 -05:00
PabstMirror	79d985a648	Fix XEH Warning Debug ... Wait 5 to let supMon run first, and only show visual error if actually missing pbo.	2015-09-19 10:43:29 -05:00
PabstMirror	2e09a7aa4b	"cherrypick" PR #2496 (lockpick)	2015-09-19 10:02:37 -05:00
Alessandro Foresi	22ac16ead5	Changed: Seeker to aimPoint instead of ASL position	2015-09-19 16:22:36 +02:00
Glowbal	1d7cbf40ca	Fixed incorrect handleDamage call	2015-09-19 11:52:35 +02:00
commy2	e08c6c343e	fix LSD module, cutback on global variable usage	2015-09-19 09:24:28 +02:00
commy2	1357d72f16	fix broken LSD module	2015-09-19 02:44:02 +02:00
commy2	25d1e46422	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:50:37 +02:00
commy2	c7d636a533	more common code cleanup	2015-09-19 01:50:17 +02:00
jokoho48	e7ff41a03c	Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5	2015-09-19 01:12:20 +02:00
jokoho48	f2070deee8	Change spawn while to CBA PFH	2015-09-19 01:12:03 +02:00
commy2	f8ecf1b8ab	fnc_debug was broken	2015-09-19 00:30:36 +02:00
commy2	30ba4f5586	this append should've been pushBack	2015-09-18 23:34:49 +02:00
commy2	56f4cbb39e	fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513	2015-09-18 23:03:35 +02:00
commy2	2e48a92eef	fix ai seemingly reloading disposable launcher at mission start, fix #2508	2015-09-18 22:25:09 +02:00
commy2	85fd9d9d75	more common code cleanup	2015-09-18 21:46:21 +02:00
PabstMirror	5f0d73bab6	Cleanup more stuff	2015-09-18 14:24:20 -05:00
commy2	f3a175e9d6	remove obsolete private	2015-09-18 21:15:06 +02:00
commy2	5d0a7ed062	more common code cleanup	2015-09-18 21:12:40 +02:00
PabstMirror	c62ea5e406	Fix some nil functions	2015-09-18 13:47:19 -05:00
commy2	a53d158a89	Merge pull request #2501 from acemod/commoncleanup4 ... common code cleanup part 4	2015-09-18 19:54:04 +02:00
PabstMirror	65b8585d60	Use _player instead of ACE_player	2015-09-18 12:48:59 -05:00
commy2	8704cd0321	fix additional bracket, formatting	2015-09-18 19:40:48 +02:00
PabstMirror	c21a5d6f08	Merge pull request #2496 from acemod/fixLockPick ... Fix for #2495	2015-09-18 12:28:51 -05:00
PabstMirror	97921aa665	#2503 - run BFT module on server	2015-09-18 12:18:43 -05:00
commy2	a18f63d861	more common code cleanup	2015-09-18 19:12:38 +02:00
commy2	2674310e65	remove another deprecated function	2015-09-18 18:45:41 +02:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
commy2	1fd2fcafb0	remove old, not working functions	2015-09-18 18:34:29 +02:00
commy2	1b96caedc0	more common code cleanup	2015-09-18 18:28:19 +02:00
esteldunedain	3422f5a7f1	Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation ... Conflicts: addons/medical/stringtable.xml addons/repair/stringtable.xml	2015-09-18 13:20:22 -03:00
commy2	a8ba96a01b	more common code cleanup	2015-09-18 16:41:00 +02:00
commy2	39786420fa	more common cleanup	2015-09-18 16:33:53 +02:00
commy2	c0fdd80ba4	formating	2015-09-18 16:00:58 +02:00
commy2	7efcfcc8a0	more common cleanup	2015-09-18 15:40:51 +02:00
commy2	f83dea6e01	formatting, remove an obsolete private	2015-09-18 14:32:58 +02:00
commy2	b0704e486f	more common cleanup	2015-09-18 13:09:40 +02:00
commy2	3a027ff26f	more common cleanup	2015-09-18 09:38:19 +02:00
commy2	e833c3fc42	more common cleanup	2015-09-18 08:47:14 +02:00
commy2	fc82018c49	more common cleanup	2015-09-18 08:23:18 +02:00
commy2	df2c7dce78	replace old pushback macro	2015-09-18 07:53:36 +02:00
commy2	475c193060	common code cleanup part 2	2015-09-18 07:42:10 +02:00
jokoho48	c5eb6e0070	posible fix for #2495	2015-09-18 04:12:18 +02:00
commy2	37c1dbd6f7	Merge pull request #2490 from acemod/commoncleanup ... cleanup common	2015-09-17 23:59:10 +02:00