7149 Commits

Author	SHA1	Message	Date
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
SilentSpike	b0adf2e2ee	Fix 3D icons not rendering	2015-07-26 12:13:05 +01:00
SilentSpike	efbd5189ce	Close all dialogs when exiting	2015-07-26 12:05:41 +01:00
SilentSpike	f0f6edb549	Transition camera post-escape menu	2015-07-26 11:28:14 +01:00
bux578	cff54efbe0	add missing private	2015-07-26 09:20:38 +02:00
bux578	993f6bde16	remove respawnCounter in certain respawn template conditions	2015-07-26 09:19:29 +02:00
bux578	4ab1123efd	fix unlimited growing array	2015-07-26 09:19:09 +02:00
Glowbal	dfec850aa8	Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs ... addX macro in configs	2015-07-26 08:37:47 +02:00
PabstMirror	0b9d1fb05d	Disabled by default - Safe FOV Check	2015-07-26 00:48:53 -05:00
SilentSpike	5cfe180d3b	Fix camPan normalization	2015-07-26 02:17:09 +01:00
SilentSpike	697997ca8f	Escape menu	2015-07-26 02:17:08 +01:00
SilentSpike	878bcf819e	Fix map double click event	2015-07-26 00:25:31 +01:00
PabstMirror	c6f21f48a4	Merge branch 'master' into fingering	2015-07-25 17:28:22 -05:00
SzwedzikPL	6258e73290	addX macro in confgis	2015-07-25 21:59:52 +02:00
Glowbal	c9d4395a42	Merge pull request #1870 from SzwedzikPL/ah6_gun_fix ... M134 minigun rate of fire & dispersion fix + hearing protection for heli pilots	2015-07-25 21:39:21 +02:00
PabstMirror	fba457999e	#1899 - Remove AV_ESS_blk config	2015-07-25 14:32:24 -05:00
Glowbal	ea8dc0a5ec	Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant ... Fix for 'Treat at...' option	2015-07-25 21:22:44 +02:00
Glowbal	3a53991ed0	fixed rvmat and texture paths	2015-07-25 21:21:31 +02:00
PabstMirror	ffc5615abd	Merge pull request #1886 from acemod/windDeflectionSinglePFEH ... Wind deflection single pfeh	2015-07-25 14:01:45 -05:00
PabstMirror	7da258111d	Merge pull request #1739 from acemod/virtualAttachObject ... Virtual attach object	2015-07-25 13:55:48 -05:00
Glowbal	3514f07d31	Merge pull request #1806 from jonpas/sittingFixes ... Akward Sitting Fixes Part 2	2015-07-25 20:42:38 +02:00
Glowbal	f0a2c7c454	Merge pull request #1854 from jonpas/lookUp ... Increased ability to look up	2015-07-25 20:41:46 +02:00
Glowbal	2f186ffbf1	Merge pull request #1897 from acemod/vectorCtrlTextGroupFix ... #1871 - Don't do ctrlText(set) on RscControlsGroup	2015-07-25 19:57:55 +02:00
PabstMirror	40ed985d34	Config Fixes	2015-07-25 12:56:57 -05:00
Glowbal	c729672e53	Merge pull request #1885 from acemod/kestullHeightFix ... Fix Kestrel Y position on large interface	2015-07-25 19:53:48 +02:00
Glowbal	6422c20e46	Merge pull request #1867 from acemod/cWire-localVehDamage ... concWire - Apply damage where vehicle is local	2015-07-25 19:52:42 +02:00
PabstMirror	e616f2240e	Merge pull request #1863 from acemod/huntIR-itemRemoved ... Close huntIR monitor if item removed	2015-07-25 12:50:05 -05:00
PabstMirror	1008567cba	Merge pull request #1847 from acemod/optionsOnIntroOutro ... Show Options on Intro/Outro in Missions	2015-07-25 12:49:20 -05:00
Glowbal	0e872a5ed5	Merge pull request #1845 from acemod/huntir-deadProjectile ... HuntIR - Handle Dead Projectile	2015-07-25 19:48:32 +02:00
ViperMaul	38bd2896ab	Merge pull request #1851 from SzwedzikPL/hearing_in_zeus ... Disable hearing in zeus camera	2015-07-25 10:44:34 -07:00
ViperMaul	55614b9ac3	Merge pull request #1839 from acemod/hearingUnification ... Hearing PFEH unification / Flashbangs	2015-07-25 10:44:11 -07:00
PabstMirror	2a19521f68	Merge pull request #1820 from acemod/mk6-fixBISleveling ... Mk6 fix leveling	2015-07-25 12:36:28 -05:00
KoffeinFlummi	88a5609016	Merge branch 'master' of https://github.com/acemod/ACE3	2015-07-25 19:35:26 +02:00
KoffeinFlummi	9805a8270a	Merge branch 'master' into german-merge	2015-07-25 19:35:03 +02:00
PabstMirror	9e831d257d	Merge pull request #1768 from acemod/10digitGrids2 ... 10 digit grids 2	2015-07-25 12:32:02 -05:00
Glowbal	9d7374c893	Merge pull request #1307 from jokoho48/master ... Cut Parachute/Reserve parachute	2015-07-25 19:17:37 +02:00
Jonathan Pereira	5609ec7b6b	Added PT-BR translations ... New PT-BR translations, including the slideshow and spectator module.	2015-07-25 12:56:50 -03:00
SilentSpike	21ce877115	Handle unit icons and provide setting	2015-07-25 14:13:37 +01:00
SilentSpike	2f1639822c	Fix incorrect variable	2015-07-25 13:24:50 +01:00
SilentSpike	7107514b05	New function to precisely control spectatable sides	2015-07-25 13:24:49 +01:00
SzwedzikPL	6569fe1d62	macro_addbackpack	2015-07-25 13:13:31 +02:00
SilentSpike	69d1db2872	String updates	2015-07-25 11:41:31 +01:00
PabstMirror	bca5fa1f4a	Spall - execNextFrame instead of addPerFrameHandler	2015-07-25 03:20:03 -05:00
PabstMirror	e29fb477f9	Merge branch 'master' into fixFrag	2015-07-25 02:38:10 -05:00
Glowbal	0ce50d7b17	Merge pull request #1896 from acemod/medicalTreatmentEndAnim ... Medical - Don't play *_medic anims at end	2015-07-25 09:27:18 +02:00
PabstMirror	9f078d405b	Tweak Place when Prone	2015-07-25 02:10:33 -05:00
PabstMirror	bff629be9c	Fix PositionAsl / Update mouse hints	2015-07-25 01:42:17 -05:00
SilentSpike	5ac77fa996	Corrected default param value	2015-07-24 22:31:51 +01:00
SilentSpike	c9750919a4	PFHs only as needed	2015-07-24 20:29:43 +01:00
SilentSpike	e2e6091c1f	Close dialogs before open	2015-07-24 17:55:33 +01:00
SilentSpike	e4aee1da2c	Add categories to help splash	2015-07-24 17:50:33 +01:00
SilentSpike	bafb261c01	Adding icon toggle	2015-07-24 17:37:07 +01:00
SilentSpike	e413cb3d91	Cache unit information	2015-07-24 17:17:00 +01:00
SilentSpike	8ef6364b59	Use localized side strings	2015-07-24 16:40:29 +01:00
SilentSpike	eaeda2667c	Map icons	2015-07-24 16:40:28 +01:00
SilentSpike	fa306a0fb8	Further populate help splash	2015-07-24 11:39:41 +01:00
SilentSpike	9b3b5e9750	Prevent repeating key down events	2015-07-24 11:39:40 +01:00
PabstMirror	aa3b9e7b1c	#1871 - Don't do ctrlText(set) on RscControlsGroup ... Throws `control[ACE_ScriptedDisplayControlsGroup]: Unexpected control type [15]`	2015-07-23 16:46:30 -05:00
PabstMirror	1b590bf0f9	More nametag fixes / setSetting casting	2015-07-23 14:05:20 -05:00
jonpas	817dfe94e2	Added possible values	2015-07-23 20:29:51 +02:00
jonpas	964f32a721	Fixed NameTags Settings defaults	2015-07-23 20:26:31 +02:00
gienkov	2f24b240b4	Fix end line marker	2015-07-23 13:59:50 +02:00
gienkov	61fa466a53	Medical and slideshow pl translation	2015-07-23 13:56:54 +02:00
PabstMirror	cbd74d768b	Medical - Don't play *_medic anims at end	2015-07-23 02:43:19 -05:00
SilentSpike	53a0a9343b	Populating help splash	2015-07-22 15:21:36 +01:00
SilentSpike	3d290977e5	Preserve unit name in toolbar	2015-07-22 15:21:33 +01:00
SilentSpike	766b1e1dcd	Retain current settings when invalid settings given	2015-07-22 15:21:32 +01:00
SilentSpike	248cdf1f3f	Public function error messages	2015-07-22 15:21:30 +01:00
PabstMirror	4d7a2888eb	Remove Debug	2015-07-22 03:27:40 -05:00
PabstMirror	8f18fd7eaa	Single PFEH for wind deflection	2015-07-22 03:04:54 -05:00
PabstMirror	24cda6e37c	#1655 - Fix Kestrel Y position on large interface	2015-07-22 01:06:36 -05:00
SilentSpike	78ae59b223	Default value update	2015-07-21 22:56:47 +01:00
SilentSpike	aa67e296c0	User feedback when no units left	2015-07-21 22:54:46 +01:00
SilentSpike	9f0415b9fa	Safeguard against removal of all modes	2015-07-21 22:45:54 +01:00
SilentSpike	53dc519336	Improved side handling in unit tree	2015-07-21 21:23:11 +01:00
SilentSpike	ec58c0061a	Public functions to tweak available vision/camera modes	2015-07-21 20:19:54 +01:00
SilentSpike	43ecd308eb	Fix empty array error	2015-07-21 20:00:09 +01:00
SilentSpike	c8a7bbba3b	Improved mouse handling	2015-07-21 19:48:33 +01:00
SilentSpike	0d798264b0	Enforcing the speed limit	2015-07-21 19:43:03 +01:00
SilentSpike	341f3a253e	Stop dolly on mouse button release	2015-07-21 18:44:24 +01:00
SilentSpike	f65b18f558	Keyup events	2015-07-21 18:26:49 +01:00
SilentSpike	7234c928bc	setCameraAttributes should use ATL	2015-07-21 18:17:29 +01:00
SilentSpike	e81f9f5e59	Mouse dollying	2015-07-21 18:06:38 +01:00
SilentSpike	b6ff45e8bd	Add vision mode to toolbar	2015-07-21 17:48:32 +01:00
SilentSpike	1890bc1d59	Unit cycling	2015-07-21 16:06:51 +01:00
SilentSpike	dc19bff189	Improve handling of invalid modes	2015-07-21 15:53:20 +01:00
SilentSpike	dcea8f4929	Adding vision to setCameraAttributes	2015-07-21 15:44:11 +01:00
SilentSpike	c0fd26f706	Add new setting to module	2015-07-21 15:15:31 +01:00
SilentSpike	37ffdab2ca	Add camera cycling function	2015-07-21 15:15:21 +01:00
SilentSpike	2c1e346cca	Header cleanup	2015-07-21 13:31:00 +01:00
SilentSpike	40f32b604a	Camera vision modes	2015-07-21 12:46:34 +01:00
Glowbal	5508eae314	Merge pull request #1875 from jokoho48/3dModelUpdate2 ... 3D Model Update 2.0	2015-07-21 12:22:28 +02:00
SilentSpike	21942eb5a1	Preserve z axis on map transport	2015-07-20 23:30:18 +01:00
SilentSpike	005b2ad406	camTilt should persist	2015-07-20 23:25:05 +01:00
SilentSpike	7a45c6543e	Truncate speed values to 2 DP	2015-07-20 23:17:22 +01:00
SilentSpike	c3329ca8fc	Set camera attributes	2015-07-20 23:17:03 +01:00
SilentSpike	34d2ec1d5a	Altered naming conventions	2015-07-20 23:15:52 +01:00
SilentSpike	186d4d0583	Fix for #1665	2015-07-20 21:14:30 +01:00
SilentSpike	0d94bfe8bd	Primative map interaction	2015-07-20 20:30:13 +01:00
ViperMaul	22d41797ac	Merge pull request #1804 from acemod/misGuideStuff ... Missle Guidance / Javelin Fixes	2015-07-20 11:28:18 -07:00
SilentSpike	52244c1647	Rejiggling toolbar	2015-07-20 18:38:18 +01:00
SilentSpike	5af5284bee	Adding sides to unit tree	2015-07-20 18:37:17 +01:00
SilentSpike	8509646f88	Correct side usage	2015-07-20 18:37:07 +01:00
SilentSpike	841f939012	Improve toggling code and UX	2015-07-20 17:13:38 +01:00
SilentSpike	2ffa3c9a85	Prevent AI group chat	2015-07-20 00:09:52 +01:00
SilentSpike	77941c4f27	Remove help button	2015-07-20 00:09:51 +01:00
SilentSpike	08d5a8364f	Improve overhead reduction	2015-07-19 23:03:40 +01:00
SilentSpike	e09342b7ea	Improved toggle controls	2015-07-19 22:50:13 +01:00
SilentSpike	cc9283ed96	Minor UX tweaks	2015-07-19 22:47:21 +01:00
SilentSpike	e95186f550	Handle focus	2015-07-19 22:15:19 +01:00
SilentSpike	e406a794f2	Add hostile sides filter	2015-07-19 22:14:08 +01:00
SilentSpike	ac56702e33	Handle toolbar values	2015-07-19 20:02:52 +01:00
SilentSpike	0de56740c0	Improved camera mode transition	2015-07-19 16:50:59 +01:00
SilentSpike	d8cd1eeb1a	Minimising PFH overhead	2015-07-19 16:50:58 +01:00
SilentSpike	3b1afe930e	Handle the clock	2015-07-19 16:50:57 +01:00
Joko	9bdb192c8a	Add New LitterGloves ... Add New Litter/packingbandage Change all Litter Model and Texture to a nomenclature (littergeneric_name)	2015-07-19 15:31:15 +02:00
Glowbal	da5afde324	Merge pull request #1874 from jokoho48/TacticalLadderShootFix ... Fix shoot through Tacticalladder	2015-07-19 15:08:12 +02:00
SilentSpike	619c2d780b	Removing debug message	2015-07-19 13:03:49 +01:00
SilentSpike	935430ea59	Interface tweaks	2015-07-19 13:03:40 +01:00
SilentSpike	123825a6fe	Updating zeus waypoint actions icon	2015-07-19 12:23:57 +01:00
SilentSpike	8d6f167d97	Safer unit updates	2015-07-19 12:09:57 +01:00
Joko	2615d99178	Fix shoot through Tacticalladder	2015-07-19 03:32:07 +02:00
SilentSpike	d680789d04	Enable compass, auto-refresh units, pass display to PFHs	2015-07-19 02:25:52 +01:00
SilentSpike	1ba0bcee95	Correct DIK code	2015-07-18 19:05:18 +01:00
SilentSpike	7091ac21e9	Function cleanup	2015-07-18 18:53:30 +01:00
SilentSpike	f7cf983e92	Corrected current unit updating	2015-07-18 18:53:28 +01:00
SilentSpike	e4ba5aaf1b	Camera mode cycling	2015-07-18 18:53:27 +01:00
SilentSpike	7b28214c80	More reliable freecam PFH termination	2015-07-18 17:06:13 +01:00
SilentSpike	fb2b2bc9e5	Improve freecam handling	2015-07-18 16:59:05 +01:00
SilentSpike	60b3c6c0f8	Improved camUnit handling	2015-07-18 16:50:11 +01:00
SilentSpike	bfd9be9ce1	Naming consistency	2015-07-18 16:20:31 +01:00
SilentSpike	382c9fbc35	Variable handling and consistency	2015-07-18 15:52:44 +01:00
SilentSpike	5d279e11ec	Interface toggles	2015-07-18 15:42:07 +01:00
SzwedzikPL	99e1b36712	AH6 gun fix, hearing protection change	2015-07-18 15:51:16 +02:00
SilentSpike	c6e71fbc36	Interface prettification	2015-07-18 13:12:34 +01:00
SilentSpike	359b81f2ef	Spectator position fix	2015-07-18 13:04:23 +01:00
PabstMirror	bc953b32bc	More Stuff	2015-07-18 00:36:47 -05:00
SzwedzikPL	d60d5fe1f3	disable a10 tracers, commanche tracers only nvg	2015-07-18 06:47:13 +02:00
SilentSpike	2f8432699b	Fix side filtering	2015-07-18 00:40:20 +01:00
PabstMirror	bf802f4f5d	Merge branch 'master' into virtualAttachObject	2015-07-17 17:56:22 -05:00
SilentSpike	13201866bd	Module icon	2015-07-17 23:31:31 +01:00
PabstMirror	ddc83e0889	#1639 - Apply damage where vehicle is local	2015-07-17 15:43:00 -05:00
SilentSpike	10c1c26c69	Improved unit switching	2015-07-17 20:51:06 +01:00
SilentSpike	832fa1e832	Side filter	2015-07-17 20:51:04 +01:00
Joko	41edf3dd38	Rework after Comments form esteldunedain	2015-07-17 21:26:18 +02:00
SilentSpike	c48719a644	Attribution for F3 project devs	2015-07-17 16:45:16 +01:00
SilentSpike	cfcb9fedb6	Updating ace settings	2015-07-17 16:13:24 +01:00
SilentSpike	6de18416bc	Interface tweaks	2015-07-17 13:14:09 +01:00
SilentSpike	3b9a364a26	Expanding the unit tree	2015-07-17 12:57:34 +01:00
Glowbal	015fd1afb0	Merge pull request #1864 from jokoho48/TextureUpdate ... Update IV Blood and Plasma Texture	2015-07-17 11:06:49 +02:00
Joko	1b9d02a8a5	Update IV Blood and Plasma Texture	2015-07-17 09:40:43 +02:00
Glowbal	0154dfc51e	Merge pull request #1799 from jokoho48/3DModelUpdate ... Add and Update Some 3D Object and Textures	2015-07-17 08:17:42 +02:00
PabstMirror	df90c4b88e	More Attach Stuff	2015-07-16 23:59:31 -05:00
SilentSpike	6540971298	Tweaking a controls group	2015-07-17 02:58:31 +01:00
SilentSpike	27d85180f1	Improve handling of unit tree	2015-07-17 02:38:42 +01:00
SilentSpike	6cb1813527	Fix button y value	2015-07-17 02:16:35 +01:00
SilentSpike	81f87ee13c	params for public functions	2015-07-17 02:05:24 +01:00
SilentSpike	78a8149cc2	Viewpoint order UX	2015-07-17 01:52:08 +01:00
SilentSpike	e012fbc7f9	Unit tools control group	2015-07-17 01:47:21 +01:00
SilentSpike	840d766d83	Fixing typos, updating interface	2015-07-17 01:22:38 +01:00
PabstMirror	b6e124d340	#1856 - Close huntIR monitor if item removed	2015-07-16 19:12:11 -05:00
PabstMirror	f845d54290	#1634 - Integrate with DAGR	2015-07-16 18:35:38 -05:00
PabstMirror	f438c6d0c5	Revert "Use new worldSize command instead of whileLoop" ... This reverts commit 7d26519b2e.	2015-07-16 18:10:10 -05:00
PabstMirror	7d26519b2e	Use new worldSize command instead of whileLoop	2015-07-16 17:47:39 -05:00
PabstMirror	b47a17230b	Merge branch 'master' into 10digitGrids2	2015-07-16 17:26:19 -05:00
Nicolás Badano	04e137090b	Merge pull request #1753 from jonpas/slideshow ... Slideshow	2015-07-16 18:25:05 -03:00
Nicolás Badano	67d83d0d49	Merge pull request #1862 from acemod/disappearingActionsFix ... Cache the objects actions for nearby objects and set the GVAR(objectA…	2015-07-16 18:24:55 -03:00
jonpas	77631eb61c	Only add ACE_MainActions if one doesn't exist yet, Cleaned comments	2015-07-16 23:16:09 +02:00
SilentSpike	e823ec681d	Toggle help key	2015-07-16 21:45:52 +01:00
jonpas	23e7e19100	Fixed macro, Added privates	2015-07-16 22:39:02 +02:00
SilentSpike	78e17c4bdc	Fix function calls with switch to params	2015-07-16 21:37:20 +01:00
SilentSpike	a7a87c40f0	Using control groups	2015-07-16 21:33:50 +01:00
esteldunedain	8da43d25c6	Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly.	2015-07-16 17:28:27 -03:00
jonpas	a136545b85	Merge branch 'master' into slideshow	2015-07-16 22:20:56 +02:00
SilentSpike	723a0f96f6	Improve view switching UX	2015-07-16 19:43:16 +01:00
SilentSpike	20f05d9906	Improve unit switching UX	2015-07-16 18:31:49 +01:00
SilentSpike	458fe363ff	Fixing typo	2015-07-16 17:56:50 +01:00
SilentSpike	3895a51f02	Correcting view transition	2015-07-16 17:48:32 +01:00
SilentSpike	e3c9e52fdd	Tree events to update camUnit	2015-07-16 17:29:10 +01:00
SilentSpike	549d53d919	Use RscPicture for compass	2015-07-16 15:51:32 +01:00
SilentSpike	d043a471b3	Improving unit list handling	2015-07-16 15:49:02 +01:00
Joko	d92e6af1c2	Add IRStrobe to CfgMagazines	2015-07-16 15:17:09 +02:00
Joko	0ba8a39dc5	Add LoD to Wirecutter	2015-07-16 14:46:08 +02:00
Joko	c9a47ec053	Add LoDs for IVBag 250/500/1000 ... Add LoDs for Kestrell	2015-07-16 14:41:42 +02:00
PabstMirror	1f4488253d	Only attach some triggers	2015-07-15 23:52:47 -05:00
Joko	b2b7015b8e	Remove Unessesary Comments in RVMAT	2015-07-15 21:35:30 +02:00
Joko	9aa0285064	Revert LoD Changes	2015-07-15 21:13:05 +02:00
Joko	fd4d4abb73	Move UAV Battery form models to data ... change LoD Distance Fix IVBag names(my issue)	2015-07-15 20:51:06 +02:00
Joko	a72312738e	Add to all Objects a LoD with nothing in for "hiding" Objects in Distance ... Remove Old Earplugs Use 3 Object instead of 9 for IVBag with Using of Model Config	2015-07-15 20:34:35 +02:00
SilentSpike	7f04164653	Handling the spectatable unit list	2015-07-15 14:58:38 +01:00
SilentSpike	147571c76f	Better method of updating camera view	2015-07-15 14:58:08 +01:00
SilentSpike	784865d634	Clear workspace	2015-07-15 13:50:10 +01:00
SilentSpike	5dc4dbeb88	Handle camera attributes	2015-07-15 12:34:44 +01:00
SilentSpike	d2345a398a	Handle free cam movement	2015-07-15 12:23:25 +01:00
SilentSpike	90b6fd3d8b	Initalize interface	2015-07-15 12:09:28 +01:00
SilentSpike	d7cc309591	setSpectator correct group handling, disable user input	2015-07-15 11:48:49 +01:00
SilentSpike	a02470c341	Unify interface as display	2015-07-15 11:43:09 +01:00
PabstMirror	7cc2628c53	Stuff	2015-07-15 03:18:19 -05:00
PabstMirror	104d1a1cc7	Attaching (Rotate to verticle)	2015-07-15 02:54:38 -05:00
jonpas	e1fb4db63a	Fixed chairs inheritance in sitting	2015-07-15 00:42:41 +02:00
jonpas	174ef91b82	Fixed comment typo	2015-07-15 00:36:05 +02:00
jonpas	338aa19aaa	Increased ability to look up #1846, Cleaned up new and empty lines in movement	2015-07-15 00:35:12 +02:00
PabstMirror	6130b5b373	Working Demo	2015-07-14 00:24:55 -05:00
PabstMirror	14eae93f4b	#1814 - Save and restore last mortar charge setting	2015-07-13 19:09:55 -05:00
PabstMirror	78d0767051	#1838 - Remove base airFriction test (broke smokes)	2015-07-13 18:42:59 -05:00
SilentSpike	7b88280988	Merge pull request #1852 from jonpas/fixELSTRINGmacroWord ... Fixed ELSTRING macro typo	2015-07-14 00:02:34 +01:00
jonpas	01ba50bbb2	Fixed ELSTRING macro typo	2015-07-13 22:12:54 +02:00
jonpas	b266effe5b	Made object actions dynamic	2015-07-13 22:07:21 +02:00
SzwedzikPL	60641d57d2	Disable hearing in zeus camera	2015-07-13 21:01:41 +02:00
Nicolás Badano	01d8d7957c	Merge pull request #1824 from Legolasindar/master ... Update spanish translation	2015-07-13 15:36:36 -03:00
jonpas	4fa1c7dc0a	Moved verification to public function, removed unnecessary str	2015-07-13 19:56:25 +02:00
PabstMirror	061ddbd8de	Remove debug testing code	2015-07-12 14:09:27 -05:00
PabstMirror	46cee06f07	#1812 - Show Options on Intro/Outro	2015-07-12 10:26:08 -05:00
PabstMirror	d4f70134e6	medical/setUnconscious header	2015-07-12 10:25:00 -05:00
jonpas	89c5218bbd	Fixed module init exit condition	2015-07-12 16:45:09 +02:00
jonpas	b83b161e3d	Fixed default duration value in module init, Added error if required fields left empty, Combined 2 lines	2015-07-12 16:32:48 +02:00
PabstMirror	05d98370e4	Handle enableCombatDeafness and/or ringing enabled	2015-07-11 21:00:40 -05:00
PabstMirror	7a204cbdb1	#1843 - HuntIR - Handle Dead Projectile	2015-07-11 19:48:52 -05:00
PabstMirror	6de3df6474	Update README.md	2015-07-11 12:42:19 -05:00
PabstMirror	040f4a92a0	#1696 - Flashbangs make big boom	2015-07-10 21:39:35 -05:00
PabstMirror	c27afca485	DisableEarRinging / Cleanup	2015-07-10 21:30:47 -05:00
PabstMirror	d11fa939e1	Hearing - Merge PFEH (ringing/volume)	2015-07-10 21:01:32 -05:00
Joko	83e74d848d	fix that cachedOverPressureValue is called Multible per Weapon	2015-07-11 00:50:12 +02:00
Joko	9bb9df59ec	Add caching for Backblast	2015-07-11 00:09:20 +02:00
jonpas	c90c83831d	Removed Tripod PBOPREFIX newline	2015-07-10 23:36:30 +02:00
jonpas	ef18006423	Tripod indentation to 4 spaces, removed empty first lines	2015-07-10 23:34:36 +02:00
SilentSpike	97f3ec4f65	Merge pull request #1835 from jonpas/disableEarRingingOnTheFly ... Exit Ear Ringing PFH when disabled during ringing	2015-07-10 22:08:53 +01:00
jonpas	4826fd5c1c	Exit Ear Rining PFH when disabled during ringing	2015-07-10 22:52:04 +02:00
jonpas	e437fbbacd	Removed safety from binoculars/designators	2015-07-10 22:42:40 +02:00
Joko	8cd8504b3f	Add Posibility to Change Backblast Values in Magazine Config	2015-07-10 22:30:07 +02:00
SilentSpike	a1ec2eb7c3	Update handleRespawn to new function parameters	2015-07-09 21:24:45 +01:00
SilentSpike	1e13758ad8	Better group handling, more functional function	2015-07-09 21:20:09 +01:00
SilentSpike	1e8b869117	Reshuffling toolbar tools	2015-07-09 18:08:34 +01:00
SilentSpike	877d4e7cd9	Using common defines, further cleanup	2015-07-09 17:53:22 +01:00
Glowbal	d3bed7aedb	fixed -1 to disable the revive timer does not work	2015-07-09 13:02:48 +02:00
PabstMirror	499a63e8e3	External - Move to right of head	2015-07-08 15:53:31 -05:00
Ivan Navarro Cabello	78529af60c	Update spanish translation	2015-07-08 20:57:46 +02:00
SilentSpike	46bd42d59e	Cleanup interface config	2015-07-08 15:31:54 +01:00
PabstMirror	ba8c9186bb	Show leveled azimuth/elevation	2015-07-08 01:00:43 -05:00
jonpas	815b7984aa	Fixed event statement arguments, reworded comment	2015-07-07 03:46:54 +02:00
SzwedzikPL	defc82694b	Fix for 'Treat at...' option	2015-07-06 21:30:49 +02:00
PabstMirror	f6973c61fa	Merge branch 'master' into mk6-fixBISleveling	2015-07-06 01:35:55 -05:00
SilentSpike	98e9245ed9	Basic respawning support	2015-07-05 21:53:09 +01:00
SilentSpike	2aebabdb2c	Safeguard against repeat usage	2015-07-05 21:31:26 +01:00
SilentSpike	788c23c940	Allow resetting existing spectators	2015-07-05 21:30:19 +01:00
Joko	fa900452ea	Add DAGR (by Blackpixxel) ... Add QuikClot to Medical (by Blackpixxel) Add QuikClot Litter (by Blackpixxel) Update Blackpixxel at Author Fix IRStrobe Texture Path	2015-07-05 22:21:17 +02:00
PabstMirror	88e0b67364	Merge branch 'master' into fingering	2015-07-05 12:30:31 -05:00
SilentSpike	9026db9b3c	Major cleanup	2015-07-05 16:44:16 +01:00
jonpas	cb210f92a0	Prevented sitting on flipped chairs, Stand when chair gets knocked away/otherwise moves	2015-07-05 17:07:34 +02:00
jonpas	34dea7d971	Fixed #1796 sitting above ground level	2015-07-05 13:55:45 +02:00
Glowbal	e9d51aa57b	Updated repair config	2015-07-05 10:31:12 +02:00
PabstMirror	6e982018d3	Don't use uiNamespace to store PEFH	2015-07-04 23:14:44 -05:00
PabstMirror	183c03a3a4	Add missing PREP	2015-07-04 22:54:21 -05:00
SilentSpike	069ab2432a	Keybinds should always be present	2015-07-05 01:32:06 +01:00
SilentSpike	ad30b28f34	Improved death handling	2015-07-05 01:29:14 +01:00
SilentSpike	bedde2197b	Only cache info on death if not a spectator	2015-07-05 01:12:16 +01:00
SilentSpike	950aec38b7	Fixed macro	2015-07-05 01:04:07 +01:00
SilentSpike	01a5ab619e	handleKilled and handleRespawn	2015-07-05 00:49:47 +01:00
SilentSpike	6596bbdb0a	Coding standards	2015-07-05 00:17:15 +01:00
SilentSpike	83e5309654	Updated side GVAR	2015-07-05 00:11:38 +01:00
SilentSpike	27610b78e1	Blank space cleanup	2015-07-05 00:10:01 +01:00
SilentSpike	5e7c094c98	Cache details on respawn (not at postInit)	2015-07-05 00:09:43 +01:00
Joko	815365fd2e	Small Performace Improvement in Nametags	2015-07-04 23:03:16 +02:00
Joko	0c099dc4d1	Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues) ... Add PaxJaromeMalues to AUTHORS	2015-07-04 22:50:32 +02:00
SilentSpike	c09314027f	"isNotSpectator" canInteractWith condition	2015-07-04 19:41:18 +01:00
Joko	240b26b9ac	Add IRStrobe 3D Object to attach ... Add M57 Clacker to explosives Add New LowPoly Earplug to Hearing Add WireCutter to logistics_wirecutter Reduce UAVBattery Texture Size in logistics_uavbattery Add MapTools to maptools	2015-07-04 19:56:54 +02:00
SilentSpike	975bc229c6	Merge branch 'master' into ace_spectator ... Conflicts: addons/spectator/stringtable.xml	2015-07-04 18:53:20 +01:00
SilentSpike	19c16b1f59	Comment out dev branch command	2015-07-04 17:40:23 +01:00
bux578	fcb6383337	remove some empty xml nodes	2015-07-04 16:19:53 +02:00
ProfessorCZ	89a9218e59	CZ Translation - Update	2015-07-04 15:56:00 +02:00
Clon1998	08fecbf1f3	Fixed german translation	2015-07-04 14:30:42 +02:00
Clon1998	93871c4675	Added german translation	2015-07-04 10:01:58 +02:00
voiper	981c961ce1	-Switched to CBA keybinds. ... -Localized keybinds. -Removed fnc_cameraIntro.sqf; superfluous. -Various code clean ups. -Changed: Condition for mission end now checks allUnits (todo: change to allPlayers when available).	2015-07-04 01:00:27 -07:00
Clon1998	c61a0f03cd	Fixed german translation. ... Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description	2015-07-04 09:43:42 +02:00
PabstMirror	ab2ebf5fcf	MissleGuidance - Move PARAMS up to top	2015-07-03 21:06:13 -05:00
voiper	d4b5f88a76	Last remnants of view distance.	2015-07-03 15:00:00 -07:00
SilentSpike	909fbb5dc4	Merge pull request #1732 from acemod/checkPBOfix ... CheckPBO should ensure client isn't running any addons the server isn't	2015-07-03 22:33:17 +01:00
Glowbal	57c4bc453a	Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect ... disable pain effect in zeus camera	2015-07-03 23:20:33 +02:00
Glowbal	071a673f28	Implemented repair action framework ... copied across treatment framework from medical and adjusted it to suit the repair actions	2015-07-03 23:14:23 +02:00
Glowbal	0bf56d64bd	Readding file that git removed	2015-07-03 22:31:30 +02:00
Glowbal	1ad2a5cdf1	Merge branch 'master' into repair ... Conflicts: addons/interaction/CfgVehicles.hpp	2015-07-03 22:29:29 +02:00
Glowbal	44de95ea81	Merge pull request #1790 from acemod/medicalImprovements ... Medical improvements	2015-07-03 22:21:20 +02:00
Glowbal	fd649aee38	Changed default value for surgical kit. Should be use anytime	2015-07-03 22:17:31 +02:00
Glowbal	9edf1b1adf	Implemented use conditions for PAK and SurgicalKit ... It is now possible to only have a treatment action show up for stable (not bleeding) patients	2015-07-03 22:16:18 +02:00
voiper	206a976013	Merge branch 'ace_spectator' into ace_spectator_dev ... Conflicts: addons/spectator/functions/fnc_camera.sqf	2015-07-03 12:59:47 -07:00
Glowbal	07303633e4	Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing ... Fix vanilla damage effects	2015-07-03 21:41:26 +02:00
voiper	81889aef2d	Viewdistance dialogue remove.	2015-07-03 12:23:49 -07:00
voiper	56aa87ce8b	Removed view distance changing.	2015-07-03 12:14:41 -07:00
SilentSpike	a23f401695	Removing all references to penPos	2015-07-03 19:07:10 +01:00
SilentSpike	58b1c0f3a9	Solve crashing caused by off map position and disableSimulation to stop underwater issues	2015-07-03 18:44:40 +01:00
SilentSpike	bbadc9242b	Further zeus actions cleanup	2015-07-03 14:21:21 +01:00
SilentSpike	ca36b62356	Zeus interactions string cleanup	2015-07-03 13:20:32 +01:00
PabstMirror	1c6b12126e	Merge branch 'master' into mk6-fixBISleveling	2015-07-02 22:03:25 -05:00
Nicolás Badano	8052dd8ea3	Merge pull request #1782 from gienkov/pl-translation ... PL translation	2015-07-02 23:06:13 -03:00
SilentSpike	ff4fce3950	Initial enter/exit function implementation	2015-07-03 02:16:23 +01:00
SilentSpike	d036639b46	Adding hideUnit functions to ace_common	2015-07-03 02:14:58 +01:00
SilentSpike	91ca532496	Preserve equipment, added comments	2015-07-02 23:43:33 +01:00
gienkov	70862c5de9	PL translation	2015-07-02 23:55:26 +02:00
SzwedzikPL	13999fdd31	finddisplay into curatorcamera	2015-07-02 19:36:34 +02:00
SilentSpike	8c98f98472	Fixed end mission code on server	2015-07-02 16:42:40 +01:00
SilentSpike	eeeb543424	Simplified default pen position assignment	2015-07-02 16:30:37 +01:00
SilentSpike	4df1738b43	Don't move respawn markers ... Exit on HC Only run end mission PFH on server	2015-07-02 16:23:25 +01:00
SilentSpike	3a4a32382d	Removed empty stringtables	2015-07-02 15:56:01 +01:00
Nicolás Badano	13f5b08892	Merge pull request #1760 from voiperr/master ... ACE_Spectator	2015-07-02 10:52:59 -03:00
SzwedzikPL	c2e4ee431f	no pain effect in zeus camera	2015-07-02 13:56:56 +02:00
PabstMirror	89305473a2	Add performance note.	2015-07-01 15:50:14 -05:00
PabstMirror	5e80f9d8d3	Merge branch 'master' into userActionPrototype	2015-07-01 15:04:40 -05:00
PabstMirror	b02086ca52	Intersection Check / FOV adjustment	2015-07-01 14:53:59 -05:00
SzwedzikPL	6b4eeedbad	headgear influence on hearing	2015-07-01 21:21:09 +02:00
PabstMirror	319e50a9cc	Viewdistance - Fix Error Missing )	2015-07-01 12:39:49 -05:00
Nicolás Badano	10ef88b655	Merge pull request #1596 from SzwedzikPL/interaction_box_inventory ... Open action for boxes	2015-07-01 12:59:24 -03:00
Nicolás Badano	9d0dcc5ea2	Merge pull request #1757 from Winter259/viewdistance-settings-init ... Viewdistance settingsInitialized	2015-07-01 12:58:07 -03:00
jonpas	8f0101a1d9	Merge branch 'master' into addEarplugsEnhancement ... Conflicts: addons/hearing/functions/fnc_addEarPlugs.sqf	2015-07-01 17:45:00 +02:00
Nicolás Badano	f175490298	Merge pull request #1772 from acemod/aceModuleSyncronizedObjects ... Ace_modules - Pass synced objects to functions	2015-07-01 11:33:03 -03:00
Nicolás Badano	f1f31cd94a	Merge pull request #1769 from acemod/mapShakePanning ... Allow moving map while shake effect active	2015-07-01 11:31:31 -03:00
Nicolás Badano	d06ac6cace	Merge pull request #1771 from acemod/fixRallyPoint ... Rally point object names	2015-07-01 11:30:32 -03:00
Nicolás Badano	1e8d4327df	Merge pull request #1763 from naizarak/patch-1 ... Update fnc_addEarPlugs.sqf	2015-07-01 11:22:59 -03:00
PabstMirror	57f88fe77a	Ace_modules - Pass synced objects to functions	2015-07-01 01:53:15 -05:00
PabstMirror	7eb26c8710	#1699 - Rally point object names	2015-07-01 01:27:06 -05:00
PabstMirror	c58ff8d31d	#1736 - Allow moving map while shake effect active	2015-07-01 00:13:55 -05:00
Joko	30111b4f15	Fix Merge Problems ... Use CString Macro	2015-07-01 03:03:51 +02:00
Joko	a74bc3a748	Merge branch 'master' of https://github.com/acemod/ACE3 into acemod-master ... Conflicts: AUTHORS.txt addons/parachute/CfgVehicles.hpp	2015-07-01 02:49:29 +02:00
PabstMirror	c1dd2df57a	Move grid funcs and map long,lat,altitude to common	2015-06-30 12:26:51 -05:00
PabstMirror	ccebb4f86a	Merge branch 'master' into 10digitGrids2 ... Conflicts: addons/microdagr/functions/fnc_updateDisplay.sqf	2015-06-30 11:25:55 -05:00
PabstMirror	923018a9f6	mdagr use getMapPosFromGrid	2015-06-30 11:18:47 -05:00
PabstMirror	1f47ffc5de	Error checking, handle out of bounds grids	2015-06-30 11:11:53 -05:00
PabstMirror	1f7994e10f	Calc real X and Y offsets	2015-06-29 21:18:21 -05:00
jonpas	f08bd7acc2	Improved Slide Duration module option description	2015-06-29 22:24:16 +02:00
Nicolás Badano	a284cc3f6b	Merge pull request #1755 from ToasterBR/master ... Translation to Brazilian Portuguese (PT-BR)	2015-06-29 17:22:38 -03:00
jonpas	a9c6e3c065	Disabled debug	2015-06-29 22:14:38 +02:00
jonpas	bb3495468e	Replaced PFH for waitAndExecute with PFH-like handling	2015-06-29 22:13:28 +02:00
jonpas	9ee75dbb21	Multiple modules support	2015-06-29 21:54:40 +02:00
jonpas	3ac520eb3e	Corrected typo	2015-06-29 21:23:47 +02:00
naizarak	75e322e6ae	Update fnc_addEarPlugs.sqf ... Do not automatically add earplugs to units if combat deafness is disabled.	2015-06-29 12:23:32 -07:00
jonpas	038de8b5cf	Added Slideshow module icon	2015-06-29 21:22:59 +02:00
jonpas	7e200afa04	Added automatic slide transitions with custom duration	2015-06-29 21:07:51 +02:00
voiper	0d3601da47	Tiny fix to description.	2015-06-29 09:51:19 -07:00
SilentSpike	873936dc31	Simplify addon checking code	2015-06-29 14:15:46 +01:00
voiper	3dab207b65	Add Spectator.	2015-06-28 19:34:21 -07:00
jonpas	475e4673eb	Fixed typo	2015-06-28 22:28:26 +02:00
jonpas	9e6ce52fb6	Added check to addEarplugs if earplugs are used	2015-06-28 21:25:01 +02:00
PabstMirror	fde8f7383f	Map Opened/Closed Events + use in maptools	2015-06-28 13:08:47 -05:00
Simon AM	8bdf243ab9	Removed extra ]	2015-06-28 10:19:21 +02:00
Simon AM	0e7c6a8e19	Set Viewdistance to start on settingsInitialized	2015-06-28 10:18:53 +02:00
ToasterBR	f4a51d57ef	Translation to Brazilian Portuguese (PT-BR) ... Made all remaining translations, including new ones like the sitting module, for example.	2015-06-27 15:48:39 -03:00
SilentSpike	f2e5f729e8	Merge branch 'master' into gm_revamp	2015-06-27 18:26:30 +01:00
jonpas	34b270d89d	Added Flat TV support	2015-06-27 04:23:21 +02:00
jonpas	a7d58f3b9f	Fixed project name	2015-06-27 04:13:20 +02:00
jonpas	77cb278f61	Added Slideshow mission tool	2015-06-27 04:11:57 +02:00
PabstMirror	6bb235f38a	Merge pull request #1711 from acemod/mdagr-ambientBrightness ... mdagr use ambientBrightness	2015-06-26 20:23:32 -05:00
PabstMirror	ca145cce26	Merge pull request #1705 from acemod/animSourceAmmoBox ... #1704 - Add missing AnimationSources	2015-06-26 20:23:09 -05:00
ulteq	241e8acdd9	Merge pull request #1541 from jonpas/sitting ... Sitting	2015-06-26 21:34:34 +02:00
jonpas	c8c1f76e7d	Macro usage, privates fix	2015-06-26 21:31:48 +02:00
ulteq	b78ece7114	Merge pull request #1706 from jonpas/settingsBFT ... Blue Force Tracking ACE_Settings	2015-06-26 20:06:20 +02:00
SilentSpike	5e38ba9b20	Correcting some spacing	2015-06-24 17:09:43 +01:00
ViperMaul	7e6be08153	Improved unloading on roof tops ... Less chance of patient being unloaded directly to the ground instead of the roof top where the helo has landed. Probably not fool proof yet due to randomness. #1728	2015-06-23 16:11:00 -07:00
SilentSpike	e4f89a96b7	CheckPBO should ensure client isn't running any addons the server isn't	2015-06-23 15:01:55 +01:00
ViperMaul	6b6ad93848	Fix for unable to unload from driver seat. ... Improvement for helo's on roof tops and boats. #1728	2015-06-22 19:48:28 -07:00
PabstMirror	d5757c090a	Calc gridOffsets at mission start.	2015-06-22 20:36:37 -05:00
jonpas	293fa4f16b	Coding standards applied to common/CfgVehicles.hpp	2015-06-22 19:29:19 +02:00
jonpas	ec5cc606c3	Fixed CheckPBOs Whitelist default value in module	2015-06-22 19:24:10 +02:00
jonpas	922e88d31e	Fixed handcuffing not breaking sitting animation	2015-06-22 15:25:10 +02:00
SilentSpike	27a4ecd747	Expanded readme	2015-06-22 00:43:39 +01:00
SilentSpike	378b39db77	Merge remote-tracking branch 'upstream/master'	2015-06-22 00:37:28 +01:00
SilentSpike	398f1c768f	Fix the module on dedicated servers	2015-06-22 00:17:29 +01:00
SilentSpike	e3e415c727	Added readme	2015-06-21 23:46:23 +01:00
jonpas	2e50261bd3	Exit entire map Client XEH on Headless	2015-06-21 21:10:50 +02:00
jonpas	a7d9489555	Fixed map module init, Prevented BFT execution on Headless, Changed BFT Enabled string	2015-06-21 21:08:37 +02:00
PabstMirror	2d6e862237	Merge branch 'master' into 10digitGrids2	2015-06-21 13:07:58 -05:00
PabstMirror	ce2a617c7b	#1709 - Remove ACE_Comanche_Test from zeus	2015-06-21 13:00:51 -05:00
PabstMirror	f0adf256a8	#573 - mdagr use ambientBrightness	2015-06-21 12:25:16 -05:00
jonpas	4f35e10afa	Changed BFT_Enabled to module option for proper ACE_Settings handling	2015-06-21 04:46:55 +02:00
jonpas	10602f10c6	Fixed BFT ACE_Settings, Fixed Map Module Initialized diag_log	2015-06-21 04:19:12 +02:00
PabstMirror	4570f77249	Privates / Cleanup	2015-06-20 20:40:17 -05:00
PabstMirror	2c64abb816	#1704 - Add missing AnimationSources	2015-06-20 20:17:27 -05:00
Glowbal	e153e47bb2	Disabled litter on treatment failure. #1403 ... We give back the items, so litter does not make sense at the moment. In the future we need to expand this with conditions for success/failure.	2015-06-20 12:54:00 +02:00
Glowbal	9e00fc479b	CPR local is now also only executed when the target is still alive. ... Otherwise it's quite useless	2015-06-20 12:51:42 +02:00
Glowbal	c4283404e8	Changed CPR to be available for all unconscious units ... Including dead	2015-06-20 12:51:01 +02:00
Glowbal	ea0be1f563	Only execute the local handling of CPR when in a valid state	2015-06-20 12:46:26 +02:00
Glowbal	385baf1331	Using CPR while in revive state will extend the life timer	2015-06-20 12:44:52 +02:00
Glowbal	9795647d9c	While in revive state, ensure vitals are never above 0 for adv medical	2015-06-20 12:44:29 +02:00
Glowbal	3f5a050745	Fixed #1693	2015-06-20 12:38:12 +02:00
Glowbal	c3e2d1bf9c	Removed always unconscious for basic medical	2015-06-20 12:23:40 +02:00
ulteq	8d1d0c5480	Merge pull request #1672 from acemod/hearingAmmoClassCaching ... Improved config caching	2015-06-20 09:48:07 +02:00
Macusercom	cac8dd8b02	German translations fixes	2015-06-20 02:16:30 +02:00
Glowbal	5887c59c05	Made fix properly for advanced medical	2015-06-19 23:03:31 +02:00
Glowbal	300a33ea0a	Initial work	2015-06-19 22:53:25 +02:00
PabstMirror	25df7aad09	Attach use purely virtual object (no setPos)	2015-06-19 13:32:42 -05:00
ulteq	474e694309	Enable interaction with explosives while swimming	2015-06-19 11:49:38 +02:00
PabstMirror	6c7ba7b5ae	Zeus module on dedicated server	2015-06-18 22:43:49 -05:00
PabstMirror	375c81d9b0	Connect Zeus module to Frag	2015-06-18 22:13:06 -05:00
PabstMirror	9c0478ddfd	Cleanup	2015-06-18 22:04:48 -05:00
PabstMirror	e235ebcc15	Fix frag always killing thrower	2015-06-18 21:48:23 -05:00
ViperMaul	394bcafc4a	Set version to 3.1.2	2015-06-18 15:49:27 -07:00
PabstMirror	d7717448fa	#1670 - Laser pointer - pass _brightness to drawFnc	2015-06-18 17:16:53 -05:00
ulteq	5d2905ca42	Improved config caching	2015-06-18 11:56:58 +02:00
ulteq	c3fea42bce	Merge pull request #1622 from acemod/huntirHitpoints ... Added 'parachute' and 'camera' hitpoints to the HuntIR model:	2015-06-18 11:03:15 +02:00
ulteq	bb877bc54c	Added HuntIR and tactical ladder to ACE_Box_Misc	2015-06-18 11:02:04 +02:00
Glowbal	0631a6ae7d	Merge pull request #1647 from acemod/medicalStringtableFix ... Fixes: #1646	2015-06-18 08:34:42 +02:00
Glowbal	160d659523	Merge pull request #1656 from acemod/wireCutterCwire ... Add concertinawire to wirecutters	2015-06-18 08:34:02 +02:00
ViperMaul	85c40a4cf2	Merge pull request #1668 from acemod/release ... Release v3.1.1 merge into Master	2015-06-17 19:15:35 -07:00
Macusercom	500504d93b	Further improvements as suggested for German translation	2015-06-18 00:43:23 +02:00
jonpas	083d34b62b	Removed redundant GVAR	2015-06-18 00:21:56 +02:00
Grey-Soldierman	6f9702b532	Removed Entrenching Tool	2015-06-17 18:25:57 +01:00
Grey-Soldierman	7e5859f6f8	Ports A2 Envelope Small & Envelope Big. ... Adds entrenching tool for use in building trenches (Requires Script to be made)	2015-06-17 18:17:57 +01:00
ViperMaul	bab33bfbe2	Bump the build number from 0 to 1	2015-06-17 08:15:19 -07:00
Grey-Soldierman	d78caf9255	Added Entrenching Tool	2015-06-17 15:05:49 +01:00
Grzegorz	1de569656d	Fix checking vitals anim ... It uses animations that don't match at all what you are doing anyway so I think it's better to just disable anim for that actions which are: * Checking pulse * Checking BP * Checking response	2015-06-17 14:58:35 +02:00
ViperMaul	e5a5832cac	Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release	2015-06-16 22:43:46 -07:00
ViperMaul	47ef53201a	Set version number to 3.1.1	2015-06-16 22:41:04 -07:00
Glowbal	a8998690ea	Merge pull request #1650 from acemod/tacticalladderFixes ... Fixed model.cfg and requiredAddons	2015-06-17 07:36:01 +02:00
PabstMirror	ccb30e0a47	use master pfh for frag	2015-06-16 22:39:37 -05:00
Macusercom	ed4fbb5d33	More corrections	2015-06-16 23:19:47 +02:00
Macusercom	cf2f36a775	Corrections suggested by others	2015-06-16 23:17:34 +02:00
ulteq	82d80359d1	Fixes: https://github.com/acemod/ACE3/issues/1646	2015-06-16 21:57:12 +02:00
Nicolás Badano	2afcf92643	Merge pull request #1440 from legman/akalegman ... IED Class Inheritance Fixes	2015-06-16 13:35:19 -03:00
PabstMirror	196f3bd86b	Add concertinawire to wirecutters	2015-06-15 23:59:21 -05:00
Macusercom	f1691f2562	Fixed a typo	2015-06-16 03:23:32 +02:00
Macusercom	24cea18ae5	Revert "Revert "Added German translations"" ... This reverts commit 4403e3c665.	2015-06-16 03:21:25 +02:00
Macusercom	09f7473d7b	Added German translations	2015-06-16 03:06:47 +02:00
Macusercom	4403e3c665	Revert "Added German translations" ... This reverts commit 0adc07d284.	2015-06-16 03:06:23 +02:00
Macusercom	0adc07d284	Added German translations	2015-06-16 03:06:13 +02:00
AKALegman	c027db2e0e	final fixes	2015-06-15 20:55:49 +01:00
Nicolás Badano	fbf99224c4	Merge pull request #1635 from jonpas/fixCheckPBOkick ... Fixed CheckPBO Kick	2015-06-15 15:43:28 -03:00
jonpas	04c06b51ed	Fixed #1632 - CheckPBOs kick serverCommand changed to display 46	2015-06-15 20:23:16 +02:00
jonpas	f61066f11a	Fixed checkPBO function not executing on server	2015-06-15 19:55:30 +02:00
Glowbal	f8aa9a3171	Merge pull request #1621 from acemod/hrIncrease ... Medical - change hrIncrease random min/max	2015-06-15 10:42:43 +02:00
AKALegman	5915e24f5d	some fixes	2015-06-14 16:09:01 +01:00
ulteq	32f02b72a5	Fixed missing 'HitEngine' RPT warning.	2015-06-14 13:57:38 +02:00
Ivan Navarro Cabello	76f7962dac	Updated spanish stringatable ... Updated spanish stringatable for (Common, Medical, Optionsmenu, Tacticalladder).	2015-06-14 13:52:55 +02:00
ulteq	14fd5c930b	You can no longer connect to destroyed HuntIR cameras	2015-06-14 12:54:10 +02:00
ulteq	af2e2f71fd	Added 'parachute' and 'camera' hitpoints to the HuntIR model: ... * You can now shoot the parachute to make it fall faster * And you can shoot the camera to kill the video feed	2015-06-14 12:25:56 +02:00
PabstMirror	1c5788baab	Medical - change hrIncrease random min/max	2015-06-14 03:54:50 -05:00
ulteq	8d6b7de0ad	Fixed model.cfg and requiredAddons	2015-06-14 10:37:21 +02:00
AKALegman	0690e6f745	fixed conflicts	2015-06-14 09:36:03 +01:00
ulteq	906e365b94	DAGR now supports the new multiple devices framework	2015-06-14 09:59:06 +02:00
ulteq	48d8d5e076	Empty default keys for the DAGR to prevent conflicts	2015-06-14 09:38:25 +02:00
PabstMirror	bb414dd10f	Redo Some UI - Try to fix vectorUp problems	2015-06-14 00:52:30 -05:00
PabstMirror	dff99c4736	Tweak HTML Size	2015-06-13 20:41:57 -05:00
Glowbal	91b54bfc3a	Adds a back up function in sqf to assign open wounds.	2015-06-13 23:20:01 +02:00
ViperMaul	4c572ef298	Set version number to 3.1.0	2015-06-13 13:46:24 -07:00
jonpas	670d23e14c	Fixed Black Cellphone Display after 1.46	2015-06-13 22:12:32 +02:00
jonpas	1eeca28a3d	Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting	2015-06-13 22:08:13 +02:00
PabstMirror	4a8344e1a4	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/ACE_Settings.hpp addons/interact_menu/stringtable.xml extensions/CMakeLists.txt	2015-06-13 15:05:57 -05:00
PabstMirror	f811fc797e	Suppress optionsmenu debug	2015-06-13 15:03:22 -05:00
jonpas	254b386805	Allowed Kestrel4500 Inside and Sitting	2015-06-13 21:46:55 +02:00
ViperMaul	1322da5537	Merge pull request #1587 from acemod/fixVehicleUnconcious ... fix animation and consistently unload units from vehicle	2015-06-13 12:44:34 -07:00
jonpas	29ce8f635e	Merge branch 'master' into sitting ... Conflicts: addons/kestrel4500/CfgVehicles.hpp addons/microdagr/CfgVehicles.hpp	2015-06-13 21:43:42 +02:00
ViperMaul	132ec343b0	Suppress debug	2015-06-13 12:39:29 -07:00
ViperMaul	911a18d169	Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk ... Convert ASLtoPosition #1575 and #1577	2015-06-13 12:37:10 -07:00
PabstMirror	849a45d68b	DAGR - has item check	2015-06-13 14:29:34 -05:00
PabstMirror	b2d69611d7	Merge pull request #1118 from acemod/multipleDevices ... Multiple Devices	2015-06-13 14:20:38 -05:00
PabstMirror	e7347be47b	Increase delete delay for attached IR grenades (#1615)	2015-06-13 14:08:25 -05:00
Nicolás Badano	d262dc790f	Merge pull request #1616 from acemod/addMk16ToClaymore ... Make claymores detonatable by MK16. Close #1603	2015-06-13 16:07:56 -03:00
PabstMirror	0c45d2308a	Merge pull request #1150 from acemod/mainMenuVersionHTML ... Show Version / HTML Git Version on main menu	2015-06-13 14:07:36 -05:00
Nicolás Badano	179ad6c214	Merge pull request #1526 from acemod/rainExperiment ... Update rain each frame	2015-06-13 16:07:25 -03:00
esteldunedain	1237b1cb4a	Make claymores detonatable by MK16. Close #1603	2015-06-13 16:05:18 -03:00
PabstMirror	f68a2310a8	Merge pull request #1589 from acemod/laserPointerSetting ... Optional setting to disable laser pointer system	2015-06-13 13:56:01 -05:00
ulteq	c459a80bcb	Merge pull request #1613 from ProfessorCZ/master ... CZ - Translation (medical, tacticalladder)	2015-06-13 20:48:34 +02:00
Glowbal	5013254769	Merge pull request #1530 from legman/akalegman_zeus_unconscious ... Fixed Zeus Unconscious	2015-06-13 20:48:18 +02:00
esteldunedain	d53ee1cf85	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk ... Conflicts: addons/captives/CfgVehicles.hpp	2015-06-13 15:19:52 -03:00
PabstMirror	fdb30f4e68	Merge pull request #1599 from acemod/captivesFixes ... Captives fixes	2015-06-13 13:15:29 -05:00
Glowbal	1c066a0b3f	Merge pull request #1586 from acemod/dynamicPAKtreatmentTime ... PAK treatment time based on total amount of damage.	2015-06-13 20:14:57 +02:00
PabstMirror	6dba8b33da	Merge pull request #1507 from acemod/fixJavelinLocking ... Fix javelin locking	2015-06-13 12:54:06 -05:00
Glowbal	3e24749948	Merge pull request #1477 from alganthe/longer_flares ... flares modified	2015-06-13 19:51:27 +02:00
ProfessorCZ	c9f29aefa2	CZ - Translation (medical, tacticalladder)	2015-06-13 19:49:59 +02:00
ProfessorCZ	bf464ffe00	CZ - Translation (medical, tacticalladder)	2015-06-13 19:46:31 +02:00
ulteq	c3340b174e	Merge pull request #1609 from acemod/ace2EarRinging ... Ported the ACE2 ear ringing logic	2015-06-13 19:44:15 +02:00
esteldunedain	3d5afd7d8f	Close #1018	2015-06-13 14:32:18 -03:00
PabstMirror	6ab8b129fa	Merge branch 'master' into multipleDevices ... Conflicts: addons/common/XEH_postInit.sqf	2015-06-13 12:30:35 -05:00
ulteq	badfc4017c	Reset 'deaf' on respawn	2015-06-13 19:27:30 +02:00
PabstMirror	e9750ddc9b	Merge pull request #1611 from acemod/refineStaticInteration ... Manual MainActions position for some statics weapons	2015-06-13 12:18:28 -05:00
ulteq	6d6c3a4285	Fixed function header	2015-06-13 19:17:26 +02:00
ulteq	022f9286e2	Fixed a bug in the caching routine	2015-06-13 19:12:24 +02:00
ulteq	3427f655b9	Removed debug output	2015-06-13 19:01:40 +02:00
ulteq	6d4f58c18e	weapon magazines caching	2015-06-13 18:57:02 +02:00
ulteq	d9722db15e	Abort if distance > 50m	2015-06-13 18:42:09 +02:00
ulteq	2509f1d840	Missing privates	2015-06-13 18:34:30 +02:00
ulteq	b6a710d282	Implemented a proper magazine lookup routine	2015-06-13 18:32:48 +02:00
ulteq	38dca2bb9e	New loudness calculation for different ammo types	2015-06-13 18:19:35 +02:00
PabstMirror	2efc095c93	Merge branch 'master' into laserPointerSetting ... Conflicts: addons/laserpointer/XEH_postInit.sqf	2015-06-13 11:02:00 -05:00
ulteq	db68b6c155	Increased loudness of missles and rockets.	2015-06-13 17:43:27 +02:00
Nicolás Badano	b17b44b869	Merge pull request #1601 from acemod/laserpointerCleanup ... Privates, newline braces, typos	2015-06-13 12:25:21 -03:00
ulteq	feec8a14b7	Removed debug output	2015-06-13 17:23:45 +02:00
ulteq	eacd8e5a49	Removed debug output	2015-06-13 17:22:45 +02:00
ulteq	833634f010	Ported the ACE2 ear ringing logic	2015-06-13 17:16:18 +02:00
Nicolás Badano	c168afe8bb	Merge pull request #1598 from acemod/serverModulesFirst ... Fix Server not reading modules	2015-06-13 12:01:22 -03:00
ViperMaul	cb1d016a39	Merge pull request #1592 from ProfessorCZ/master ... CZ - Translation	2015-06-13 07:39:18 -07:00
ViperMaul	cbb620ba98	Change setPos to setPosASL to support roof tops and multi-level objects and faster code. ... #1575 and #1577	2015-06-13 07:24:50 -07:00
gienkov	3d440fc0da	PL tactical ladder translation	2015-06-13 14:36:42 +02:00
Glowbal	e0bb3c0a4e	Merge pull request #1602 from acemod/medicalFallingFix2 ... [Adv. Medical] Improved falling damage	2015-06-13 13:39:22 +02:00
Glowbal	ce908f0fb3	Merge pull request #1579 from acemod/medicalModuleOptions ... [Adv. Medical] New module options	2015-06-13 13:37:02 +02:00
ulteq	1c4566984f	Removed debug output	2015-06-13 12:13:58 +02:00
ulteq	84d20f9794	Further improved the handling of falling damage: ... * Makes sure _projectile is always "falling" * Enables the creation of wounds in multiple body parts at once * Caches the initial impact velocity for later damage calculation * Adjusts the maxDamage value of Large Abrasions	2015-06-13 11:53:30 +02:00
ulteq	234b62b409	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2	2015-06-13 11:12:37 +02:00
ulteq	9b2ebfcbe8	Privates, newline braces, typos	2015-06-13 10:41:19 +02:00
ulteq	6eeeb22fcd	Made use of the new stringtable macros	2015-06-13 09:51:49 +02:00
ulteq	b86e6b6043	Merge pull request #1493 from acemod/tacticalladder ... Initial draft of the ACE2 tactical ladder port.	2015-06-13 09:37:41 +02:00
PabstMirror	45912c6ddb	Handcuff icon for passengerActions	2015-06-13 00:12:13 -05:00
PabstMirror	9f15cfb650	Merge branch 'master' into captivesFixes	2015-06-13 00:02:41 -05:00
PabstMirror	58e5bc3581	Switch unload captive to passenger actions	2015-06-13 00:02:30 -05:00