7149 Commits

Author	SHA1	Message	Date
commy2	ca43520b7f	Merge pull request #2482 from acemod/340fixdaylaserlight ... fix daylasers being a virtual light source	2015-09-17 22:47:13 +02:00
commy2	cfc7102cb6	Merge pull request #2481 from acemod/340loadcargohint ... display text when loading / unloading cargo	2015-09-17 22:47:05 +02:00
commy2	7336e694c1	Merge pull request #2480 from acemod/340doanim2tweak ... tweak doAnimation switchMove to do no akward camera jumps whenever possible	2015-09-17 22:46:54 +02:00
PabstMirror	7faee2e6ff	Merge pull request #2492 from acemod/fixCPR ... Fix CPR params	2015-09-17 12:37:45 -05:00
PabstMirror	5fc127e94c	#2491 - fix params	2015-09-17 11:34:32 -05:00
commy2	36a279012c	cleanup common	2015-09-17 18:25:02 +02:00
PabstMirror	3b1a9ab415	#2488 - only run addSpareParts on server	2015-09-17 11:19:47 -05:00
commy2	a03bc44ba0	add fcs to static machine guns, close #1188	2015-09-17 14:40:58 +02:00
commy2	864c0b4baf	fix daylasers being a virtual light source, fix #2416	2015-09-17 14:17:48 +02:00
commy2	42a754a981	display text when loading / unloading cargo	2015-09-17 13:43:55 +02:00
KoffeinFlummi	067b08611e	Fix missing newlines	2015-09-17 12:54:26 +02:00
KoffeinFlummi	49cc207e6b	Merge remote-tracking branch 'origin/pr/2397' into polish-merge	2015-09-17 12:53:47 +02:00
commy2	a09ca8fb80	tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474	2015-09-17 12:23:56 +02:00
kaban	4d2707eae2	Russian Translations - Update	2015-09-17 12:21:21 +03:00
kaban	341e122e4c	Russian Translations - Update	2015-09-17 11:43:14 +03:00
commy2	014203413d	handle optional pbos in checkFiles	2015-09-17 02:13:21 +02:00
commy2	ca72770c48	add english translation to switch units module	2015-09-16 23:49:34 +02:00
commy2	6d80740a20	don't default to english on the switch units module description	2015-09-16 23:29:07 +02:00
PabstMirror	b8c687611e	Merge branch 'release'	2015-09-16 14:10:02 -05:00
ViperMaul	c748e56f4a	bump v3.3.1.2	2015-09-16 11:42:01 -07:00
commy2	b7715152e2	correct cargo capacities for quads, karts, boats and jets	2015-09-16 20:12:56 +02:00
alganthe	49e0befbaf	added diagnose to torso ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-16 19:44:44 +02:00
commy2	f383e8701d	increase trucks cargo space	2015-09-16 19:27:32 +02:00
PabstMirror	06a9f60281	Cleanup Nightvision	2015-09-16 10:55:23 -05:00
PabstMirror	539e158a97	Merge branch 'release'	2015-09-16 10:35:19 -05:00
ViperMaul	e78b59c28a	bump to 3.3.1.1	2015-09-16 05:09:48 -07:00
ViperMaul	f83a76b304	Merge pull request #2458 from acemod/FixAB ... Fix Advaced Basllistic Performance bug	2015-09-16 05:07:26 -07:00
jokoho48	c1baf4f8f7	tweak Vales for B_Truck_01_Base and B_Truck_01_box_F	2015-09-16 12:45:08 +02:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
jokoho48	a24e5b4665	fix Performance issue in AB	2015-09-16 11:54:49 +02:00
gienkov	e2f9b31fb2	small fix + repair translation	2015-09-16 11:53:05 +02:00
gienkov	a66f4d0e09	Merge remote-tracking branch 'origin/master' into pl-translation-8	2015-09-16 11:44:35 +02:00
gienkov	b94df35c08	Revert "fixed duplicate stringtable entries" ... This reverts commit ab02bed1c1.	2015-09-16 11:42:45 +02:00
ViperMaul	8330aadb6f	bump version to 3.3.1	2015-09-15 17:56:57 -07:00
PabstMirror	2c2d79cfe0	Merge pull request #2439 from acemod/badXEHcheck ... Bad xeh check	2015-09-15 19:46:10 -05:00
PabstMirror	e254af9964	Fix missing )	2015-09-15 19:26:37 -05:00
PabstMirror	1ea1094a73	Merge branch 'release'	2015-09-15 16:16:10 -05:00
Glowbal	a124b05672	Revert "disable a10 tracers, commanche tracers only nvg"	2015-09-15 21:25:01 +02:00
Glowbal	c6c51af548	Updated build version	2015-09-15 21:13:36 +02:00
Glowbal	7e5ab07e32	Merge pull request #2387 from acemod/FixHCPPE ... Fix that PPEffects Throw a error on HC	2015-09-15 21:04:37 +02:00
Glowbal	b2b221db20	Merge pull request #2441 from SzwedzikPL/air_no_tracers ... disable a10 tracers, commanche tracers only nvg	2015-09-15 21:02:40 +02:00
PabstMirror	88f89b8d76	also check allDeadMen	2015-09-15 13:30:04 -05:00
PabstMirror	a8688609d7	Typo	2015-09-15 13:10:06 -05:00
Glowbal	3cc2ccf025	Merge pull request #2438 from acemod/wheelRepairSettingToolkit ... Add Setting for toolkit requirement for wheel repair	2015-09-15 20:04:38 +02:00
PabstMirror	0e32c28552	#2437 - Warn users when mods break XEH	2015-09-15 12:55:08 -05:00
PabstMirror	db37fa0e04	Update stringtable.xml	2015-09-15 11:45:02 -05:00
PabstMirror	c50c53e5bb	remove debug	2015-09-15 09:57:53 -05:00
PabstMirror	9cd470b849	Add Setting for toolkit requirement for wheel repair	2015-09-15 09:54:55 -05:00
commy2	2c7a2b4140	Merge pull request #2406 from acemod/captiveOnRespawn ... Reset captive status on respawn for reliability	2015-09-15 16:37:01 +02:00
gienkov	6588237e8c	stringtable DAGR	2015-09-15 15:05:30 +02:00
PabstMirror	17fdce7196	Cleanup preInit	2015-09-15 08:03:56 -05:00
Glowbal	478b618e4b	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros ... Feature/switch to log macros	2015-09-15 14:51:23 +02:00
PabstMirror	d6d64b58b0	Merge pull request #2430 from acemod/microDagr-customDrawEvents ... microDagr - Add ability to access draw event for minimap	2015-09-14 23:36:07 -05:00
PabstMirror	f419762653	Fix time of flight display	2015-09-14 23:33:32 -05:00
PabstMirror	db41512dc0	#2349 - Don't disable locking for base RocketPods	2015-09-14 22:11:12 -05:00
PabstMirror	61cbe543ee	Fix #2432 - Don't check for null attached when mounted	2015-09-14 18:06:46 -05:00
PabstMirror	e029e8318f	microDagr - Add ability to access draw event for minimap	2015-09-14 16:37:39 -05:00
Glowbal	16b7bb389c	Merge pull request #2428 from acemod/FixMainMenuInfo151 ... Fix main menu info151	2015-09-14 23:30:00 +02:00
Glowbal	d52cc917ea	Merge pull request #2419 from acemod/FixBBTexturePath2 ... Fix Bandage Texture Path and UV	2015-09-14 23:26:00 +02:00
Glowbal	4b6082d836	Merge pull request #2424 from acemod/medical-tweaks ... Medical tweaks	2015-09-14 23:20:50 +02:00
Glowbal	7b7ad6eea8	fixed tweak to basic bandage	2015-09-14 23:18:20 +02:00
PabstMirror	f7bd557a30	Fix some stringtable weirdness	2015-09-14 16:11:43 -05:00
Glowbal	10ac127159	Fixed incorrect new damage value in handleDamage advanced. ... The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.	2015-09-14 21:15:57 +02:00
Glowbal	33ac78dbac	Addresses the large amount of bandages required in basic medical ... This should restore the bandaging behavior back to how it is before the adjustments made to basic medical	2015-09-14 21:14:56 +02:00
Glowbal	8c60e76979	Tweaks made to improve determine if fatal algorithm	2015-09-14 21:13:58 +02:00
Glowbal	37639066c2	Include missing frame in the caching execution	2015-09-14 15:19:58 +02:00
Glowbal	6d4744b9ea	Increased duration of knock down for basic medical	2015-09-14 15:19:18 +02:00
Glowbal	032dd6c87c	Tweaked visual effects.	2015-09-14 15:18:56 +02:00
jokoho48	fb75f6ad9e	Fix Bandage Texture Path and UV	2015-09-13 18:57:07 +02:00
gienkov	530dfa041d	stringtable DAGR	2015-09-12 21:25:02 +02:00
jokoho48	b2b41ce8af	Merge branch 'release' of https://github.com/acemod/ACE3 into release	2015-09-12 18:13:12 +02:00
jokoho48	5feee53c69	Posible fix for #2407	2015-09-12 18:12:57 +02:00
SilentSpike	7c846502b5	Reset captive status on respawn for reliability ... Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player. To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.	2015-09-12 15:42:20 +01:00
SilentSpike	e6c2916a14	Fix spectator template for negligible respawnDelay ... When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small.	2015-09-12 14:02:42 +01:00
bux578	9748abdb48	change order of BloodPressure readout, fix #2400	2015-09-12 10:58:29 +02:00
BaerMitUmlaut	8ee1136758	Rewrite canPassMagazine condition	2015-09-11 23:52:00 +02:00
gienkov	ef36b27fe2	medical pl translation	2015-09-11 23:49:41 +02:00
gienkov	ab02bed1c1	fixed duplicate stringtable entries	2015-09-11 23:42:03 +02:00
jonpas	3de783d3a7	Cleanup for branch release, picked from #2366	2015-09-11 19:57:21 +02:00
BaerMitUmlaut	ccf1bf1de7	Cleaned up canPassMagazine condition	2015-09-11 18:24:46 +02:00
jonpas	6fb22ebd11	Added isNull check to PFH for explicity	2015-09-11 17:55:28 +02:00
jonpas	efa8252b45	Remove debug	2015-09-11 17:43:29 +02:00
jonpas	2d3a02085e	Improved comment	2015-09-11 17:27:08 +02:00
jonpas	d49798144c	Replaced hasChairMoved with isEqualTo, fixed missing variable	2015-09-11 17:25:46 +02:00
jokoho48	b7e02da1cc	remove if (!hasInterface) from PFH ... move ! in ()	2015-09-11 16:58:26 +02:00
jonpas	c5f9f85d27	Updated comment	2015-09-11 16:53:09 +02:00
jonpas	0b9c6254e4	Removed redundant rotation control - changed to config	2015-09-11 16:46:51 +02:00
SilentSpike	aa7b6cf39f	Improve angular behaviour of spectator camera ... Changes the position calculation of the external spectator camera to correctly retain the pan and tilt of the free camera. Makes transitioning between the two less disorienting for the user.	2015-09-11 14:46:21 +01:00
SilentSpike	77c2b99ee5	Change spectator external camera behaviour ... Using the "external" view is limited by the server difficulty setting. Instead the spectator external camera has been replaced with an oribtal camera as was originally planned to be added alongside the default views.	2015-09-11 14:46:21 +01:00
BaerMitUmlaut	a29902ddb3	More use of params, event system, removed compile	2015-09-11 15:36:23 +02:00
SilentSpike	17f9eab03a	Improve display name of medical heal hitpoints setting ... ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing	2015-09-11 12:33:18 +01:00
BaerMitUmlaut	45bfa3eaf5	Fixed vanishing mags and localized hint	2015-09-10 22:23:37 +02:00
Glowbal	f60954a49b	increased build number (3.3.0.1)	2015-09-10 22:18:13 +02:00
KoffeinFlummi	70dfbe2ec0	Fix some merging errors	2015-09-10 22:11:09 +02:00
KoffeinFlummi	63c2712360	Merge branch 'release' into portuguese	2015-09-10 21:59:30 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	a5621604fd	Merge branch 'release' into czech	2015-09-10 20:51:33 +02:00
KoffeinFlummi	83aa2cc68c	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
jokoho48	cc9cdae972	Merge branch 'release' of https://github.com/acemod/ACE3 into FixHCPPE	2015-09-09 20:25:48 +02:00
Glowbal	82d9e70c88	Merge pull request #2385 from jokoho48/BackBlastEnhanced ... Back blast enhanced	2015-09-09 19:39:32 +02:00
jonpas	e07b71faf0	Merge branch 'master' into parseList ... Conflicts: addons/medical/functions/fnc_moduleAssignMedicRoles.sqf addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf	2015-09-09 19:13:04 +02:00
jokoho48	defbdf1b1a	fix that HC throw a issue if PPEffect was used/applyed	2015-09-09 17:05:48 +02:00
Michael Braun	a5fb09a7e1	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/repair/functions/fnc_moduleRepairSettings.sqf	2015-09-09 02:55:12 +02:00
jokoho48	1ed52e08bf	fix missing default	2015-09-08 19:45:46 +02:00
Glowbal	6a31140f7d	Version 3.3.0	2015-09-08 19:38:52 +02:00
Glowbal	d6b51b2138	Merge pull request #2374 from acemod/microDagr ... Move MicroDAGR 3D model from BFT branch to microdagr module reopen #2373	2015-09-08 19:31:02 +02:00
Glowbal	0c371ddf37	disabled debug for medical	2015-09-08 19:06:01 +02:00
BaerMitUmlaut	c26107bc5c	Added ability to pass a magazine	2015-09-08 14:07:16 +02:00
ProfessorCZ	a28e9d96c7	Czech Translations - Update	2015-09-07 17:40:14 +02:00
gienkov	ad50c1ab4b	medical and repair translation	2015-09-07 16:15:18 +02:00
jokoho48	7f6e7de68c	Add LoD ... Lower Poly in Shadow LoD	2015-09-07 16:10:55 +02:00
gienkov	c4475ff5be	Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7	2015-09-07 16:06:17 +02:00
gienkov	1edcc320d1	Merge remote-tracking branch 'origin' into pl-translation-7	2015-09-07 16:05:45 +02:00
Glowbal	7b349ab388	Merge pull request #2361 from acemod/medical-adjustments2 ... Medical adjustments2	2015-09-07 15:51:27 +02:00
nsgundy	eee5664ec5	Move MicroDAGR 3D model from BFT branch to microdagr module	2015-09-07 11:05:18 +02:00
ViperMaul	2fc35338d5	Build number for Release Candidate	2015-09-06 21:37:20 -07:00
jokoho48	45eb8c4822	Add Code for CBA update 2.1	2015-09-06 19:34:46 +02:00
commy2	adb1a11211	increase leg and arm armor value, more TRACE debug	2015-09-06 11:49:08 +02:00
[OMCB]kaban	78084f271a	Changed "Effect Zeus RC" to "Affects Zeus RC"	2015-09-06 07:11:27 +03:00
jonpas	f45c0334fc	Added spaces	2015-09-06 03:49:52 +02:00
ViperMaul	98202f4f38	Additional debug statements for caching and wounds.	2015-09-05 15:31:14 -07:00
jonpas	f2bfc385eb	Merge branch 'master' into removeVignetteAndCleanUI ... Conflicts: addons/ui/README.md addons/ui/config.cpp	2015-09-05 22:00:51 +02:00
jonpas	ce1c735d89	Removed Vignette, Cleaned up UI	2015-09-05 21:57:22 +02:00
Glowbal	a745b07cb6	Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay ... Used new setting init delay function in addSpareParts	2015-09-05 21:18:25 +02:00
jonpas	06baa5e4d3	Fixed nilCheck, changed moduleAddSpareParts to use new parseList	2015-09-05 20:51:48 +02:00
jonpas	8fc061bfd6	Merge branch 'master' into parseList	2015-09-05 20:16:59 +02:00
jonpas	a2dd77ca70	Use splitString instead of BIS_fnc_splitString	2015-09-05 20:15:31 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03:00
jonpas	f22072a94d	Use pushBack instead of array compiling	2015-09-05 19:57:35 +02:00
jonpas	a8412361bd	Use setting init delay function for addSpareParts	2015-09-05 19:33:25 +02:00
TheMagnetar	27a0e8f639	Repair: Fix possible out of bounds setting ... Setting "engineerSetting_fullRepair" had an out of bounds default value.	2015-09-05 16:30:00 +02:00
Glowbal	315f46c6c6	Merge branch 'master' into medical-adjustments2	2015-09-05 14:41:25 +02:00
Glowbal	0a6b77b902	Removed more deprecated wound sync code	2015-09-05 14:10:28 +02:00
Glowbal	e4c246984f	Removed another debug trace that should not be there	2015-09-05 14:10:04 +02:00
Glowbal	d9af19df28	properly fixes unconscious weird behavior. Because it never registered any unconscious conditions.	2015-09-05 14:08:46 +02:00
Glowbal	41db78b52b	Merge pull request #2341 from acemod/323tracers ... better scaling for tracer sizes, fix #1008	2015-09-05 13:47:37 +02:00
commy2	46d741281b	Merge pull request #2358 from acemod/322flashbangexplosive ... sort flashbang under explosive grenades, not misc grenades	2015-09-05 13:40:24 +02:00
Glowbal	a4b4c5d2a3	Merge pull request #2187 from jonpas/trackToTrackedVehicles ... Added Spare Parts module handling	2015-09-05 13:36:42 +02:00
Glowbal	dad96822be	Only add 1/4 of the new damage to pain instead of everything.	2015-09-05 13:27:02 +02:00
Glowbal	6405ef7d91	Merge branch 'master' into medical-adjustments2	2015-09-05 13:22:44 +02:00
Glowbal	f15a1c033d	Added allowSelfTreatment attribute to treatment actions	2015-09-05 13:20:19 +02:00
Glowbal	f0a074072f	Merge pull request #2329 from acemod/323medicalstrcturaldamage ... setStructuralDamage function	2015-09-05 13:16:13 +02:00
Glowbal	446f367f8b	Merge pull request #2359 from acemod/fixRestoreGear ... fix restore gear	2015-09-05 13:09:21 +02:00
Glowbal	9c7f7429d1	Merge pull request #2350 from jonpas/cargoHideActionOnLocked ... Prevent Cargo opening if vehicle is locked	2015-09-05 13:09:14 +02:00
Glowbal	a4e406658f	Reduced initial knockdown time for basic medical	2015-09-05 13:02:19 +02:00
Glowbal	17ad7ecb8c	replaced diag_logs by trace	2015-09-05 12:59:09 +02:00
Glowbal	9c0288cd3f	Removed debug message	2015-09-05 12:55:49 +02:00
Glowbal	c8a7b94777	Merge pull request #2363 from acemod/MedicalMenuBlackoutBlur ... Add Screen Blur and Blackout for Medical Menu by Interact_menu setting	2015-09-05 12:53:04 +02:00
Glowbal	d617fba6c6	Merge branch 'master' into medical-adjustments2	2015-09-05 12:51:18 +02:00
Glowbal	c828544d02	Added init stacking	2015-09-05 12:50:32 +02:00
jokoho48	c70c9cdee6	Add Screen Blur and Blackout for Medical Menu by Interact_menu setting	2015-09-05 12:49:23 +02:00
Glowbal	23d45c53cf	Merge branch 'master' into medical-adjustments2	2015-09-05 12:47:32 +02:00
Glowbal	c673ea2cbb	Restored uniqueIds	2015-09-05 12:38:12 +02:00
Glowbal	17648739dd	Removed more deprecated wound sync code	2015-09-05 12:37:01 +02:00
Glowbal	25a75b9f69	fixed incorrect macro usage	2015-09-05 12:35:48 +02:00
Glowbal	6b73eafcce	Allow users to disable medical 3d interaction.	2015-09-05 12:31:52 +02:00
Glowbal	268220bbae	Possible fix for weird unconscious behavior in basic medical	2015-09-05 12:20:40 +02:00
Glowbal	4122b32dba	Removed deprecated wound sync code	2015-09-05 12:02:09 +02:00
Glowbal	e0db571e13	Minor adjustment to fatality change on torso damage	2015-09-05 12:00:45 +02:00
Glowbal	883b9ab545	Removed blur screen for medical menu #2069	2015-09-05 11:58:34 +02:00
Glowbal	85dc59d66c	Fixed: should only display "no injuries" when there are no injuries. Not the other way around	2015-09-05 11:57:41 +02:00
Glowbal	130569c485	Made basic medical bleeding information work with new damage system	2015-09-05 11:57:17 +02:00
Glowbal	39ff82e764	fixes for CPR condition in basic medical and improvements to lethalDamage	2015-09-05 11:52:12 +02:00
Glowbal	4514812523	Basic bandaging now works with new damage system	2015-09-05 11:51:46 +02:00
Glowbal	cd9e5df782	Clean up of handleDamage. Fixes some debug code	2015-09-05 11:25:56 +02:00
Glowbal	df3dbc9772	Removed deprecated fire handling	2015-09-05 11:25:31 +02:00
Glowbal	a25f640614	fixes #2114 No CPR available in basic medical when revive is enabled	2015-09-05 11:07:10 +02:00
Glowbal	3d342ece20	Fixes #2156 Animation is still played even if you cancel any treatment	2015-09-05 11:04:11 +02:00
Glowbal	a02f95ae06	Merge pull request #2355 from acemod/settingInitDelayFunctions ... Setting init delay functions	2015-09-05 11:01:44 +02:00
[OMCB]kaban	cc9a566c15	Fix due to review	2015-09-05 05:23:27 +03:00
[OMCB]kaban	298b475433	Fix due to review	2015-09-05 05:15:29 +03:00
[OMCB]kaban	ce49f752f1	Fix due to review	2015-09-05 05:14:34 +03:00
[OMCB]kaban	1bad390dba	Fix due to review	2015-09-05 05:09:47 +03:00
[OMCB]kaban	8ef007b727	Fix due to review	2015-09-05 05:08:16 +03:00
[OMCB]kaban	6c48a4a0de	Fix due to review	2015-09-05 05:07:18 +03:00
[OMCB]kaban	85b0127f56	Fix due to review	2015-09-05 05:00:18 +03:00
[OMCB]kaban	6f7437bb80	Fix due to review	2015-09-05 04:57:07 +03:00
[OMCB]kaban	f69b94af98	Fix due to review	2015-09-05 04:53:30 +03:00
[OMCB]kaban	421f7bc6f8	Fix due to review	2015-09-05 04:38:39 +03:00
[OMCB]kaban	9f416b796c	Fix due ti review	2015-09-05 02:07:26 +03:00
ViperMaul	4c0c7bc290	debug change	2015-09-04 10:21:10 -07:00
ViperMaul	7f58d5a94d	Revert "Adding same ADV special case to BASIC handle damage." -Not Needed ... This reverts commit bf267246bf.	2015-09-04 10:20:34 -07:00
jonpas	644460ed96	Merge branch 'master' into parseList ... Conflicts: addons/slideshow/functions/fnc_makeList.sqf	2015-09-04 18:40:35 +02:00
ViperMaul	bf267246bf	Adding same ADV special case to BASIC handle damage.	2015-09-04 07:48:16 -07:00
ViperMaul	2bc20501bc	Adding more debug	2015-09-04 07:46:35 -07:00
ViperMaul	813e54a668	Fixing Debug for object variable hasPain	2015-09-04 07:37:20 -07:00
ViperMaul	89b0c05929	Fixed a debug statement.	2015-09-03 13:17:59 -07:00
commy2	b737f42777	fix error when opening triage card	2015-09-03 18:30:29 +02:00
bux578	9e1ae58f4f	fix restore gear	2015-09-03 18:17:53 +02:00
PabstMirror	f63e652636	Merge pull request #2334 from acemod/mapToolsAspectRatio ... MapTools - Handle Bad Aspect Ratio	2015-09-03 10:44:34 -05:00
commy2	795b7a893f	Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2	2015-09-03 17:18:32 +02:00
ViperMaul	6d28214287	Add some debug values.	2015-09-03 08:18:37 -07:00
commy2	0bd92af072	fix variables not inited, csat armor scaleing	2015-09-03 17:17:54 +02:00
commy2	e753131f2d	arms and legs to vulnerable, better scaling for pilots and csat	2015-09-03 16:17:48 +02:00
commy2	a84be46ed4	fix errors from cleanup	2015-09-03 15:49:49 +02:00
commy2	0436209dae	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments	2015-09-03 15:33:53 +02:00
commy2	736be74c2b	Merge pull request #2344 from acemod/322hideclock ... hide clock on map if no watch in inventory, #414	2015-09-03 13:44:20 +02:00
commy2	36b42f2780	Merge pull request #2343 from acemod/322flares ... scripted approach to hand flares, fix #1079	2015-09-03 13:44:04 +02:00
commy2	529c85df58	Merge pull request #2338 from acemod/322sit ... Sitting improvements	2015-09-03 13:43:53 +02:00
commy2	6b7f84b297	add missing ;	2015-09-03 13:39:17 +02:00
commy2	76bb2bd2b8	replace function with FUNC macro	2015-09-03 13:37:36 +02:00
commy2	a187be7255	sort flashbang under explosive grenades	2015-09-03 13:23:15 +02:00
PabstMirror	024dc3effe	Cleanup	2015-09-03 00:16:48 -05:00
PabstMirror	789de9d111	runAfterSettingsInit helper func	2015-09-03 00:11:49 -05:00
PabstMirror	cbccd898ea	Run functions after setting init	2015-09-02 23:58:24 -05:00
kaban	15fe2c32b8	Russian Translations - Update	2015-09-03 04:58:08 +03:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	50b05fcdf0	Russian Translations - Update	2015-09-03 04:38:38 +03:00
commy2	fbf00b9aa5	correct comment	2015-09-03 02:55:40 +02:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
ProfessorCZ	44fa520bdd	Czech Translations - Update	2015-09-03 01:20:24 +02:00
jonpas	def2d29501	Cleaned up slideshow privates	2015-09-02 22:51:31 +02:00
jonpas	0bbf4d4128	Prevent Cargo opening if vehicle is locked	2015-09-02 22:24:46 +02:00
Glowbal	f38d245771	fixed bloodloss for basic medical	2015-09-02 21:56:00 +02:00
commy2	f939f9215e	stop flickering of wounds, fix #346	2015-09-02 20:49:17 +02:00
commy2	7d2f1f52a4	remove protection, hitpoint config (fix ubc), some debug stuff	2015-09-02 20:13:51 +02:00
commy2	dc5e6b7c3c	Merge branch '323medicalstrcturaldamage' into medical-adjustments	2015-09-02 20:02:19 +02:00
commy2	9665f73fa3	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments	2015-09-02 17:03:36 +02:00
SilentSpike	6aa191b788	Merge pull request #2327 from acemod/fixGunnerGoggles ... Fix gunner goggles	2015-09-02 13:31:50 +01:00
commy2	07ab7d1c35	correct comment	2015-09-02 02:00:53 +02:00
commy2	29efc13556	hide clock, use eventhandler	2015-09-02 01:59:07 +02:00
commy2	43c54d51e8	hide clock on map if no watch in inventory, #414	2015-09-02 01:40:38 +02:00
commy2	83424cdcab	header for fnc_flare	2015-09-02 00:03:16 +02:00
commy2	7ce606740c	make flares work in mp	2015-09-01 23:56:25 +02:00
commy2	be56fd7d46	scripted approach to hand flares, fix #1079	2015-09-01 23:19:49 +02:00
commy2	471d54f674	better saling for tracer sizes, fix #1008	2015-09-01 21:48:40 +02:00
commy2	237d5b6536	stand up action (uses get out shortcut) and less awkward standing animaton	2015-09-01 21:03:28 +02:00
commy2	acfc48efc2	animate head when surrendered and handcuffed	2015-09-01 20:00:28 +02:00
commy2	405d85eaaa	fix leaning back through chair while sitting, fix #1795	2015-09-01 19:06:20 +02:00
PabstMirror	264091957a	#1917 - Pointing Update Circle Icon	2015-09-01 10:09:14 -05:00
commy2	fb9ad6075f	Merge pull request #2337 from acemod/322bouncym84 ... bouncing flashbangs, fix #1907	2015-09-01 17:05:36 +02:00
commy2	dd788342fe	remove commented debug messages	2015-09-01 16:37:46 +02:00
commy2	b1fbbcc49f	bouncing flashbangs, fix #1907	2015-09-01 12:46:15 +02:00
commy2	5e68486233	high command module breaks ace, fix #2134	2015-09-01 10:06:01 +02:00
commy2	73911f701d	add debug messages for #2134	2015-09-01 08:53:11 +02:00
Michael Braun	035b3432c5	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-01 08:45:59 +02:00
PabstMirror	c97e0eb500	MapTools - Handle Bad Aspect Ratio	2015-08-31 22:50:01 -05:00
jokoho48	3f4d0af940	prevent Issues with other mods	2015-09-01 01:03:34 +02:00
jokoho48	afee398b11	woops	2015-09-01 00:51:32 +02:00
jokoho48	5d612abd02	posible Fix for #2310	2015-09-01 00:42:13 +02:00
commy2	3362bbf0bf	fix protection 1.50 ubc issues	2015-09-01 00:01:42 +02:00
commy2	5a164c5cdc	fix UBC issues, simplify uniform hitpoint config	2015-08-31 23:36:59 +02:00
commy2	87cf7ded83	Merge pull request #2311 from acemod/322backpack ... objectParent command replacing fnc_getBackpackAssignedUnit	2015-08-31 21:32:42 +02:00
commy2	e7d9e8c0dc	Merge pull request #2312 from acemod/322opendoor3rdperson ... increase reach in 3rd person for opening doors, fix #2301	2015-08-31 21:32:34 +02:00
commy2	aa1ad1bc2a	Merge pull request #2313 from acemod/322ffvweaponselect ... fix weapon select in ffv slots not working	2015-08-31 21:32:26 +02:00
commy2	9b6bc73c1a	Merge pull request #2314 from acemod/322spottingscope ... better animation for spotting scope, fix #1638	2015-08-31 21:32:17 +02:00
commy2	591327aaf3	Merge pull request #2315 from acemod/3220xgrenadebug ... fix autoriflemen spawning with 0x frag grenade bug	2015-08-31 21:32:09 +02:00
commy2	80a0c93bdc	Merge pull request #2316 from acemod/322customcamera ... fix custom cameras (for intros) being broken with ACE, fix #2248	2015-08-31 21:32:02 +02:00
commy2	d85f96eac0	Merge pull request #2320 from acemod/322notonladder ... disable all actions while being on a ladder by default, close #2289	2015-08-31 21:31:54 +02:00
commy2	e241c70a78	Merge pull request #2318 from acemod/322tripotmagsize ... tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190	2015-08-31 21:31:44 +02:00
commy2	2a82b97b5a	Merge pull request #2328 from acemod/322laserpointer ... laserpointer with new command lineintersectssurface	2015-08-31 21:31:35 +02:00
commy2	37aec2b3c3	enable repairing while on ladder	2015-08-31 21:22:22 +02:00
PabstMirror	ba3ecf2a0a	Merge pull request #2321 from acemod/HearingStuff ... Hearing stuff	2015-08-31 13:24:29 -05:00
PabstMirror	38122ffeaf	Merge pull request #2197 from acemod/mapOpenCloseEvents ... Map open close events / MapTools Cleanup	2015-08-31 13:23:10 -05:00
commy2	f15805d1f3	setStructuralDamage function	2015-08-31 20:05:38 +02:00
commy2	e1d683d8dc	laserpointer with new command lineintersectssurface	2015-08-31 17:31:37 +02:00
SilentSpike	397d77e5b5	Remove special goggles treatment of vehicle units ... The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.	2015-08-31 15:25:40 +01:00
SilentSpike	543e829278	Fix goggles overlay for FFV seats ... When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats	2015-08-31 14:56:51 +01:00
SilentSpike	5e57cad669	Merge pull request #2216 from acemod/isolateZeusMenuKeybind ... Prevent CBA keybindings in zeus interface	2015-08-31 14:41:48 +01:00
SilentSpike	04269831e8	Consider modifier keys for zeus interaction hack ... The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing	2015-08-31 14:40:31 +01:00
Glowbal	8c6f896164	fixed script error when canceling treatment actions	2015-08-31 13:00:17 +02:00
jokoho48	228eeab1a8	fix comments	2015-08-31 00:05:55 +02:00
jokoho48	4e6f289493	fix Function Names ... fix Input	2015-08-30 23:40:53 +02:00
jokoho48	317706cf46	add Trace	2015-08-30 23:10:03 +02:00
jokoho48	bda274efff	fix wrong config access point	2015-08-30 22:59:27 +02:00
PabstMirror	4be7411a05	Use "visibleMapChanged" event	2015-08-30 15:26:43 -05:00
commy2	7a4c37c085	disable all actions on ladders by default, close #2289	2015-08-30 22:03:45 +02:00
commy2	c3beee8261	make use of getHitpointsDamage command to drastically speed up some functions about hitpoints	2015-08-30 21:13:29 +02:00
commy2	fae38a2232	tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190	2015-08-30 20:20:00 +02:00
commy2	c18af0d34b	completely prevent ace_optics from interfering with any mission camera scripts	2015-08-30 19:30:44 +02:00
commy2	74dfd73167	fix issues with pip optics camera in virtual arsenal	2015-08-30 19:05:35 +02:00
commy2	8d589ea8f0	solution for custom cameras (for intros) being broken with ACE	2015-08-30 15:50:51 +02:00
commy2	fc6f97e09e	fix autoriflemen spawning with 0x frag grenade bug	2015-08-30 13:30:21 +02:00
commy2	610bb7a1df	better animation for spotting scope, fix #1638	2015-08-30 13:10:25 +02:00
commy2	58ec4a68cb	fix weapon select in ffv slots not working	2015-08-30 12:01:13 +02:00
commy2	4682235d8a	increase reach in 3rd person for opening doors, fix #2301	2015-08-30 11:13:26 +02:00
commy2	32300a0a80	objectParent command replacing fnc_getBackpackAssignedUnit	2015-08-30 10:45:14 +02:00
PabstMirror	910bb151e2	#1988 - Boost explosive hearing damage	2015-08-30 01:47:40 -05:00
PabstMirror	8307ccea96	firedNear - use new isKindOf	2015-08-30 01:37:14 -05:00
PabstMirror	2f54cfadbc	Merge pull request #2146 from jokoho48/codeCleanupHearing ... Code cleanup of Hearing module	2015-08-30 01:18:47 -05:00
jokoho48	05e07f37ac	Merge branch 'master' of https://github.com/acemod/ACE3 into BackBlastEnhanced	2015-08-30 07:49:55 +02:00
jokoho48	d97cb8e78f	add Missing Include	2015-08-30 07:49:12 +02:00
jokoho48	6d2e25d40b	change some DFUNC to FUNC	2015-08-30 07:38:17 +02:00
jokoho48	35b6e04345	rewrite Caching in overpressure ... update code to params command update Comments	2015-08-30 07:35:58 +02:00
Grzegorz	5662e9eb62	proper name for stabilizer	2015-08-30 01:54:43 +02:00
gienkov	9187b31b92	pitot tube	2015-08-30 01:47:20 +02:00
gienkov	17f647f341	PL translation	2015-08-30 01:42:42 +02:00
KoffeinFlummi	6a17e3fa83	Merge remote-tracking branch 'origin/master'	2015-08-30 00:42:46 +02:00
KoffeinFlummi	5f63290508	Merge branch 'ptbr'	2015-08-30 00:42:31 +02:00
Glowbal	b968a32ea2	Merge pull request #2260 from acemod/updateMainConfig ... Update Main Config File	2015-08-30 00:37:46 +02:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
Glowbal	4bde554854	Merge branch 'master' into medical-adjustments ... Conflicts: addons/medical/functions/fnc_actionCheckBloodPressure.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulse.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf	2015-08-29 23:49:58 +02:00
PabstMirror	f67809b18c	Merge branch 'master' into mapOpenCloseEvents	2015-08-29 16:43:24 -05:00
PabstMirror	22f8b2e8c2	Merge pull request #2305 from acemod/attachEventHandlers ... Attach event handlers	2015-08-29 16:35:51 -05:00
Glowbal	2fd30ba20c	fixes #2274	2015-08-29 22:57:52 +02:00
Glowbal	602ef690fc	Allow diagnose on torso #1879	2015-08-29 22:54:51 +02:00
Glowbal	ce42f5864f	fix #2155	2015-08-29 22:53:08 +02:00
Glowbal	b291141d11	Should Be a better fix for #2298	2015-08-29 22:51:42 +02:00
Glowbal	183e872f1f	Possible fix for #2298	2015-08-29 22:44:52 +02:00
PabstMirror	fa3a0213b7	Merge pull request #2249 from acemod/captiveFFV ... Captive ffv animation fix + cleanup	2015-08-29 15:39:23 -05:00
Michael Braun	657157d767	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/hearing/functions/fnc_moduleHearing.sqf	2015-08-29 22:38:26 +02:00
Glowbal	998bc2d45a	Merge pull request #2297 from acemod/addMoreHearingProtection ... Add Hearing Protection to Helmets with Peltor Headsets	2015-08-29 22:34:59 +02:00
Joko	91a8463198	Merge pull request #2299 from acemod/FixTactialLadderAnimation ... Fix Tactical Ladder Animation Clipping Fixes #2287	2015-08-29 22:33:08 +02:00
Michael Braun	fa4ae6c9a8	Merge branch 'master' of https://github.com/acemod/ACE3 into map_gestures ... Conflicts: AUTHORS.txt	2015-08-29 22:22:16 +02:00
SilentSpike	620136a1a7	Merge branch 'master' into spectator ... Conflicts: AUTHORS.txt	2015-08-29 21:20:04 +01:00
PabstMirror	0b3b3871ff	Merge pull request #2065 from acemod/hearingDisableZeus ... Setting to disable hearing for zeus RC	2015-08-29 15:15:14 -05:00
PabstMirror	d06680e2a0	#1571 - Handle Null Attached Objects	2015-08-29 11:47:56 -05:00
SilentSpike	200f44d963	Adjust spectator camera speed based on height ... Slows the camera movement close to the ground as it feels more natural when spectating units up close and such	2015-08-29 16:05:04 +01:00
PabstMirror	6eba898301	Merge pull request #2160 from acemod/updatingBaseClass150 ... realisticnames 1.50 Updating Base Class Changes	2015-08-29 09:55:25 -05:00
PabstMirror	321ca815a2	semi-colon	2015-08-29 09:52:28 -05:00
PabstMirror	f6c752045c	Cleanup	2015-08-29 09:38:57 -05:00
jokoho48	8916b70fe1	Improve some Code	2015-08-29 15:29:02 +02:00
jokoho48	588f5adce8	fix math issue	2015-08-29 14:54:42 +02:00
Glowbal	6796b3126d	Staged work on fixing updating base classes for hitpoints	2015-08-29 12:59:28 +02:00
Glowbal	1e08244f21	Removed debug output	2015-08-29 12:59:11 +02:00
Glowbal	1a4736e663	Clean up	2015-08-29 12:01:00 +02:00
Glowbal	1c9e88f213	fixes #1964	2015-08-29 11:58:28 +02:00
Glowbal	d56f3cea81	Added pain and unconsciousness handling for new basic medical code	2015-08-29 11:58:03 +02:00
Glowbal	354e4410d1	Merge pull request #2268 from gienkov/pulse-enhancement ... HR and BP enhancement	2015-08-29 11:47:00 +02:00
Glowbal	70c0edf436	Merge pull request #2283 from acemod/cargoCanInteract ... Add canInteractWith checks for cargo	2015-08-29 11:45:50 +02:00
PabstMirror	007859d42e	Attach - getin/out/killed event handlers (#2200 #2300)	2015-08-28 16:57:16 -05:00
jokoho48	1f602ea9a3	disable Debug	2015-08-28 13:17:29 +02:00
jokoho48	a83a5a17a3	Fix Issues	2015-08-28 13:15:21 +02:00
jokoho48	5598c3abe1	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupKestrel4500	2015-08-28 13:03:28 +02:00
jokoho48	3269114861	Fix Tactical Ladder Animation Clipping	2015-08-28 11:55:32 +02:00
bux578	19a6226ced	add Hearing Protection to Helmets with Peltors	2015-08-28 09:10:58 +02:00
PabstMirror	80d18c468e	Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup ... wirecutters config for fences + cleanup	2015-08-27 16:01:31 -05:00
ViperMaul	a86ff93c16	Merge pull request #2052 from MikeMatrix/logMacros ... ACE specific logging macros	2015-08-26 21:52:20 -07:00
Michael Braun	93106697ab	Added debug log macros	2015-08-27 06:21:02 +02:00
ViperMaul	d38cb31240	Merge pull request #2109 from acemod/pushSubmaine ... Push SDV sub, cleanup push	2015-08-26 21:03:46 -07:00
PabstMirror	bc016eac4c	1.50 - use new didJip command (Ref #2241)	2015-08-26 22:39:27 -05:00
ViperMaul	5ea98143e2	Merge pull request #2211 from jonpas/integrateAsdg ... Integrated ASDG JR Optional	2015-08-26 17:53:32 -07:00
jonpas	6d27299883	Cleaned up spare parts collection after SettingsInitialized, Check if vehicle already in collection	2015-08-26 23:43:06 +02:00
jonpas	48e0f5757d	Merge branch 'master' into trackToTrackedVehicles ... Conflicts: addons/repair/stringtable.xml	2015-08-26 23:38:51 +02:00
jonpas	ef1b4cbd26	Merge branch 'master' into trackToTrackedVehicles ... Conflicts: addons/repair/XEH_preInit.sqf	2015-08-26 23:33:05 +02:00
jonpas	6a6c5008c0	Merge branch 'master' into repairHitpointStrings ... Conflicts: addons/repair/functions/fnc_doRepair.sqf	2015-08-26 23:29:36 +02:00
Glowbal	f7679b45ad	Merge pull request #2246 from jonpas/repairHitpointGroups ... Repair Hitpoint Groups Framework	2015-08-26 23:27:08 +02:00
PabstMirror	9c8e9732ed	Add canInteractWith checks for cargo	2015-08-26 16:26:08 -05:00
jonpas	ce8da8d720	Fixed Full Repair available even when vehicle is already fully repaired	2015-08-26 23:09:46 +02:00
jonpas	b6d5db9157	Reverted IGNORED_HITPOINTS, Added Taru glasses to it	2015-08-26 23:09:04 +02:00
jonpas	cc70580a93	Improved comments	2015-08-26 22:51:41 +02:00
jonpas	e4123c9730	Added 2 strings, changed 1	2015-08-26 22:44:30 +02:00
jonpas	8529e5c9b7	Merge branch 'master' into trackToTrackedVehicles	2015-08-26 21:25:08 +02:00
PabstMirror	ca991712e8	Merge pull request #2270 from acemod/codeCleanUpMicroDagr ... Code Cleanup MicroDagr Module	2015-08-26 11:03:22 -05:00
PabstMirror	4cf81b493a	Fix stringtable and more cleanup	2015-08-26 11:00:59 -05:00
Michael Braun	36aeb61d81	Fixed error caused by closing square bracket	2015-08-26 17:51:56 +02:00
Michael Braun	3dc3331d87	Replaced rogue format with FORMAT_#	2015-08-26 17:45:17 +02:00
Michael Braun	5047d4de1c	Switched to ACE_LOG<LEVEL>_# variation	2015-08-26 17:39:44 +02:00
Michael Braun	9ca19def70	Added autoformatting variations for log macros	2015-08-26 17:09:31 +02:00
jonpas	dc2e146e8b	Merge branch 'master' into repairHitpointStrings ... Conflicts: addons/repair/functions/fnc_addRepairActions.sqf	2015-08-26 17:04:05 +02:00
jonpas	c0379c7809	Updated with correct cargo events and settings category	2015-08-26 17:02:29 +02:00
Michael Braun	097506076f	Fixed format usage in macros requiring ARR_# for it to work	2015-08-26 16:48:55 +02:00
Michael Braun	fd204d972d	Fixed issue with ERROR conflicting with log level input	2015-08-26 16:45:28 +02:00
Michael Braun	5f6584ba3f	Added Log format macros for use with not printing it to the log.	2015-08-26 15:53:03 +02:00
ulteq	f1d41731fb	Merge pull request #2149 from jokoho48/codeCleanupHuntIR ... Code cleanup of HuntIR module	2015-08-26 15:48:29 +02:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
Michael Braun	a17d94c213	Removed semicolon of log macro	2015-08-26 14:12:17 +02:00
Michael Braun	5a0e95dcf0	Simplified log macros	2015-08-26 14:04:17 +02:00
Grzegorz	5ad0e192c3	Fix being able to TQ torso	2015-08-26 11:18:54 +02:00
Glowbal	604a33f71b	Merge branch 'master' into medical-adjustments	2015-08-26 10:13:44 +02:00
Glowbal	19bfa478d1	Revert use of param in action string	2015-08-26 10:13:30 +02:00
Glowbal	9488b6cc2c	Merge branch 'master' into medical-adjustments	2015-08-26 10:08:39 +02:00
Glowbal	0d7e7fa0cc	should be type of	2015-08-26 10:08:32 +02:00
Glowbal	307afc0922	Merge branch 'master' into medical-adjustments	2015-08-26 10:05:46 +02:00
Glowbal	81068e6086	fixed dragging getWeight	2015-08-26 10:05:30 +02:00
Glowbal	0cfb492916	Fixes and removal of duplicate code	2015-08-26 10:04:51 +02:00
Glowbal	7a48f595be	Merge branch 'basic-medical-test' into medical-adjustments	2015-08-26 09:13:12 +02:00
Glowbal	26ffcf473f	Merge branch 'master' into medical-adjustments	2015-08-26 09:11:56 +02:00
Glowbal	1a0abf31fd	fix global variable in local name space	2015-08-26 09:11:43 +02:00
Glowbal	3acfc4d2a3	Merge branch 'master' into medical-adjustments	2015-08-26 09:10:45 +02:00
Glowbal	65e16da998	fix missing semi column and bracket	2015-08-26 09:10:29 +02:00
Glowbal	db96d42f25	Merge branch 'CodeCleanUpMedical' into medical-adjustments	2015-08-26 09:06:27 +02:00
Glowbal	13740c06e4	Merge pull request #1816 from voiperr/ace_map_dev ... Flashlight simulation on map	2015-08-26 09:01:30 +02:00
gienkov	6a123020d2	fail to find BP on limbs with TQ on	2015-08-26 08:55:50 +02:00
Glowbal	fb5563e7ba	Merge pull request #2048 from MikeMatrix/codeCleanupSwitchunits ... Code cleanup of Switchunits module	2015-08-26 08:51:22 +02:00
Glowbal	5bec26c721	Merge pull request #2086 from jokoho48/codeCleanUpDragging ... Code cleanup of Dragging module	2015-08-26 08:45:30 +02:00
Glowbal	222e0183ed	Merge pull request #2202 from jonpas/cargoEvents ... Cargo Events	2015-08-26 08:36:31 +02:00
Glowbal	ad7716a25e	Merge pull request #2233 from gienkov/patch-27 ... Increase "load in bodybag" action time to 15s	2015-08-26 08:36:06 +02:00
Glowbal	d97dfce2d3	Merge pull request #2245 from jonpas/repairHitpointSelections ... Custom Hitpoint Repair Positions Framework	2015-08-26 08:33:01 +02:00
Glowbal	a139a3cccc	Merge pull request #2263 from gienkov/patch-30 ... Bandage and tourniquet on adv. medical change proposal	2015-08-26 08:30:59 +02:00
jokoho48	ca71dd43e1	Code Cleanup MicroDagr Module	2015-08-26 05:31:33 +02:00
Grzegorz	b8a29bfd44	@jokoho482 suggestion	2015-08-26 03:00:43 +02:00
gienkov	cae5f828fb	run check only on arms	2015-08-26 02:51:05 +02:00
gienkov	c3af5e81e7	fix my error	2015-08-26 02:41:12 +02:00
gienkov	5a9817322b	remove tabs	2015-08-26 02:39:34 +02:00
gienkov	8498589920	pulse zero on limb with TQ on	2015-08-26 02:37:51 +02:00
PabstMirror	bcb6c474a0	Merge pull request #2250 from acemod/fixExportColors ... - Fix Exporting Color Arrays	2015-08-25 16:42:26 -05:00
Felix Wiegand	3098794951	Merge pull request #2194 from NemesisRE/patch-1 ... Changed german strings for aid kit	2015-08-25 23:18:21 +02:00
PabstMirror	2c64cca44d	Merge pull request #2236 from acemod/hugeChangeToInteractMenu ... Compile Self Menu, set "Default Params" to array instead of code	2015-08-25 13:34:30 -05:00
PabstMirror	275f04d876	preInit defines and fix func name	2015-08-25 13:18:59 -05:00
Grzegorz	5280ded680	Bandage and tourniquet on adv. medical change proposal ... Make bandaging longer as it is not very fast process. Make putting on tourniquet faster cause it's should be easy to put one on limb, so it's actually useful now and with above change (putting it on before was longer than bandagin).	2015-08-25 20:05:05 +02:00
jokoho48	8d29170551	fixing Spelling Issues ... Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN	2015-08-25 19:33:10 +02:00
ulteq	f0cc1ca333	Merge pull request #2015 from jokoho48/codeCleanupAB ... Code cleanup of the Advanced Ballistics module.	2015-08-25 18:56:45 +02:00
jokoho48	2af486ab6b	Update Main Config File	2015-08-25 18:34:10 +02:00
SilentSpike	ffcf0ecf7d	Merge pull request #2253 from gienkov/spectator-pl-translation ... Translate spectator strings to polish	2015-08-25 16:25:14 +01:00
voiper	e237bea88c	Dimmed the glow values.	2015-08-24 15:43:43 -07:00
voiper	f8f8d7fd19	Simplified the colour check again.	2015-08-24 15:43:21 -07:00
voiper	54f1a87222	Simplified the colour check.	2015-08-24 15:42:12 -07:00
Michael Braun	431bd309a8	Fixed variable privatization	2015-08-24 23:26:03 +02:00
voiper	9de7953345	More cba capitalisation.	2015-08-24 14:12:04 -07:00
voiper	720f6c075a	Removed old references to NVG.	2015-08-24 14:08:02 -07:00
voiper	1f8b16f7fb	Fixed BFT module weirdness.	2015-08-24 14:06:19 -07:00
voiper	72b12e3af4	Fixed indentation.	2015-08-24 14:03:23 -07:00
voiper	79e6ce3803	Fixed CBA capitalisation.	2015-08-24 14:02:55 -07:00
voiper	b230762abd	Add some string checking for flashlight glow type.	2015-08-24 13:59:35 -07:00
Michael Braun	93acdbcb4d	Replaced custom mapping implementation with ACE Hash	2015-08-24 22:45:59 +02:00
Michael Braun	2b0ef7bc6d	Removed explicitly stated isClientSettable in Map Gestures ace settings	2015-08-24 22:10:02 +02:00
Michael Braun	3cbe6a3ebc	Fixed multiple group settings not applying properly. ... Added client configuration options for default colors.	2015-08-24 22:03:47 +02:00
jonpas	3f41882a06	Removed debug	2015-08-24 21:56:21 +02:00
jonpas	5b6429f23e	Made more modules use assignObjectsInList common function	2015-08-24 21:55:48 +02:00
jonpas	ef2924623f	Added common parseList function for module list parsing	2015-08-24 21:45:02 +02:00
Michael Braun	0ff5e86b52	Another missing semi-colon	2015-08-24 21:00:24 +02:00
jonpas	9718883599	Consolidated into 1 function	2015-08-24 20:58:54 +02:00
bux578	21aa4da4ad	Merge pull request #2255 from J3aLeiNe/master ... rangecard stringtable : french translation	2015-08-24 20:51:44 +02:00
jonpas	3f0909ddd5	Fixed typo	2015-08-24 20:12:45 +02:00
jonpas	78e7565121	Added support for multiple groups, Fixed check group damage returning true even if hitpoint not in a group	2015-08-24 20:03:11 +02:00
jonpas	2c521527f4	Readded newline	2015-08-24 18:19:25 +02:00
jonpas	cb6efc7c9a	Removed copy/paste minuses	2015-08-24 18:18:54 +02:00
jonpas	04da19190f	Changed custom hitpoint positions config entry to 2d array	2015-08-24 18:17:56 +02:00
jonpas	449af180c7	Moved check for zero position in it's own line	2015-08-24 17:58:19 +02:00
jonpas	32d5ac99d9	Readded ignored hitpoints	2015-08-24 17:56:34 +02:00
Grzegorz	288457d366	fix	2015-08-24 17:43:02 +02:00
Michael Braun	ee2cc22801	Added missing semicolon	2015-08-24 17:28:08 +02:00
jokoho48	203c4d8a6c	add WaitUntilAndExecute	2015-08-24 17:10:54 +02:00
Michael Braun	7217d5ec10	Various code cleanups and switch to player UIDs instead of sanitized names	2015-08-24 17:03:47 +02:00
gienkov	0fa10045d2	pl translation of spectator	2015-08-24 14:35:15 +02:00
jokoho48	644c13c971	fix Typo ... Remove macro GETVAR	2015-08-24 13:43:11 +02:00
Glowbal	b14dc7cb02	Merge pull request #2242 from jonpas/fixSlideshowModule ... Allow spaces in slideshow module	2015-08-24 09:38:10 +02:00
PabstMirror	5d104106c5	#2188 - Fix Exporting Color Arrays	2015-08-24 00:58:45 -05:00
PabstMirror	a2022bb6fb	Merge pull request #2176 from acemod/remove-asdg-message ... remove asdg message	2015-08-24 00:17:18 -05:00
PabstMirror	d3db5ad2ed	Cleanup	2015-08-24 00:07:40 -05:00
PabstMirror	40634318f0	Move RemoveHandcuffs to Main (always blocked by hands)	2015-08-23 23:41:35 -05:00
PabstMirror	bb616887dc	Don't run when mounted	2015-08-23 22:55:43 -05:00
jonpas	7f175bad5f	Added support for display messages	2015-08-24 05:24:25 +02:00
jonpas	144af2ed17	Added support for when one of the grouped hitpoints is damaged but not main	2015-08-24 05:14:04 +02:00
jonpas	f2bda7c434	Added hitpoint groups framework	2015-08-24 04:17:24 +02:00
jonpas	94c4c411e2	Added custom hitpoint selection framework with a starting example, removed blacklist	2015-08-24 03:23:37 +02:00
jonpas	1253d1267c	Inlined selection check	2015-08-24 01:54:12 +02:00
jonpas	5c33f7736c	Added support in repair for hitpoints with non-center selections	2015-08-24 01:51:34 +02:00
SilentSpike	152faf6388	Improve spectator interface entry and exit ... - Use a display rather than a dialog (contextually makes more sense). - Move the entry/exit functionality to the setSpectator function. Preserves the handleInterface function for purely display related events and makes more sense. - Fix missing semi-colon	2015-08-24 00:43:20 +01:00
PabstMirror	2e1d734420	#2238 - use config for fences + cleanup	2015-08-23 18:39:08 -05:00
jonpas	6a1b8cc359	Changed to LSTRING	2015-08-24 01:25:00 +02:00
jonpas	d33834261f	Removed debug	2015-08-24 01:14:59 +02:00
jonpas	e368ae28f5	Fixed localization on same type hitpoints	2015-08-24 01:13:42 +02:00
jonpas	396e01cd6e	Added string checking for less needed string multiplicates	2015-08-24 01:04:57 +02:00
PabstMirror	27d974687e	Merge pull request #2235 from acemod/mdagrFixes ... Mdagr fixes	2015-08-23 17:00:37 -05:00
PabstMirror	05925ad7c2	Merge pull request #1902 from acemod/virtualExplosivesPlace ... Virtual explosives place	2015-08-23 16:57:24 -05:00
Michael Braun	fc45d1216a	Simplyfied bounding value detection	2015-08-23 22:26:31 +02:00
PabstMirror	58f4ef5b62	Merge pull request #2226 from acemod/codeCleanupMarker ... Code Cleanup Marker Module	2015-08-23 14:27:07 -05:00
PabstMirror	a82e5b5436	Fix Colors + Debug Trace	2015-08-23 14:25:41 -05:00
jonpas	0fc9a33d38	Shortened sub-action text localization	2015-08-23 21:11:45 +02:00
jonpas	e08bf59ac2	Removed 'Repair' word from sub-actions	2015-08-23 21:09:36 +02:00
jonpas	2808ae6fc9	Removed debug	2015-08-23 19:55:52 +02:00
jonpas	ca1b47beb5	Use correct module group	2015-08-23 19:54:55 +02:00
jonpas	6d15e63f85	Fixed #2222 - Allow spaces in slideshow module by just trimming the splitted input string rather than removing all whitespace	2015-08-23 19:48:57 +02:00
PabstMirror	8ca06a9a76	More FFV animation stuff	2015-08-23 12:32:46 -05:00
Steven Koeberich	d5a1a99f90	Update stringtable.xml ... corrected spelling	2015-08-23 18:58:13 +02:00
Michael Braun	9352a8dbcb	Hotfix for missreplaced variable in projectile direction adjustment	2015-08-23 18:38:19 +02:00
Michael Braun	021c835b02	Removed debug messages	2015-08-23 17:54:10 +02:00
Michael Braun	20b45e10a4	Fixed issue with selecting the wrong value, when perfect barrel length match occured.	2015-08-23 17:53:33 +02:00
PabstMirror	b5fb0daa9b	Merge branch 'master' into captiveFFV	2015-08-23 10:46:49 -05:00
Michael Braun	1c14897194	Fixed velocity limit detection and small comment fix	2015-08-23 17:39:48 +02:00
J3aLeiNe	490602facd	rangecard stringtable : french translation ... rangecard stringtable : french translation	2015-08-23 17:01:41 +02:00
jokoho48	260b048da4	some more Improvements	2015-08-23 14:13:55 +02:00
PabstMirror	69df301e67	Replace one more macro	2015-08-23 02:29:51 -05:00
PabstMirror	9aed148e8a	Default Action parameters is [] for self (ref #2228) ... Makes it match fnc_compileMenu.sqf	2015-08-23 00:16:01 -05:00
PabstMirror	248b4449bf	#2204 - Tweak road draw for performance	2015-08-22 22:07:29 -05:00
PabstMirror	3df5b82402	#2225 - Fix mdagr list box colors	2015-08-22 20:53:29 -05:00
Grzegorz	33889fa46b	Increase "load in bodybag" action time ... Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).	2015-08-23 00:13:09 +02:00
Joko	3eae83439b	Merge pull request #2231 from gienkov/patch-26 ... Fix stitching action progress bar	2015-08-22 22:59:46 +02:00
jokoho48	29cc4c2697	stringtable Cleanup	2015-08-22 22:50:36 +02:00
jokoho48	9d0f3c7f5b	stringtable Cleanup	2015-08-22 22:45:14 +02:00
jokoho48	4d81e4a99e	Code Cleanup Medical Menu Module.	2015-08-22 22:33:15 +02:00
jonpas	f43282024a	Updated FoV Based PFH function header	2015-08-22 22:26:04 +02:00
Grzegorz	07019ed928	Fix stitching action progress bar	2015-08-22 22:20:20 +02:00
jokoho48	fab4c6a67f	fix Spelling Issues	2015-08-22 21:32:36 +02:00
jokoho48	19dd55147a	Code Cleanup Medical Module (Part 4).	2015-08-22 19:47:23 +02:00
jokoho48	2d4ef16429	fix CTD	2015-08-22 18:54:51 +02:00
jokoho48	ff6c8a31be	Code Cleanup Medical Module (Part 3).	2015-08-22 18:33:06 +02:00
jokoho48	10127ed957	Fix Typo	2015-08-22 17:10:19 +02:00
jonpas	18f5a2ca94	Renamed cargo events	2015-08-22 16:45:50 +02:00
jokoho48	21e0a9fff3	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupMedical	2015-08-22 16:32:15 +02:00
jokoho48	c2d94239a2	Code Cleanup Medical Module (Part 2).	2015-08-22 16:26:53 +02:00
jokoho48	d09ca9ec8b	Code Cleanup Medical Module (Part 1).	2015-08-22 16:25:10 +02:00
Glowbal	7d2ca74402	Merge pull request #2220 from acemod/fixHitEffectRepair ... Fix Hit Effect on Track and Wheel	2015-08-22 14:32:03 +02:00
jokoho48	f35b82ddb9	Code Cleanup Marker Module.	2015-08-22 14:08:35 +02:00
IngoKauffmann	8b53b4f0d0	Fixes ... Moved macros to function Fixed MP bugs Changed class history of nozzle	2015-08-22 13:34:24 +02:00
bux578	bfc3a4048e	Merge pull request #2221 from gienkov/pl-translation-6 ... PL translation and fixes	2015-08-22 12:38:52 +02:00
gienkov	cf585790db	fixes done	2015-08-22 11:41:15 +02:00
SilentSpike	21b0ee087a	Add spectator UI interrupt system ... A public API system to allow external systems to interrupt and resume the spectator interface. Also made use of it for the escape menu and zeus support.	2015-08-22 00:26:43 +01:00
jonpas	a24da99722	Merge branch 'master' into dynamicViewDistance ... Conflicts: addons/viewdistance/README.md addons/viewdistance/XEH_clientInit.sqf	2015-08-22 00:49:57 +02:00
SilentSpike	b8b71e1c76	Merge pull request #2195 from jonpas/fixVDlimit ... Fixed View Distance limit not applied on Video Settings	2015-08-21 23:47:02 +01:00
jonpas	295acddc7a	Added view distance set on module load, so it is guaranteed to be set	2015-08-22 00:33:16 +02:00
gienkov	96c3b62cb9	zeus translation	2015-08-22 00:19:51 +02:00
gienkov	75c31c10fd	optionsmenu and repair first version of translation	2015-08-22 00:17:01 +02:00
jokoho48	11f753f873	Fix Hit Effect on Track and Wheel	2015-08-22 00:13:29 +02:00
gienkov	cc430fc8c2	medical translation	2015-08-21 23:54:01 +02:00
gienkov	1bbf721ef6	main translation	2015-08-21 23:51:48 +02:00
gienkov	f22531cc59	cargo translation	2015-08-21 23:50:54 +02:00
gienkov	8f483ba8df	fix medical_menu stringtable error	2015-08-21 23:46:05 +02:00
IngoKauffmann	01c20d4544	Minor formating and docu	2015-08-21 22:57:14 +02:00
IngoKauffmann	22576f938e	Added dropping and progress bars	2015-08-21 22:43:45 +02:00
jonpas	ccd0a7bd88	Merge branch 'master' into trackToTrackedVehicles ... Conflicts: addons/repair/stringtable.xml	2015-08-21 21:04:50 +02:00
PabstMirror	cc9eee5609	Typo	2015-08-21 09:42:23 -05:00
PabstMirror	e0f20350a2	Merge branch 'master' into virtualExplosivesPlace	2015-08-21 09:16:15 -05:00
SilentSpike	5112bd9bdf	Merge pull request #2163 from acemod/add-objects-to-curator ... Add objects to all curators	2015-08-21 13:53:45 +01:00
Glowbal	bf8318530e	Merge pull request #2081 from acemod/close-med-menus-distance ... Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-21 14:20:41 +02:00
Glowbal	b3ee889cac	Merge pull request #2113 from MikeMatrix/codeCleanupSafemode ... Code cleanup Safemode module	2015-08-21 14:20:08 +02:00
Glowbal	f0792233ae	Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack ... Code Cleanup Magazine Repack Module	2015-08-21 14:09:55 +02:00
Glowbal	2f0ed4fba1	Merge pull request #2207 from jonpas/readmes ... Added and Updated README.md files	2015-08-21 14:07:30 +02:00
Glowbal	26c172ff11	Merge pull request #2066 from acemod/fixDisableUserInput ... Fix and enhancement of two common functions	2015-08-21 14:05:47 +02:00
Glowbal	20918f2c70	Merge pull request #2183 from acemod/treatmentWhileDeployed ... Fix treatment when weapon deployed	2015-08-21 14:04:51 +02:00
PabstMirror	51a8cb7974	Only force Animation for FFV Cargo Seats	2015-08-20 23:58:06 -05:00
IngoKauffmann	f44060c6a0	Cleanup and improvements	2015-08-20 22:10:26 +02:00
SzwedzikPL	a8c11a249d	cargo sup for bodybag and concertina	2015-08-20 21:41:28 +02:00
IngoKauffmann	9162789579	Manny things ... Added dummy objects Added carrying Added dropping Added storing Added more progress bars ...	2015-08-20 19:51:22 +02:00
SilentSpike	5b8708a179	Prevent CBA keybindings in zeus interface ... Checks if the key pressed matches the zeus menu keybind and only fires the code to handle CBA keybinds if true. Should fix the majority of weirdness with keybinds in zeus. However, not perfect as shared keybinds with different modifiers will still fire and it's really an un-ideal workaround.	2015-08-20 18:17:37 +01:00
Glowbal	60ef673896	Merge pull request #2198 from jonpas/logistics ... Added Logistics Categories	2015-08-20 18:43:55 +02:00
PabstMirror	645e8a63ef	Captive FFV Lock Animation	2015-08-20 04:20:46 -05:00
IngoKauffmann	dd1917464d	Preliminary carrying and dropping of carried ammo ... Could not use ace_dragging since it block interact menu	2015-08-20 01:20:31 +02:00
SilentSpike	33ef60266b	Fix medical CPR code and log message ... Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.	2015-08-19 23:30:13 +01:00
PabstMirror	4c14dc7684	#2208 - Use ACE Message Display instead of sideChat	2015-08-19 17:25:45 -05:00
IngoKauffmann	a37608b9b1	Added generic dummy	2015-08-20 00:03:16 +02:00
nsgundy	3aab62fa7c	Return true / false if event was handled so that CBA keybinding doesn't have a reason to complain. ... Converted tabs to spaces	2015-08-19 15:32:46 -03:00
IngoKauffmann	bdc5e54f55	Fixed turret locality and driver empty magazine issues	2015-08-19 17:33:32 +02:00
jonpas	d71c43b91c	Fixed unknown char	2015-08-19 17:12:39 +02:00
jonpas	9fd155f3ec	Integrated ASDG JR Optional	2015-08-19 17:11:15 +02:00
jonpas	b627e32a00	Added shared logistics categories	2015-08-19 16:54:44 +02:00
Glowbal	4acdfcbd24	Merge pull request #2193 from jokoho48/ModelFix ... Model Fixes	2015-08-19 12:02:28 +02:00
jonpas	683e727cb4	Readded items	2015-08-19 04:22:39 +02:00
jonpas	5a0a3a53e0	Uppercased 2 readme files	2015-08-19 04:19:00 +02:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
jonpas	b16d313e35	Moved spare parts cargo init to cargo	2015-08-19 03:36:31 +02:00
jonpas	583682396f	Changed cargo initVehicle to event driven, Added listenable event cargo_itemAdded	2015-08-18 23:59:01 +02:00
PabstMirror	4e3bbfac16	Clean old updateMapToolMarkers calls	2015-08-18 16:57:56 -05:00
jonpas	4c86db9505	Added AddCargoItem event and function to add an item by classname	2015-08-18 23:51:30 +02:00
IngoKauffmann	f852eb5f4b	Moved compatibility stuff	2015-08-18 23:48:25 +02:00
jonpas	ffb765bf7a	Changed to AddCargoItem event	2015-08-18 23:43:34 +02:00
jonpas	3bcebf9033	Moved spare parts adding to init, Added module option to add spare parts or not, Added module to add specific spare part and amount of it to specific vehicle(s)	2015-08-18 23:41:25 +02:00
IngoKauffmann	cdd0c4c013	Next few things ... Clean up Removed MP issues Added macros for reused code Added death handling Added unconscious handling Added fueling restart	2015-08-18 23:18:32 +02:00
IngoKauffmann	8b9be1923c	Added support for third subturret of main turret	2015-08-18 19:06:41 +02:00
jonpas	e110874800	Added cargo listenable and callable events	2015-08-18 18:48:21 +02:00
jonpas	16add9d376	Changed cargo_hideUnit for already existing hideObjectGlobal event	2015-08-18 18:19:18 +02:00
IngoKauffmann	cf9c49f13c	Attempt to fix turret locality issues	2015-08-18 18:09:37 +02:00
IngoKauffmann	3072bd9d22	Fixed rearm sucess hint and collision with dummy	2015-08-18 17:38:50 +02:00
IngoKauffmann	463309db2d	Small cleanup	2015-08-18 16:20:11 +02:00
IngoKauffmann	2816e8863a	Minor fixes	2015-08-18 16:09:59 +02:00
PabstMirror	4a245bd935	Remove Spawn for CBA_fnc_addPerFrameHandler	2015-08-17 22:21:18 -05:00
PabstMirror	1f9a98f77d	Cleanup / Params	2015-08-17 21:51:40 -05:00
PabstMirror	980fc7a235	Merge branch 'master' into mapOpenCloseEvents	2015-08-17 21:08:07 -05:00
jonpas	6c8352c9e5	Added README.md to rearm, self to authors	2015-08-18 03:38:28 +02:00
jonpas	7244a583d6	Removed unnecessary ACE_Action calls parameters and changed others to _this	2015-08-18 03:37:02 +02:00
jonpas	387aad4204	Removed 3rd party config, Moved ACE Hydra to rearm config to missileguidance	2015-08-18 03:18:38 +02:00
jonpas	33e92f8ca0	Fixed SmokeLauncherMag rearming on level 0 when empty	2015-08-18 02:57:39 +02:00
jonpas	c8c6488125	Cleaned, improved, fixed, changed - entire rearm	2015-08-18 02:32:10 +02:00
IngoKauffmann	f54beb5c86	Many things ... Added correct hooks for fuel trucks Added code for finding closest hook Cleanup	2015-08-18 00:42:35 +02:00
jonpas	64c1a93517	Renamed macro, removed debug	2015-08-17 18:50:02 +02:00
jonpas	f14830624b	Added separate handling for Air vehicles (longer view distances), Fixed normal zoom level to actual A3 value	2015-08-17 18:46:14 +02:00
jonpas	3147cb038b	Removed unnecessary param assignment, fixed comment example	2015-08-17 18:22:03 +02:00
jonpas	fe9e4fee07	Fixed viewdistance limit not applied when Video Settings option is selected, Removed unnecessary EHs	2015-08-17 18:12:00 +02:00
Steven Koeberich	b333fe0cd1	Changed german strings for aid kit ... Missed some.	2015-08-17 17:42:03 +02:00
Steven Koeberich	f543cf2897	Changed german strings for aid kit ... The translation for Fielddressing and Aid kit are the same in the german translation which is missleading. Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.	2015-08-17 17:31:40 +02:00
jokoho48	e14c640c6f	Fix Some LandContactPoints ... Fix Positions of some Model	2015-08-17 16:11:23 +02:00
Glowbal	4d10f2a72d	Merge pull request #2182 from jonpas/repairClean ... Repair Cleanup	2015-08-17 11:31:57 +02:00
Glowbal	f59927a9a7	Merge pull request #2186 from jonpas/cargoClean ... Cargo Cleanup	2015-08-17 09:50:49 +02:00
jonpas	539fc69275	Increased interaction distance to 7 (same as attach) to cover bigger vehicles	2015-08-17 01:58:52 +02:00
jonpas	9ad8718762	Added canCheckFuel for check fuel condition, removed extra spaces	2015-08-17 01:57:05 +02:00
jokoho48	d5f9998ad0	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupABOnEchtFrameTest	2015-08-17 01:50:48 +02:00
jonpas	4dc8747430	Bypassed interaction menu subactions distance bug	2015-08-17 01:44:47 +02:00
jonpas	68370f63d7	Fixed returnNozzle function, Moved Return action up	2015-08-17 01:24:45 +02:00
jonpas	68489c456e	Alphabetized PREPs	2015-08-17 01:12:47 +02:00
jonpas	40eb5a5ba9	Made return nozzle bypass connect-attach	2015-08-17 01:12:14 +02:00
jonpas	b717ff8dde	Fixed interaction menu overwrapping, Moved all actions under one main Refuel action, Changed fuel nozzle pickup action to config	2015-08-17 00:55:26 +02:00
IngoKauffmann	0fcf692d36	Moved dummies to CfgVehicles	2015-08-16 23:52:37 +02:00
jonpas	dcf074ed5a	Changed Optional parameter comment to default value	2015-08-16 23:05:26 +02:00
jonpas	7b89784aae	Removed semi-colons from return statements, command capitalization	2015-08-16 22:48:52 +02:00
jonpas	bbc715b2ee	Cleaned function headers	2015-08-16 22:41:35 +02:00
PabstMirror	359ee1d23b	#2180 - Fix QGVAR(fullRepairLocation) switch statement	2015-08-16 15:31:20 -05:00
jonpas	98dd60c6ca	Alphabetized PREPs, removed newlines and repair references	2015-08-16 22:21:39 +02:00
jonpas	fb73d3a436	Fixed dependencies	2015-08-16 22:17:04 +02:00
bux578	905628bc1c	Merge pull request #2165 from acemod/enhanceRespawn ... after respawn select last weapon, muzzle and mode	2015-08-16 22:05:41 +02:00
jonpas	b2824c82bb	Removed redundant function	2015-08-16 21:54:04 +02:00
jonpas	fda0850ad7	Condensed duplicated function, alphabetized PREPs	2015-08-16 21:39:42 +02:00
PabstMirror	dd58eef415	Fix double weapon switch for standing treatment	2015-08-16 14:12:26 -05:00
PabstMirror	21f46f4401	#2178 - Fix treatment when weapon deployed	2015-08-16 13:58:58 -05:00
jonpas	161a75adc7	Added missing arguments in header, replaced QOUTE(DFUNC()) with QFUNC()	2015-08-16 20:34:02 +02:00
jonpas	701c98e0da	Cleaned up repair function headers and some code	2015-08-16 20:14:54 +02:00
jokoho48	8a5e572baf	Fix Model Warning Unsupported UVSet	2015-08-16 19:52:28 +02:00
jokoho48	e41ce78dbb	Code Test PFH	2015-08-16 19:49:47 +02:00
IngoKauffmann	1a22c4d85a	Many things ... Added dummy objects Added carrying Added display names for a few magazines, that didn't have any	2015-08-16 18:16:38 +02:00
jonpas	85cc662fa4	ACE_Repair capitalization 2/2	2015-08-16 16:46:32 +02:00
jonpas	68359974f1	ACE_Repair capitalization 1/2	2015-08-16 16:46:17 +02:00
jonpas	b7282e476c	Used macros, getVariable capitalization, removed start of file newlines, separated CfgActions	2015-08-16 16:45:46 +02:00
Glowbal	9f3af45a8f	Fixed repair items not registered as loadable	2015-08-16 16:16:04 +02:00
SilentSpike	1d51bd7c40	Merge pull request #2162 from acemod/assign-medic-curator-modules ... Add medical curator modules	2015-08-16 14:13:31 +01:00
jonpas	5b0168efdb	Fixed Atropine autoinjector display name	2015-08-16 14:14:49 +02:00
bux578	5ffdf4628f	remove asdg message ... new cba will include asdg jr	2015-08-16 13:15:01 +02:00
Glowbal	0c1b828946	Merge pull request #2171 from acemod/fix-error-invalid-hitpoints ... Fixed error pop-up invalid configured hitpoints	2015-08-16 10:24:24 +02:00
PabstMirror	61bc40a650	Opps	2015-08-16 02:05:34 -05:00
bux578	ec29890780	Merge pull request #2128 from acemod/gienkov-pl-translation-5 ... Gienkov pl translation 5	2015-08-16 08:54:47 +02:00
PabstMirror	b9638f749b	SetPosition Event - Fix digging down (#1991)	2015-08-16 01:51:44 -05:00
IngoKauffmann	3eaaca84fb	Added different rearm levels	2015-08-16 02:18:53 +02:00
jokoho48	4478be096e	Code Cleanup Magazine Repack Module.	2015-08-16 00:30:24 +02:00
Glowbal	0420f0b216	Fixed error pop-up kicking you out of game in case a third party vehicle has incorrect configured hitpoints/selections	2015-08-16 00:15:16 +02:00
jokoho48	965b024bfa	Code Cleanup Logistic UAV Battery.	2015-08-16 00:07:17 +02:00
IngoKauffmann	214c639839	Added module icon	2015-08-15 23:38:08 +02:00
IngoKauffmann	957756893c	Updated module icon	2015-08-15 23:35:05 +02:00
SilentSpike	05bf239d8e	Specify zeus setMedic module conditions further	2015-08-15 21:44:40 +01:00
SilentSpike	c01052e5bf	Update ace_zeus function headers	2015-08-15 21:11:49 +01:00
PabstMirror	fc6cd34d33	params, cleanup	2015-08-15 14:35:33 -05:00
Glowbal	7fa30009d3	Merge branch 'add-objects-to-curator' of github.com:acemod/ACE3 into add-objects-to-curator	2015-08-15 20:39:54 +02:00
Glowbal	1417429782	Switched to serverInit instead of init as per suggestion from @SilentSpike	2015-08-15 20:39:22 +02:00
Glowbal	c7f47c0b34	Replaced check for captive module by check for ACE_medical	2015-08-15 20:31:41 +02:00
IngoKauffmann	a576ed82ee	Fixed some macro stuff	2015-08-15 19:26:26 +02:00
IngoKauffmann	a8c263b6cc	More fixes ... Thanks guys	2015-08-15 19:23:02 +02:00
PabstMirror	30828b83d2	Stringtable fixes	2015-08-15 12:21:49 -05:00
PabstMirror	d023139e8d	Stringtable fix	2015-08-15 12:04:57 -05:00
IngoKauffmann	26c54b352a	Fixed some logistics remnants	2015-08-15 19:00:28 +02:00
bux578	3d9b0d527c	fix indentation ... atom needed the editorconfig package	2015-08-15 18:58:31 +02:00
bux578	675cfc2da7	after respawn select last weapon, muzzle and mode ... #2138	2015-08-15 18:54:39 +02:00
IngoKauffmann	0c4924259d	Initial code	2015-08-15 18:43:13 +02:00
PabstMirror	4d8a9ae890	Merge branch 'master' into virtualExplosivesPlace	2015-08-15 11:40:06 -05:00
Glowbal	ed66255b19	Add objects to all curators	2015-08-15 18:39:43 +02:00
Glowbal	0e57d3d97c	Added assign medic, medicalfacility and medical vehicle curator modules	2015-08-15 18:25:48 +02:00
Glowbal	29b21b8f41	Merge pull request #275 from acemod/cargo ... load things into vehicles	2015-08-15 17:36:44 +02:00
Glowbal	bac1a8fce4	Merge pull request #186 from acemod/repair ... add repair PBO, fix #185	2015-08-15 17:36:31 +02:00
IngoKauffmann	94a5b38cf6	Renamed an interaction	2015-08-15 17:24:11 +02:00
IngoKauffmann	67091a7aeb	Added real fuel amounts ... Some are best guesses though	2015-08-15 16:49:57 +02:00
Glowbal	fe9751f725	Added category to settings ... Fixed client setting attribute spelling mistake	2015-08-15 16:00:37 +02:00
Glowbal	d3aa6a7f6b	Added missing assign modules	2015-08-15 15:49:41 +02:00
Michael Braun	3646654ff3	Added module icons	2015-08-15 12:21:40 +02:00
Michael Braun	c3c39150a3	Improved handling of accessing dynamic variable names	2015-08-15 12:12:41 +02:00
PabstMirror	c54081d677	Don't broadcast localization for settings ... smaller `publicVariable`	2015-08-15 03:48:25 -05:00
Glowbal	317c73a80e	Added Land_PaperBox_closed_F ... fixed initOBject	2015-08-15 10:22:44 +02:00
PabstMirror	660d048670	Options Menu - Fix Colors when category selected	2015-08-15 03:21:03 -05:00
PabstMirror	a2897e6d32	Merge branch 'master' into cargo	2015-08-15 03:11:19 -05:00
PabstMirror	ea2dc46d59	1.50 realisticnames - ubc	2015-08-15 02:56:34 -05:00
Glowbal	03413ef6b6	Merge branch 'cargo' of github.com:acemod/ACE3 into cargo ... Conflicts: addons/cargo/functions/fnc_initVehicle.sqf	2015-08-15 09:51:15 +02:00
Glowbal	d8084e20d7	Added cargo settings and settings module.	2015-08-15 09:50:00 +02:00
PabstMirror	c35fc35eb3	Captive FFV stuff	2015-08-14 21:29:01 -05:00
PabstMirror	7c276d9d25	Grenade Cleanup	2015-08-14 20:25:27 -05:00
PabstMirror	e160a62599	Merge pull request #2145 from jokoho48/codeCleanupGrenades ... Code cleanup of Grenades module	2015-08-14 20:18:30 -05:00
PabstMirror	b9db03de20	Fix count problems	2015-08-14 20:13:41 -05:00
PabstMirror	e3a31687a8	Merge pull request #2084 from jokoho48/codeCleanupDisarming ... Code cleanup of Disarming module	2015-08-14 20:01:23 -05:00
PabstMirror	253fb6e66a	Merge pull request #1986 from acemod/addMainAction ... Always make sure ACE_MainActions exists	2015-08-14 19:48:04 -05:00
PabstMirror	f9b3cbc02a	Merge pull request #1956 from SzwedzikPL/laser_default_keybinds ... default laser code down keybind fix	2015-08-14 19:36:02 -05:00
PabstMirror	6932014b9d	Merge pull request #1993 from acemod/fixMapCompassChange ... Fix ace_map changes to compass display object	2015-08-14 19:34:09 -05:00
PabstMirror	fc51ad9a5e	Merge pull request #2137 from acemod/checkPBO-spawnloop ... CheckPBO Fix endless waitUntil if checkAll is false	2015-08-14 19:31:36 -05:00
PabstMirror	13abee2612	Merge pull request #2106 from acemod/optionMenuFiltering ... Option Menu Fixes for categories	2015-08-14 19:31:17 -05:00
PabstMirror	21400b0174	UBC, privates, LSTRING	2015-08-14 15:46:51 -05:00
PabstMirror	2be74dfdca	Privates	2015-08-14 15:14:36 -05:00
Glowbal	2062f5dcb6	fixed incorrect variable name	2015-08-14 22:07:49 +02:00
Glowbal	96ec435d0d	Added load in cargo containers	2015-08-14 22:01:14 +02:00
Glowbal	55ad706761	fixed car check - invalid variable name	2015-08-14 22:00:55 +02:00
PabstMirror	066a78d9aa	Fix var	2015-08-14 14:36:54 -05:00
Glowbal	83f46be990	Fixes and improvements for the repair module ... 1. Added full repair, 2. Added missing settings to modules and settings framework, 3. added assign engineer module. 4. Fixed animation bug	2015-08-14 20:49:51 +02:00
PabstMirror	ef5a3d69f5	Merge pull request #2148 from acemod/nameTagFixes ... nametag cleanup and fix cursortarget distance	2015-08-14 12:58:02 -05:00
PabstMirror	09296e42a0	Merge pull request #2143 from acemod/removeBreifingPFEH-hack ... Remove PFEH hack	2015-08-14 12:50:35 -05:00
ViperMaul	c3f6ee7141	Merge pull request #2140 from acemod/addActionParamChecking ... AddAction basic param checking	2015-08-14 10:48:07 -07:00
Joko	ec5a1f038a	fix Typo issue	2015-08-14 18:42:22 +02:00
jokoho48	c4ed18f39f	Fix findNearestVehicle dont return BOOL ... Fix that findNearestVehicle dont return any time the nearest car Small Performance Improvement in getSizeItem/handleDestroyed/startUnload Enhance Some legibility	2015-08-14 18:07:31 +02:00
jokoho48	8e7e9b9ee3	Fix Typo	2015-08-14 14:57:29 +02:00
Michael Braun	eaae6dfb7d	Replaced padding chain with params defaults	2015-08-14 11:43:36 +02:00
Michael Braun	2bbf631e71	Fixed missing semi-colon in safemode.	2015-08-14 11:39:22 +02:00
IngoKauffmann	6dc5050dc3	Missed one return type	2015-08-14 03:21:16 +02:00
IngoKauffmann	de500fb80b	First batch of fixes	2015-08-14 03:18:54 +02:00
jokoho48	84685f4a84	add dayOfWeek and updateMemory to Own File ... Update some Comments Fixing Spelling Issue	2015-08-14 02:22:15 +02:00
jokoho48	183aac1911	Code cleanup of Kestrel 4500 module.	2015-08-14 01:55:54 +02:00
jokoho48	bd56d1bb83	ok that is my fault	2015-08-14 00:36:36 +02:00
jokoho48	cb8d009ef0	Woops	2015-08-14 00:31:42 +02:00
PabstMirror	28ac2fbec6	Merge pull request #2147 from jokoho48/codeCleanUpHitReaction ... Code cleanup of HitReaction module	2015-08-13 17:11:19 -05:00
jokoho48	d62f00146e	Comment CleanUp	2015-08-14 00:02:19 +02:00
jokoho48	0656418cd1	Code cleanup of HuntIR module.	2015-08-14 00:00:34 +02:00
PabstMirror	68517756c4	#2139 and nametag cleanup	2015-08-13 17:00:24 -05:00
jokoho48	e890b310c1	Code cleanup of HitReaction module	2015-08-13 23:50:51 +02:00
jokoho48	27babd351d	Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupHearing	2015-08-13 23:43:01 +02:00
jokoho48	c6fbdb420c	Code cleanup of Hearing module	2015-08-13 23:42:20 +02:00
PabstMirror	2d8261ddb5	Merge pull request #2135 from acemod/nameTagsWhenPaused ... Don't draw nametags when escape menu is open	2015-08-13 16:09:32 -05:00
PabstMirror	43e9c420c4	Merge pull request #2136 from acemod/captiveHeliFix ... Don't use old Helicopter_F	2015-08-13 16:01:59 -05:00
jokoho48	7bf7066cfd	Code cleanup of grenades module.	2015-08-13 22:36:58 +02:00
PabstMirror	7c60375105	Merge pull request #2102 from acemod/disposableFixes ... Disposable fixes	2015-08-13 15:13:03 -05:00
PabstMirror	05def2f62b	Merge pull request #2016 from jokoho48/codeCleanupBackpack ... Code cleanup of the Backpack module.	2015-08-13 15:10:39 -05:00
PabstMirror	8f142e26f8	Merge pull request #2094 from jokoho48/codeCleanupFingering ... Code cleanup of Finger module.	2015-08-13 15:09:18 -05:00
jokoho48	acb4e44c19	Code cleanup of Finger module is Incomming(Part 2).	2015-08-13 22:04:35 +02:00
jokoho48	fcd60650b2	PATHTOF dont work with say3d	2015-08-13 21:57:58 +02:00
jokoho48	5597b7e40c	Code cleanup of Backpacks module	2015-08-13 21:56:02 +02:00
PabstMirror	a7ad6dafc9	Remove PFEH hack	2015-08-13 14:09:25 -05:00
PabstMirror	4f0dab23b8	Nametag category	2015-08-13 13:27:24 -05:00
PabstMirror	763f793d0e	Localize Catagoires in loadSettingsLocalizedText ... Minor, but allows us to use CSTRINGS in configs for consistancy	2015-08-13 13:20:37 -05:00
IngoKauffmann	7d75f9cd2c	Initial draft	2015-08-13 19:33:55 +02:00
PabstMirror	6ca3761710	AddAction basic param checking	2015-08-13 11:54:26 -05:00
PabstMirror	cfaf046e29	CheckPBO Fix endless waitUntil if checkAll is false	2015-08-13 00:31:29 -05:00
PabstMirror	3425913d27	#2132 - Don't use depreciated Helicopter_F	2015-08-12 23:32:57 -05:00
PabstMirror	b94cb3b85d	#2129 - Don't draw nametags when escape menu is open	2015-08-12 16:14:12 -05:00
jonpas	936e6868bc	Added README.md to viewdistance and Arkhir to AUTHORS.txt	2015-08-12 22:34:16 +02:00
jonpas	e46bd16df0	More cleaning to ACE_Settings in viewdistance	2015-08-12 22:20:07 +02:00
jonpas	b1408af43a	Mk 1 eyeballs integration	2015-08-12 22:09:59 +02:00
jonpas	47fbe9bca5	Changed postInit to clientInit	2015-08-12 20:18:23 +02:00
jonpas	e20811c0f2	Cleaned up headers, newlines in viewdistance	2015-08-12 20:16:01 +02:00
bux578	3b3d99fd60	fix gienkov's stuff	2015-08-12 18:46:56 +02:00
bux	3dc53ec492	replace <Original> with <English>	2015-08-12 10:25:37 +02:00
Michael Braun	58b697e292	Fixed missing space invalidating some xml parsers.	2015-08-12 10:06:45 +02:00
Glowbal	0080335617	Added config attributes for cargo on wheel and tracks	2015-08-11 23:21:44 +02:00
Glowbal	aadddaa2c5	Added wheel as initial cargo when cargo module is enabled	2015-08-11 23:20:25 +02:00
Glowbal	abc732ac35	Added support for cargo configuration on vehicle spawn	2015-08-11 23:18:01 +02:00
Glowbal	c7b7418ae0	Removed "can only remove damaged wheels"	2015-08-11 21:42:20 +02:00
Glowbal	b45aa51d47	hacked approach for repair tracks. ... Could probably better go with config entries, but this seems to be a very good value for 90% of the vanilla tracked vehicles. It's also still easily accessible and on an acceptable place for the remaining vehicles.	2015-08-11 21:35:13 +02:00
Glowbal	660f8debf6	Merge branch 'master' into repair	2015-08-11 21:09:44 +02:00
Glowbal	17115b8846	test switch to adv medical handleDamage	2015-08-11 20:58:00 +02:00
voiper	f676f605f3	Fix 00000101.	2015-08-11 11:18:54 -07:00
voiper	f5b6eb5ca9	Git fix Nummer 5.	2015-08-11 11:14:32 -07:00
voiper	4aa28368ad	Git fix numero 5.	2015-08-11 11:10:42 -07:00
voiper	8230dbd272	Git fix #4.	2015-08-11 11:08:01 -07:00
voiper	2d101d064e	Git fix #3.	2015-08-11 10:59:50 -07:00
voiper	e0ed81dc67	Git fix #2.	2015-08-11 10:59:21 -07:00
voiper	2144a56be1	Fix attempt.	2015-08-11 10:49:39 -07:00
Michael Braun	4babfa0bf8	Fixed missing return value description in safemode module	2015-08-11 17:56:46 +02:00
Michael Braun	42e7340b79	Code cleanup of Safemode module	2015-08-11 16:50:05 +02:00
SilentSpike	95aa9f604b	Fix manual pre-setting of spectator camera unit ... If the spectator camera unit was set before the camera had ever opened then the unit list wouldn't be populated and as such the camera would automatically abort to free mode since the unit wasn't available to spectate. So now I'm running the updateUnits function before opening the camera to pre-populate the list.	2015-08-11 13:53:55 +01:00
PabstMirror	a908863317	Use proper lnbXXX commands	2015-08-11 04:15:55 -05:00
PabstMirror	bdca10eac4	Close Client Settings When open Server Settings	2015-08-11 01:38:31 -05:00
PabstMirror	4cce799ace	#2045 - Push SDV sub, cleanup push	2015-08-10 22:08:13 -05:00
PabstMirror	2565a80a22	#2098 - Option Menu Fixes for categories ... Use lbValue to store the index of the filtered selection	2015-08-10 17:19:30 -05:00
Glowbal	f1eed825f6	Moved models to APL folder	2015-08-10 23:54:45 +02:00
Glowbal	800b254004	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2015-08-10 23:48:07 +02:00
Glowbal	ffa476bee2	Improved action display text	2015-08-10 23:16:58 +02:00
Glowbal	c016d01414	Initial load in cargo module	2015-08-10 23:07:47 +02:00
PabstMirror	4377bbeb75	Delete unused file	2015-08-10 15:26:44 -05:00
PabstMirror	512011a756	Remove Debug Code	2015-08-10 15:16:16 -05:00
PabstMirror	47b18b2b39	Cleanup disposables also fix #2090 (alt add for AI)	2015-08-10 15:12:42 -05:00
Michael Braun	a315596c5a	Fixed isValidColorArray returning true when array had the right size, but wrong datatypes/value ranges	2015-08-10 20:32:26 +02:00
Michael Braun	3e82391a36	Added validation and various fixes	2015-08-10 19:04:49 +02:00
Glowbal	27a57d89f8	Merge branch 'master' into cargo	2015-08-10 17:59:19 +02:00
Michael Braun	5287455c0b	Fixed aborting data transmission on no owner id encounter	2015-08-10 17:07:01 +02:00
Michael Braun	5e4316d0e2	Fixed missing semi-colon	2015-08-10 16:43:33 +02:00
Michael Braun	5788705821	Fixed code style issues and added missing variable initialization in map_gestures	2015-08-10 15:24:57 +02:00
Michael Braun	b1d3654a97	Fixed owner id not getting assigned in map gestures	2015-08-10 14:54:28 +02:00
Glowbal	e5eaefafdb	fixed #2097 - script error because of global variable in params	2015-08-10 09:51:14 +02:00
Michael Braun	90e4d005ee	Give credit where credit is due	2015-08-10 08:45:43 +02:00
Michael Braun	a38cdda8e3	First iteration on implementing Dslyecxi's ST Map Gestures	2015-08-10 04:40:30 +02:00
jokoho48	f3fbf0c5ff	Code cleanup of Finger module is Incomming.	2015-08-10 00:19:27 +02:00
Glowbal	0c2c71e70e	Merge pull request #2056 from MikeMatrix/codeCleanupSandbag ... Code cleanup of Sandbag module	2015-08-09 23:56:25 +02:00
jokoho48	5db5e34edf	Fix Git Shit	2015-08-09 23:50:02 +02:00
gienkov	1c537c6739	fix captives again	2015-08-09 23:04:16 +02:00
gienkov	0914193e14	fix captives module	2015-08-09 22:45:01 +02:00
jokoho48	a3fd072328	Make New Model	2015-08-09 22:44:39 +02:00
gienkov	be787883f2	captives translation	2015-08-09 22:38:34 +02:00
gienkov	49668a25f8	Merge remote-tracking branch 'origin/master' into pl-translation-5	2015-08-09 22:36:41 +02:00
SilentSpike	c30cb45bd6	Optimize spectator UI held key prevention system	2015-08-09 20:59:57 +01:00
PabstMirror	dc06927418	missing ;	2015-08-09 13:57:39 -05:00
PabstMirror	b57ca91f69	Merge branch 'master' into virtualExplosivesPlace	2015-08-09 13:45:51 -05:00
PabstMirror	6755b8766a	Merge pull request #2085 from jokoho48/codeCleanupDisposable ... Code cleanup of Disposable module	2015-08-09 13:24:18 -05:00
Glowbal	9c8a03b0b3	fixes #2070 - medication is not translated on activity log	2015-08-09 20:12:31 +02:00
Glowbal	aa4840d860	fixes #2075 - menu doesn't show which bodypart is selected on Basic medical	2015-08-09 20:08:45 +02:00
Glowbal	298f64a7bf	fixes #2078 ... 1. Fixed incorrect activity string for tourniquet 2. Fixed incorrect macro usage, should have grabbed variables from medical module.	2015-08-09 20:07:06 +02:00
PabstMirror	207c002f3a	params	2015-08-09 13:02:08 -05:00
PabstMirror	5723c5eaac	Merge branch 'master' into addMainAction	2015-08-09 13:00:56 -05:00
jokoho48	fb56517099	Merge branch 'master' of https://github.com/acemod/ACE3 into repair	2015-08-09 18:58:02 +02:00
Glowbal	e4abf7c8cc	added spare wheel to config	2015-08-09 18:26:49 +02:00
Glowbal	ed6a53a402	Attempt at repairing tracks. Improved repair wheel actions	2015-08-09 18:08:53 +02:00
Glowbal	872d026cd0	All repair actions are now functional	2015-08-09 17:23:32 +02:00
Glowbal	9adbb07367	Moved replace and repair wheel actions into the repair action framework	2015-08-09 15:53:52 +02:00
jokoho48	fab0eee5dd	corrected some small point	2015-08-09 15:28:11 +02:00
jokoho48	79cf8dd98e	Fixing Some Spelling ... Remove Some forgotten Commands	2015-08-09 15:20:50 +02:00
jokoho48	323832474f	Code cleanup of Dragging module	2015-08-09 14:53:13 +02:00
Glowbal	3cac137851	Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-09 09:14:42 +02:00
Glowbal	58fc69c2a6	Updated litter configuration. Closes #2002	2015-08-09 08:59:04 +02:00
PabstMirror	ec97cd2edd	Fix wheel texture	2015-08-09 01:58:49 -05:00
PabstMirror	4b603ff46f	Localization, params	2015-08-09 01:54:44 -05:00
PabstMirror	0e17bebd23	Merge branch 'master' into repair	2015-08-09 00:33:08 -05:00
jokoho48	b23f9c0de2	Code cleanup of Disposable module	2015-08-09 05:25:19 +02:00
jokoho48	156609aab2	Code cleanup of Disarming module	2015-08-09 05:18:26 +02:00
PabstMirror	7624a459eb	Merge pull request #2010 from jokoho48/codeCleanupInteractMenu ... Code cleanup Interact_menu module	2015-08-08 21:35:54 -05:00
PabstMirror	95d88b920e	#2079 - RemoveTourniquet doesn't require any items	2015-08-08 21:25:36 -05:00
PabstMirror	5628ce1bcd	#2074 - Medical Menu Module not unique	2015-08-08 20:27:56 -05:00
PabstMirror	879826de8b	Merge pull request #2077 from jonpas/fixNametagsString ... Fixed incorrect string path in nametags	2015-08-08 19:58:52 -05:00
PabstMirror	c949daae1f	OptionMenu C->LStrings	2015-08-08 19:57:57 -05:00
jokoho48	bd1a6d14a8	Code cleanup of Dagr module	2015-08-09 02:33:00 +02:00
jokoho48	7bdfe03c92	Code cleanup of Concertina_wire module	2015-08-09 02:19:34 +02:00
gienkov	ce99404200	move english strings from original to english, remove original	2015-08-09 01:52:22 +02:00
gienkov	1c0a6fb457	PL translation of common, medical_menu, optionsmenu	2015-08-09 01:47:55 +02:00
jonpas	7d36d80072	Fixed incorrect string path in nametags	2015-08-09 01:23:20 +02:00
Glowbal	2b3c936e99	count should be a foreach	2015-08-09 00:41:43 +02:00
Glowbal	c7ac190f58	Finalized settings	2015-08-09 00:21:59 +02:00
gienkov	6bd4fcc4fd	Fix stringtable error	2015-08-08 23:39:29 +02:00
Glowbal	54ad9d1444	Merge branch 'master' into require-surrender-captive	2015-08-08 23:21:00 +02:00
Glowbal	493254619c	Merge pull request #2039 from acemod/medical-menu ... Medical menu	2015-08-08 23:11:11 +02:00
Glowbal	f02a00ae69	Merge pull request #2058 from acemod/add-category-optionsmenu ... Add category optionsmenu #852	2015-08-08 22:59:19 +02:00
SilentSpike	416d559354	Expand common isFeatureCameraActive function ... The function is currently only used by ace_goggles and it makes sense to expand it to detect if any common feature camera is active rather than just BI cameras	2015-08-08 20:51:24 +01:00
PabstMirror	a6acff9178	Setting to disable hearing for zeus RC	2015-08-08 14:40:19 -05:00
PabstMirror	d5a3c66b89	Minor Spelllings Fixes	2015-08-08 14:17:03 -05:00
Glowbal	c0562aaf6c	clean up debug messages	2015-08-08 20:31:19 +02:00
Glowbal	696546de5c	Finalized ACE medical menu settings	2015-08-08 20:22:19 +02:00
SilentSpike	d294989cb0	Allow chat use on input disabled listen server ... Listen server technically doesn't have serverCommandAvailable.	2015-08-08 19:11:41 +01:00
SilentSpike	182eef39de	Adjust spectator camera pan and tilt with zoom	2015-08-08 18:41:38 +01:00
PabstMirror	c6be0bbb8c	Merge branch 'master' into add-category-optionsmenu ... Conflicts: addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf	2015-08-08 12:39:14 -05:00
PabstMirror	feceff2746	Polish the stringtable	2015-08-08 12:36:42 -05:00
SilentSpike	213deeffb4	Add keys to adjust spectator camera speed and zoom ... Allows for finer control of the speed and zoom, as well as a quick way to reset either.	2015-08-08 18:31:37 +01:00
PabstMirror	0719a3c1c6	Merge pull request #2055 from MikeMatrix/codeCleanupScopes ... Code cleanup Scopes module	2015-08-08 11:42:40 -05:00
Glowbal	4c7bcbb6fe	Added triage card display	2015-08-08 18:29:30 +02:00
SilentSpike	d7730103c9	Update ace_spectator readme	2015-08-08 17:22:04 +01:00
PabstMirror	7fe6c2fe1b	Merge pull request #2063 from jonpas/fixMissingString ... Fixed missing string	2015-08-08 11:19:27 -05:00
PabstMirror	8e905af444	Merge pull request #1977 from acemod/attachClickCooldown ... Mouse cooldown for click to interact option	2015-08-08 11:18:20 -05:00
Glowbal	31a5f8899b	Changed default keybinding value to be H	2015-08-08 18:16:25 +02:00
PabstMirror	451c88c601	Merge pull request #2027 from acemod/joinGroupTeamManagement ... EnableTeamManagement setting for joinGroup	2015-08-08 11:16:20 -05:00
Glowbal	bb79feeaf1	Clean up duplicate files	2015-08-08 18:16:11 +02:00
jonpas	8e3a961ee3	Fixed missing string	2015-08-08 18:11:28 +02:00
PabstMirror	7c7fb35cee	Merge pull request #2036 from acemod/mapToolsOnOtherMaps ... MapTools work on children of itemMap	2015-08-08 11:10:32 -05:00
Glowbal	054ac3443d	Merge pull request #2062 from jonpas/removeDuplicatedStrings ... Removed duplicated strings	2015-08-08 18:04:44 +02:00
jonpas	1aecd54fc3	Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common	2015-08-08 18:02:20 +02:00
Glowbal	364e0455ee	Merge branch 'master' into medical-menu	2015-08-08 17:55:43 +02:00
Glowbal	bd0593f8f4	fixed missing semi-column	2015-08-08 17:49:43 +02:00
Glowbal	12f0808784	Merge branch 'master' into hearingRingingModule ... Conflicts: addons/common/stringtable.xml	2015-08-08 17:42:18 +02:00
Glowbal	c69aa09d55	Merge pull request #2054 from MikeMatrix/codeCleanupSitting ... Code cleanup of Sitting module	2015-08-08 17:00:07 +02:00
SilentSpike	be7b156c49	Add "focus on unit" to spectator free camera ... Pressing F will move the free camera to a position viewing the unit currently selected in the list. Fixes map teleporting functionality also.	2015-08-08 15:49:07 +01:00
Glowbal	9fc94eefd9	Merge pull request #2006 from jokoho48/codeCleanupWinddeflection ... Code cleanup Winddeflection module	2015-08-08 15:03:26 +02:00
Glowbal	a65495fb14	Merge pull request #2011 from jokoho48/codeCleanupBallistic ... Code cleanup Ballistics module.	2015-08-08 15:00:08 +02:00
Glowbal	ff421db3df	Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication ... Headdirection based wind indication	2015-08-08 14:51:37 +02:00
Glowbal	66f2dfa31e	Merge pull request #2059 from MikeMatrix/documentationFixWeaponselect ... Updated function documentation of Weaponselect	2015-08-08 14:45:28 +02:00
Michael Braun	e4a4a942d0	Updated function documentation of Weaponselect	2015-08-08 14:40:23 +02:00
Glowbal	65c06551a5	Merge pull request #1652 from gienkov/patch-22 ... Fix checking vitals anim	2015-08-08 14:32:36 +02:00
SilentSpike	5b881224c5	Allow admins to use chat in the spectator UI	2015-08-08 13:31:10 +01:00
Glowbal	d8d706eb04	Merge pull request #1974 from jokoho48/parachutePrivateScope ... Fix that Reserve Parachute can get in Arsenal or in Crate	2015-08-08 14:25:40 +02:00
Glowbal	be00f7ffe4	Merge pull request #2000 from acemod/treatmentResetWeaponMode ... Treatment reset weapon mode	2015-08-08 14:20:10 +02:00
Glowbal	94be0d9fbd	Merge pull request #2008 from jokoho48/codeCleanupViewdistance ... Code cleanup Viewdistance module	2015-08-08 14:18:45 +02:00
Glowbal	e8961e3d0e	Use display instead of just idc	2015-08-08 13:41:25 +02:00
Michael Braun	9c29ff0c57	Inlined PFHs in Switchunits	2015-08-08 13:34:35 +02:00
SilentSpike	e59f0ce822	Fix spectator respawn template for types 0 and 1 ... Type 0 worked, but the mission didn't end when all players were killed. Type 1 didn't work because isPlayer isn't true for seagulls. So spectator virtual state is now entirely unassociated from objects in the game.	2015-08-08 12:33:34 +01:00
Glowbal	13f7d0f632	Merge pull request #2003 from jokoho48/codeCleanupWeaponselect ... Code cleanup Weaponselect module	2015-08-08 13:32:45 +02:00
Glowbal	872c257901	Used the wrong string macro.	2015-08-08 13:21:13 +02:00
Glowbal	25597704ed	Added fail save for incorrect string value input	2015-08-08 13:07:40 +02:00
Glowbal	e7a607ca35	Finalized server export category select	2015-08-08 13:07:22 +02:00
jonpas	12399db0ac	Merge branch 'master' into slideshowFixes ... Conflicts: addons/slideshow/functions/fnc_createSlideshow.sqf	2015-08-08 13:00:11 +02:00
Glowbal	c6af8aaeb6	Localized category name for interaction menu related settings	2015-08-08 11:52:53 +02:00
Glowbal	e9151d921c	Localized category names for medical settings	2015-08-08 11:52:37 +02:00
Glowbal	0601aa80bb	Localized All categories string ... Enabled categories for config export menu	2015-08-08 11:52:23 +02:00
Glowbal	38b9fdab4d	fixes #1948	2015-08-08 11:51:31 +02:00
Michael Braun	2b56b919db	Fixed missing private in Switchunits	2015-08-08 11:28:08 +02:00
Michael Braun	680bbebc02	Fixed missing private in scopes	2015-08-08 11:25:45 +02:00
Glowbal	b798058ef8	Merge pull request #2032 from acemod/unloadVehicleBug ... isTouchingGround is unreliable for ground vehicles	2015-08-08 11:04:09 +02:00
Glowbal	831af1bbf8	Merge pull request #2043 from MikeMatrix/keybindCategoryLocalization ... Added localizations for keybinding categories	2015-08-08 10:59:34 +02:00
Glowbal	7c24d9dbad	Merge pull request #2057 from jonpas/sittingFixes ... Sitting Fixes	2015-08-08 10:58:47 +02:00
Glowbal	2951c9a965	Merge pull request #2046 from MikeMatrix/codeCleanupTripod ... Code cleanup in Tripod module	2015-08-08 10:58:01 +02:00
Glowbal	02bffce4c4	Merge pull request #2047 from MikeMatrix/codeCleanupTacticalladder ... Code cleanup in Tacticalladder module	2015-08-08 10:57:13 +02:00
Glowbal	df0e13b21c	Merge pull request #2050 from MikeMatrix/codeCleanupSpottingscope ... Cleanup code of Spottingscope module	2015-08-08 10:52:50 +02:00
Glowbal	6b256a604c	Merge pull request #2051 from MikeMatrix/codeCleanupSlideshow ... Code cleanup of Slideshow module	2015-08-08 10:52:08 +02:00
Michael Braun	940cd8e921	Small documentation correction in sandbag module	2015-08-08 02:28:27 +02:00
jonpas	52ac13273c	Fixed #1937 - Made use of CfgMoves to make free-look head movement visible, Fixed grenade throwing while sitting	2015-08-08 02:13:14 +02:00
Michael Braun	d1a2bec7fd	Code cleanup of sandbag module	2015-08-08 02:00:00 +02:00
Michael Braun	8355558db1	Small readability improvement in slideshow	2015-08-08 01:18:48 +02:00
PabstMirror	a3a481f96d	Some fixes	2015-08-07 15:08:52 -05:00
jonpas	9e64e8c2aa	Increased sitting interaction distance - fixes #1950	2015-08-07 21:41:07 +02:00
Glowbal	d125b9ad9c	Add category to options menu. Initial work.	2015-08-07 21:14:45 +02:00
PabstMirror	a9ed1052dd	vehLock - debug trace / type checking	2015-08-07 13:24:47 -05:00
Glowbal	cd5b5f1d24	clean up of the config	2015-08-07 20:15:09 +02:00
PabstMirror	50adc7c096	Merge pull request #2004 from jokoho48/codeCleanupVehiclelock ... Code cleanup Vehiclelock module	2015-08-07 13:01:56 -05:00
SilentSpike	57bda372f0	Adjust spectator free camera speed with zoom	2015-08-07 19:00:31 +01:00
SilentSpike	c5d9ec5d50	Add speed boost button to spectator free camera ... Sometimes you just want a burst of speed rather than to adjust it and then adjust it back. Also swapped the speed/zoom scrolling modifier around.	2015-08-07 18:59:48 +01:00
jonpas	256536467b	Fixed no interaction menu support condition	2015-08-07 19:36:10 +02:00
Glowbal	f21023b4ee	Added logs for quick view and activity view separate from the activity log for medical menu	2015-08-07 19:11:57 +02:00
Glowbal	d7db2e159c	Split up into activity and quick view logs	2015-08-07 19:11:27 +02:00
Glowbal	471e8d27df	Fixed clean up	2015-08-07 19:11:10 +02:00
Michael Braun	fb32bbf8de	Code cleanup of scopes module	2015-08-07 16:43:06 +02:00
SilentSpike	1c79c8fa45	Update spectator UI styling ... Adds a title to the unit tree to match the help list and enters the title text.	2015-08-07 15:15:04 +01:00
Glowbal	f21da3ead6	Merge pull request #2026 from acemod/cleanBandages ... Clean bandages if no damage on hitpoint	2015-08-07 15:46:44 +02:00
Michael Braun	1cec4400b3	Missing count replacement in slideshow module	2015-08-07 15:44:41 +02:00
Michael Braun	d192f7eea4	Added parentheses back	2015-08-07 15:35:52 +02:00
Michael Braun	b2e7cf04c0	Fixed function argument documentation in slideshow	2015-08-07 15:19:59 +02:00
Michael Braun	60e4c2e601	Code cleanup of sitting module	2015-08-07 15:12:24 +02:00
Glowbal	27ec3adeac	Added stringtable entries requireSurrender setting	2015-08-07 14:51:56 +02:00
Glowbal	997ac53c11	Added isSurrendering check	2015-08-07 14:49:01 +02:00
Glowbal	4c935bb504	Added setting for require surrender	2015-08-07 14:46:28 +02:00
SilentSpike	702e50b731	Improve spectator UI respawn counter blending ... When the BI respawn counter is blended with the spectator UI its colours are also updated to match	2015-08-07 12:30:50 +01:00
SilentSpike	f143db7fc0	Draw player names on spectator map	2015-08-07 12:20:39 +01:00
Michael Braun	7839224aa2	Added Polish Keybind Category translations thanks to @gienkov	2015-08-07 13:01:36 +02:00
Michael Braun	da97472600	Added ace specific logging methods	2015-08-07 12:56:10 +02:00
Michael Braun	fa56196fe3	Code cleanup of slideshow module	2015-08-07 12:11:34 +02:00
Michael Braun	2f5f282431	Cleanup code of Spottingscope module	2015-08-07 11:47:23 +02:00
Michael Braun	a330e7b0c5	Code cleanup of Switchunits module	2015-08-07 09:18:42 +02:00
Michael Braun	0fafe27da9	Code cleanup in Tacticalladder module	2015-08-07 08:19:15 +02:00
Michael Braun	ef01660ab3	Code cleanup in Tripod module	2015-08-07 08:07:10 +02:00
Michael Braun	c6cb18749d	Fixed translation typo	2015-08-07 05:51:26 +02:00
Michael Braun	d9eb7a3d2c	Added localizations for keybinding categories	2015-08-07 05:48:51 +02:00
Michael Braun	5f313c75d5	Cleanup of medical_menu	2015-08-07 05:37:41 +02:00
SilentSpike	485f9438bb	Change spectator UI toggle to include help window ... With new layout of help window the toggle UX also changes. User expects help window to toggle as part of overall UI.	2015-08-07 01:51:46 +01:00
SilentSpike	043c5c47c5	Improve spectator help window layout ... Having the help window in the centre of the screen blocked too much of the users view and also clashed with the MPTable element (the table that appears on death, aka "respawnDialog"). It was moved to the right of the screen and now mirrors the unit list. To save screen space, the action keys are given as tooltips for the listbox entries so users must mouse over for more info.	2015-08-07 01:44:32 +01:00
SilentSpike	f59536b5a3	Remove legacy spectator settings module argument	2015-08-07 00:28:54 +01:00
SilentSpike	4c9b6e94cf	Overhaul and improve spectator unit tree UX ... The old method of refreshing the tree on each update would reset all expanded/collapsed nodes. Now the code will cull any units/groups/sides no longer spectatable from the list and cache the ones that are still valid. The cached data is then used to populate the list with new units. Add coloured unit icons beside units in the list for quick user reference of side and type. Store group netIDs in respective nodes for possible use in code.	2015-08-07 00:06:22 +01:00
jonpas	8b802006a4	Moved no interaction menu support inside the function, made code run selectively on server/clients, fixes #2037, closes #1945	2015-08-07 00:32:12 +02:00
Glowbal	abaf43be11	Selection restrictions	2015-08-07 00:09:40 +02:00
Glowbal	9b380315e5	First working version of the medical menu	2015-08-06 23:51:17 +02:00
Glowbal	5ac2972573	Added local event upon successful treatment.	2015-08-06 23:50:44 +02:00
Glowbal	4b5632a8f6	Added categories and missing displayName entries	2015-08-06 23:50:23 +02:00
jonpas	2e386038b7	Added support without ace_intract_menu	2015-08-06 23:43:18 +02:00
PabstMirror	016f45f0e8	fix speling	2015-08-06 15:41:24 -05:00
PabstMirror	598c1766d8	Merge pull request #2017 from jokoho48/codeCleanupCaptives ... Code cleanup of the Captives module.	2015-08-06 14:02:50 -05:00
PabstMirror	7ef13cd546	Merge pull request #2009 from jokoho48/codeCleanupVehicle ... Code cleanup Vehicle module	2015-08-06 13:24:35 -05:00
PabstMirror	f1d44972c9	Attach fix and param trace	2015-08-06 13:17:59 -05:00
PabstMirror	b5a6e1e883	Merge pull request #2013 from jokoho48/codeCleanupAttach ... Code cleanup of the Attach module.	2015-08-06 12:50:43 -05:00
PabstMirror	6086553fce	Move DoNotForce to common	2015-08-06 12:24:56 -05:00
PabstMirror	d8c36663da	#2033 - MapTools work on children of itemMap	2015-08-06 12:14:45 -05:00
SilentSpike	bcb21b782e	Overhaul spectator icon handling and rendering ... - Optimize and improve 3D icon drawing - Combine 2D and 3D PFHs into 1 - Render group icons outside of 200m, unit icons within - Store list of groups on units update to cut down on what needs to be done each frame - Change map control type to 100 to remove all default unit icons - Improve colour caching, group colours don't change, unit colours do - Remove icon setting, toggling should be at users discretion	2015-08-06 16:03:32 +01:00
jokoho48	87b9b5019c	AB Performance Optimization (Part 8)	2015-08-06 13:35:55 +02:00
SilentSpike	92ef0bfe99	Whitelist spectator free camera boom keys ... Now that booming the free camera is influenced by the camera speed, the keys should be whitelisted from the held-key prevention system to allow the speed to be adjusted on the move. Also includes a failed attempt to fix the free camera map teleporting functionality.	2015-08-06 11:39:32 +01:00
jokoho48	15a1a0d535	AB Performance Optimization (Part 7)	2015-08-06 10:58:07 +02:00
PabstMirror	e45bd43e5e	CreateLitter / syncEvents performance fixes	2015-08-06 00:28:43 -05:00
SilentSpike	d6cc14a39d	Add zeus support to spectator UI ... Can only use zeus while alive, so it won't work using the respawn template. However it's useful for communities usign custom frameworks	2015-08-06 00:53:49 +01:00
SilentSpike	d1975a593d	Improve spectator pause menu emulation ... Makes the fake pause menu closer to the real thing for UX purposes	2015-08-06 00:53:48 +01:00
PabstMirror	0bd1e1afce	#2024 - EnableTeamManagement setting for joinGroup	2015-08-05 18:02:57 -05:00
Michael Braun	d16a33bee4	Fixed issue with params being incorrectly being parsed in Weaponselect	2015-08-06 00:36:28 +02:00
PabstMirror	6ab72e905c	#1807 - Clean bandages if no damage on hitpoint	2015-08-05 17:32:00 -05:00
SilentSpike	c808021c7c	Tweak spectator interface layout ... - Swap the FOV and vision mode tools into a more logical order. - Shorten the unit list to prevent overlay with main UI - Fix name tool on dead units	2015-08-05 21:11:39 +01:00
SilentSpike	42b5abae11	Add support for respawn counter to spectator UI ... Rather than hiding the BI respawn counter, it should be "integrated" into the UI via code if present.	2015-08-05 20:35:48 +01:00
ViperMaul	d3d3ea756d	isTouchingGround is unreliable for ground vehicles ... #2020	2015-08-05 11:48:04 -07:00
PabstMirror	7203bb2a3d	Cleanup Debug, Limit Satchel Mass	2015-08-05 12:22:43 -05:00
PabstMirror	a6292db1e8	#2018 - Dead Mans Switch / unconscious	2015-08-05 11:54:45 -05:00
jokoho48	0ab865171d	AB Performance Optimization (Part 6) ... Add some todo comments	2015-08-05 18:50:37 +02:00
PabstMirror	72273c5ad0	Merge branch 'master' into virtualExplosivesPlace	2015-08-05 11:36:58 -05:00
jokoho48	c4e4f184ff	AB Performance Optimization (Part 5)	2015-08-05 18:33:28 +02:00
SilentSpike	5200fd6a02	Add new option to spectator unit filter setting ... Adds an option to use playableUnits for scenarios where AI playable units are enabled.	2015-08-05 14:55:02 +01:00
SilentSpike	07e09b60fa	Stop spectator camera unit changing on corpses ... Previously the camera would be automatically moved away from corpses (when the unit currently being watched dies). This changes it to stay on them until the view is manually switched as users might want to stick around and watch whatever was going on at the time of death.	2015-08-05 14:55:02 +01:00
Grzegorz	fb072811fc	Proper PL concertina wire translation	2015-08-05 14:49:20 +02:00
SilentSpike	d2f7913c9f	Merge pull request #2005 from jokoho48/codeCleanupZeus ... Code cleanup Zeus module	2015-08-05 12:38:02 +01:00
Michael Braun	9eb560ff3d	AB Performance Optimization (Part 4)	2015-08-05 10:28:02 +02:00
Michael Braun	8fbcdfec5a	Fixed missing bracket and parameter list issue in AB	2015-08-05 10:04:24 +02:00
Michael Braun	1b488a17b5	Fixed typo that slipped into the code	2015-08-05 08:36:01 +02:00
ViperMaul	78d4da85cd	Updated version to 3.2.2	2015-08-04 21:36:03 -07:00
Michael Braun	441baf3f86	Fixed documentation typo in Vehicles module	2015-08-05 06:02:21 +02:00
Michael Braun	eca7f83cca	AB Performance Optimization (Part 3)	2015-08-05 06:01:38 +02:00
Michael Braun	b8f1fa82ae	AB Performance Optimization (Part 2)	2015-08-05 05:19:08 +02:00
Michael Braun	f6bc361734	Minimal performance improvement and fixed missing semicolon	2015-08-05 05:04:34 +02:00
Michael Braun	6b58b0b3bd	AB Performance Optimization and documentation cleanup	2015-08-05 05:01:30 +02:00
jokoho48	c7e104437f	Update Docu Comments in AB	2015-08-05 04:38:04 +02:00
jokoho48	12aa0b5584	revert Merge Issue	2015-08-05 04:27:11 +02:00
jokoho48	d95bc3c299	AB Performance Optimization (Part 1)	2015-08-05 04:13:36 +02:00
jokoho48	3a2963c252	Fixed mission semicolon	2015-08-05 02:09:51 +02:00
Michael Braun	83e13e3cd3	Fixed non-private function and slightly improved performance	2015-08-05 01:53:11 +02:00
jokoho48	24dd320c3c	Updated parameterization in Captives module.	2015-08-05 01:15:20 +02:00
jokoho48	469445a030	Updated parameterization in Ballistics module.	2015-08-05 01:14:03 +02:00
jokoho48	57d484d382	Updated parameterization in Backpack module.	2015-08-05 01:12:55 +02:00
jokoho48	3ea545782f	Updated parameterization in Attach module.	2015-08-05 00:47:31 +02:00
Michael Braun	77e62946ae	Updated parameterization in Interact_menu module.	2015-08-05 00:47:18 +02:00
jokoho48	7a0a1ead6e	Updated parameterization in Advanced Ballistics module.	2015-08-05 00:32:48 +02:00
SilentSpike	1b12d37284	Replace spectator respawn changes with a template ... Hacking the BI respawn framework to support a spectator setting was intrusive and limiting. Instead of using a setting, I've opted to introduce a new respawn template that can be used within BI's respawn framework. The benefits of this approach are: - Compatibility isn't a concern, that responsibility is shifted onto mission designers. - Mission designers can use the functionality of the BI framework alongside the spectator system (combining templates, using different templates for different sides, etc.). - If a custom respawn framework is used, then this doesn't change anything. Custom frameworks are still fully supported via the public functions provided. - Remains simple to set up, just requires a description.ext edit	2015-08-04 23:21:10 +01:00
Michael Braun	1b7f7534da	Small correction	2015-08-05 00:16:23 +02:00
Michael Braun	95f055f5a4	Small correction	2015-08-05 00:14:50 +02:00
Michael Braun	820d1c50a5	Small correction	2015-08-05 00:13:50 +02:00
Michael Braun	13b7e7ae72	Updated parameterization in Zeus module.	2015-08-05 00:10:54 +02:00
Michael Braun	b1f9e17ab0	Updated parameterization in Weather module.	2015-08-05 00:03:15 +02:00
Michael Braun	f5a497332a	Updated parameterization in Winddeflection module.	2015-08-04 23:52:16 +02:00
Michael Braun	d51d87ba2c	Updated parameterization in Weaponselect module.	2015-08-04 23:35:47 +02:00
Michael Braun	ade6c99dac	Updated parameterization in Viewdistance module.	2015-08-04 23:33:03 +02:00
Michael Braun	84be21c64e	Updated parameterization in Vehicle module.	2015-08-04 23:30:51 +02:00
Michael Braun	2423798753	Updated parameterization in Vehiclelock module.	2015-08-04 23:18:29 +02:00
SilentSpike	7e9500f2ca	Enable ace_spectator respawn framework integration ... Seamlessly integrates the spectator system with the vanilla respawn framework when the onDeath setting is enabled. This commit makes a lot of changes: - Edit BI functions used by the vanilla respawn framework to enable support for ace_spectator. - Set spectator state is now tracked using a GVAR for the local player since using a unit won't be reliable all of the time. However unit is still marked for any filtering purposes. - Instead of NV being used based on the sun to moon transition state by default, that functionality only takes place in the integrated system so that custom frameworks can do what they want. - Seagull units are hidden when using framework integration since they're spawned by the engine with respawn type 1 and they just hang around undesirably	2015-08-04 22:03:46 +01:00
Glowbal	275b0c4300	Merge branch 'release' ... Conflicts: README.md addons/finger/stringtable.xml	2015-08-04 22:29:05 +02:00
Glowbal	43f8c87387	Merge pull request #1972 from jokoho48/MedicalModelUpdate ... Medical Litter model update	2015-08-04 20:06:51 +02:00
ViperMaul	8ac98ed950	Better immersion through using hideUnit	2015-08-04 07:43:42 -07:00
PabstMirror	b3741f4036	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
PabstMirror	710135ae3f	Opps	2015-08-03 21:49:16 -05:00
PabstMirror	fa49842c53	#1866 - Restore weapon mode after treatment	2015-08-03 19:57:49 -05:00
PabstMirror	52130d5a45	Switch to some already translated CSTRINGs	2015-08-03 15:52:35 -05:00
PabstMirror	98649e2bdf	Additional output to dumpPerformanceCounters ... For `[] call ace_common_fnc_dumpPerformanceCounters` Requires `#define ENABLE_PERFORMANCE_COUNTERS`	2015-08-03 13:53:44 -05:00
SilentSpike	5bfa4e5971	Improve spectator camera vision mode on start ... The spectator camera should start in night vision mode if the sun to moon transition state is appropriate	2015-08-03 15:18:09 +01:00
SilentSpike	17e6aca0c8	Fix ace_map changes to compass display object ... 1. RscDisplayDiary doesn't even have a compass object that needs to be changed 2. The briefing displays (RscDisplayGetReady, RscDisplayClientGetReady, RscDisplayServerGetReady) were all inheriting from base class RscDisplayMainMap and re-defined the compass object subclasses was overriding that subclass inheritance chain (producing missing idc errors in the .rpt).	2015-08-03 13:30:08 +01:00
SilentSpike	f5e7185aec	Fix spectator camera exiting mechanism ... When using ACE_Player the camera would return to the dead body. It makes sense to simply pass the reset unit by reference to the camera exit code.	2015-08-03 13:04:36 +01:00
SilentSpike	98b088f26f	Fix pre-spectator position saving ... When staging a spectator (physically applying the spectator state) the unit position is saved for potential later restoration. This shouldn't be done multiple times since the function can be called again to reset staged units.	2015-08-03 00:24:36 +01:00
SilentSpike	b87b4ea16a	Improve spectator GUI reopening prevention ... Using boolean instead of simply checking for the display. Checking for diplay was unreliable since it can be technically closed while theoretically open during the escape menu and such.	2015-08-03 00:22:50 +01:00
PabstMirror	93d2035fed	#1984 - Always make sure ACE_MainActions exists ... Also add debuging output when adding action with no parent	2015-08-02 15:33:16 -05:00
ViperMaul	59a3e62d69	Attempt to improve the immersion of the magic	2015-08-02 10:44:49 -07:00
PabstMirror	f99e8ba5bc	Don't allow forcing the tinnitus effect	2015-08-02 12:30:35 -05:00
PabstMirror	c0fb2e1b65	Add Ear Ringing setting to module (Ref #1981)	2015-08-02 12:15:26 -05:00
SilentSpike	9b764bbba4	Preserve Polish translations from master branch ... Since spectator was pushed back to a feature branch from the release branch these translations from a PR were also lost (as the commits were prior to the removal commit) when it was merged after the fact.	2015-08-02 17:27:32 +01:00
SilentSpike	52460182c9	Enable spectator on death system ... New spectator on death system should enter spectator mode upon dying and exit upon respawning. Only virtual spectator state is suitable for this system since the body should remain as is.	2015-08-02 16:42:24 +01:00
KoffeinFlummi	261cd42202	Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge	2015-08-02 17:14:41 +02:00
KoffeinFlummi	8f848947ac	Merge https://github.com/Clon1998/ACE3 into german-merge	2015-08-02 17:11:06 +02:00
Glowbal	4dfef8025b	Medical menu port from CSE	2015-08-02 16:56:27 +02:00
SilentSpike	63c034e348	Differentiate between staged and set spectators ... Existing variable "ace_spectator_isSpectator" split into counterparts "ace_spectator_isSet" and "ace_spectator_isStaged" in order to better manage spectator events	2015-08-02 12:51:42 +01:00
SilentSpike	38e08d513a	Clear spectator display variable at preInit ... uiNamespace persists between missions and should be reset on mission start	2015-08-02 12:34:35 +01:00
PabstMirror	eb5ac22b8d	Cleanup	2015-08-02 01:05:28 -05:00
Michael Braun	f3e8a8ae42	Updated wind indicator to use head direction instead of player direction. Fixes #1892.	2015-08-02 03:29:53 +02:00
ViperMaul	876a039e36	Disable headbugfix for Handcuffed/Surrender,unconscious,water surface and log the situation locally and on server.	2015-08-01 18:01:35 -07:00
PabstMirror	5bcc867bac	#1785 - Handle option for all "deploy" actions	2015-08-01 18:26:38 -05:00
PabstMirror	c5a371e9b6	#1965 - Mouse cooldown for click to interact option	2015-08-01 15:07:09 -05:00
jokoho48	d0d585d0f5	Fix that Parachute can get in Arsenal or in Crate	2015-08-01 20:47:40 +02:00
SilentSpike	612aa2d679	Separate spectator physical and virtual states ... With the changes planned to allow spectator in the true death state, physical changes aren't applicable in all of the possible usage cases. This separates the physical process into new function ace_spectator_fnc_stageSpectator	2015-08-01 18:10:11 +01:00
Glowbal	19a4f3fbb1	Merge pull request #1954 from acemod/improve-adv-med-pain ... Improvement for handling minor levels of pain in advanced medical	2015-08-01 19:05:47 +02:00
jokoho48	ee11622cd5	Fix Position	2015-08-01 16:10:08 +02:00
jokoho48	9d8daf84a4	add New Medical Models	2015-08-01 15:46:25 +02:00
Harakhti	861119f22f	Sync rephrasing with upstream ... The humor wilts quickly.	2015-08-01 14:54:29 +02:00
SilentSpike	f6d8625fcb	Transfer zeus module fixes from master into hotfix	2015-08-01 12:55:33 +01:00
Glowbal	02cfbeda8c	Updated version to 3.2.1	2015-08-01 12:10:42 +02:00
Glowbal	b33d377b9d	Merge pull request #1940 from acemod/fixRemoveAction ... #1939 - Fix Remove Action From Class	2015-08-01 11:54:41 +02:00
PabstMirror	6ea1b95179	#1939 - Fix Remove Action From Class	2015-08-01 11:53:49 +02:00
bux578	1ad1a4b561	rename fingering to pointing	2015-08-01 11:49:28 +02:00
PabstMirror	fb34efdd04	Cleanup stringtable phrasing	2015-08-01 11:48:41 +02:00
Glowbal	a2eeff53a8	Merge pull request #1960 from acemod/laserHandleWeirdData ... Laser - Handle Bad Data Returns	2015-08-01 11:41:04 +02:00
Glowbal	1878d448ae	Merge pull request #1968 from acemod/fixBftModule321 ... Fix BFT Module / Settings (for 3.2.1)	2015-08-01 11:39:01 +02:00
PabstMirror	efb1f356db	Cleanup stringtable phrasing	2015-08-01 01:30:54 -05:00
PabstMirror	2d051188a7	#1957 - Fix BFT Module / Settings (for 3.2.1)	2015-08-01 00:01:33 -05:00
PabstMirror	1d82a3c193	#1962 - Fix Changes in Wind Deflection s in AB	2015-07-31 23:39:05 -05:00
SilentSpike	777d8f6d43	Merge branch 'master' into spectator ... Restores spectator that was removed from release branch	2015-07-31 23:35:45 +01:00
SilentSpike	33314f8a9e	Adjust spectator camera boom speed ... Vertical camera movement (boom) was previously at a constant speed. However this felt too slow at times, half the horizontal (dolly) speed should improve this.	2015-07-31 23:32:25 +01:00
SilentSpike	e147138274	Update setUnconscious module with to be indefinite ... The zeus toggle unconscious module was using the default value for minimum unconscious time when it should have been indefinite (to act as a toggle)	2015-07-31 17:32:13 +01:00
PabstMirror	822115214f	Laser - Handle Bad Data Returns	2015-07-31 03:06:27 -05:00
SzwedzikPL	eb6abd69b8	default laser code down keybind fix	2015-07-30 22:37:08 +02:00
Glowbal	ca2a16af02	fix #1946	2015-07-30 18:21:24 +02:00
Glowbal	a4d5d9cb27	Possible improvement for handling minor levels of pain in advanced medical	2015-07-30 17:43:52 +02:00
Harakhti	b2aa5eee45	Row 3 ... BINGO FUEL	2015-07-30 16:28:50 +02:00
Harakhti	2b23958fd1	Row 2 ... It gets tedious after a while, especially if your language lacks technical terms. That or my B2 language exam isn't good enough.	2015-07-30 16:06:32 +02:00
Harakhti	d0f91c5ebf	Row 1 ... Not a miracle, but it's something.	2015-07-30 14:40:51 +02:00
SilentSpike	67e5e31394	Change zeus modules to run globally ... Zeus modules were only running on the *server* rather than the local machine. This resulted in the variable used to cache the object zeus has its cursor over not existing and therefore the modules didn't work at all.	2015-07-29 12:25:04 +01:00
PabstMirror	6f90185f18	#1939 - Fix Remove Action From Class	2015-07-28 17:26:23 -05:00
ViperMaul	63dd19825b	moveInAny seems to work better than moveInDriver. WIP	2015-07-28 13:56:22 -07:00
PabstMirror	214fda074a	Merge branch 'master' into virtualExplosivesPlace	2015-07-28 15:48:37 -05:00
PabstMirror	bfd3aa71c4	Manual Fix #1931	2015-07-28 15:25:52 -05:00
ViperMaul	626a9cf5f9	Disable headBugFix if unconscious	2015-07-28 13:06:58 -07:00
SilentSpike	16597515f0	Adding remaining missing English straings	2015-07-28 20:55:22 +01:00
PabstMirror	9b551e3fdf	#1931 - Fix Explosives Module Strings	2015-07-28 14:42:23 -05:00
Glowbal	6289601b4e	Merge pull request #1935 from jokoho48/ParachuteFix ... change form addBackpack to addBackpackGlobal	2015-07-28 20:11:42 +02:00
Glowbal	7a65af4926	Merge pull request #1928 from acemod/headbugfix ... Headbugfix	2015-07-28 20:10:51 +02:00
Joko	46531b916a	change form addBackpack to addBackpackGlobal	2015-07-28 20:08:38 +02:00
Joko	baa1aab257	Fix Spelling	2015-07-28 19:24:34 +02:00
Joko	b2eeaacfc1	Fix Double Config Entry	2015-07-28 18:51:17 +02:00
Joko	55cac4b6d9	posible fix for #1932	2015-07-28 18:36:13 +02:00
ViperMaul	92940ea1a9	Removed improper translations ... #1738	2015-07-28 15:17:22 +01:00
ViperMaul	675996d67b	Adding HeadBugFix button to the ACE Options dialog (missing file) ... #1738	2015-07-28 15:17:20 +01:00
ViperMaul	c9d9f78e5b	Add headBugFix button to ACE Options Dialog #1738	2015-07-28 15:17:19 +01:00
SilentSpike	c73eef28ed	Pushing back ace_spectator to feature branch	2015-07-27 21:25:39 +01:00
Glowbal	5ec59045c1	Default disable sitting	2015-07-27 22:00:30 +02:00
Glowbal	7d30bc53ed	Removed non chairs	2015-07-27 21:59:38 +02:00
SilentSpike	47d96835c6	Fix arrayIntersect oversight	2015-07-27 18:32:21 +01:00
Grzegorz	d23cab06aa	+ and -	2015-07-27 13:20:07 +02:00
PabstMirror	ceb12662e0	Version To 3.2.0	2015-07-27 02:05:58 -05:00
ViperMaul	4f53bdefb9	Suppress debug in fnc_unloadPersonLocal.sqf	2015-07-26 23:54:42 -07:00
ViperMaul	9a98530392	Add support for loading unconscious into boats, refs #1729	2015-07-26 18:33:25 -07:00
ViperMaul	6142d99626	Add support for loading unconscious into co-pilot seat ... fixes #1727	2015-07-26 18:20:36 -07:00
gienkov	5136215e79	finger, parachute and spectator translation	2015-07-27 01:46:58 +02:00
gienkov	5bb1dded4b	Merge remote-tracking branch 'origin' into pl-translation-4	2015-07-27 00:47:54 +02:00
PabstMirror	bf4e95e750	Merge pull request #1548 from acemod/fingering ... Fingering	2015-07-26 16:47:41 -05:00
PabstMirror	4f9dba61ee	Mk6 - Misc cleanup	2015-07-26 16:45:34 -05:00
Glowbal	41196c15aa	Merge pull request #1686 from acemod/fixFrag ... Fix frag	2015-07-26 23:42:16 +02:00
ViperMaul	951afef495	Merge pull request #1911 from acemod/fixLoadUnloadUnconscious ... Fix load unload unconscious	2015-07-26 14:33:46 -07:00
Glowbal	0af6c5d852	Merge pull request #1913 from acemod/improveSwitchUnits ... Improve SwitchUnits	2015-07-26 21:13:21 +02:00
Glowbal	d1809e597c	Removed requirement for the medical dll ... Medical extension is now an optional requirement that improves performance for advanced medical when used.	2015-07-26 20:54:49 +02:00
SilentSpike	159937dc45	Merge branch 'master' into ace_spectator ... Conflicts: addons/explosives/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/map/stringtable.xml addons/medical/stringtable.xml addons/sitting/stringtable.xml addons/spectator/stringtable.xml extras/assets/icons/Icons_Modules.psd	2015-07-26 14:15:24 +01:00
SilentSpike	e6f016f195	GVAR typo	2015-07-26 13:13:46 +01:00
SilentSpike	e431365586	Spectate on death setting	2015-07-26 13:12:58 +01:00
SilentSpike	ec6a0da01c	Adjust camera speed while moving	2015-07-26 12:23:01 +01:00