7577 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jonpas	e4123c9730	Added 2 strings, changed 1	2015-08-26 22:44:30 +02:00
jonpas	497199e5ed	Changed CBA A3 link from Armaholic to GitHub	2015-08-26 21:35:37 +02:00
jonpas	23f8bbaca1	Improved german langauge	2015-08-26 21:34:51 +02:00
jonpas	b3838262f1	Fixed duplicated part of DE readme	2015-08-26 21:33:55 +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
Glowbal	04c14b992e	Merge pull request #2273 from gienkov/patch-31 ... Fix being able to TQ torso	2015-08-26 11:37:18 +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	efcfbe47df	Merge pull request #2251 from acemod/orderAuthors ... Order Authors	2015-08-26 08:32:07 +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
jonpas	f1e5ca24bf	Updated required CBA files	2015-08-26 06:11:52 +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