5047d4de1c
Switched to ACE_LOG<LEVEL>_# variation
2015-08-26 17:39:44 +02:00
9ca19def70
Added autoformatting variations for log macros
2015-08-26 17:09:31 +02:00
dc2e146e8b
Merge branch 'master' into repairHitpointStrings
...
Conflicts:
addons/repair/functions/fnc_addRepairActions.sqf
2015-08-26 17:04:05 +02:00
c0379c7809
Updated with correct cargo events and settings category
2015-08-26 17:02:29 +02:00
097506076f
Fixed format usage in macros requiring ARR_# for it to work
2015-08-26 16:48:55 +02:00
fd204d972d
Fixed issue with ERROR conflicting with log level input
2015-08-26 16:45:28 +02:00
5f6584ba3f
Added Log format macros for use with not printing it to the log.
2015-08-26 15:53:03 +02:00
f1d41731fb
Merge pull request #2149 from jokoho48/codeCleanupHuntIR
...
Code cleanup of HuntIR module
2015-08-26 15:48:29 +02:00
9e10aa86d7
Standardize logging format through ACE_LOG macros
2015-08-26 15:32:54 +02:00
a17d94c213
Removed semicolon of log macro
2015-08-26 14:12:17 +02:00
5a0e95dcf0
Simplified log macros
2015-08-26 14:04:17 +02:00
04c14b992e
Merge pull request #2273 from gienkov/patch-31
...
Fix being able to TQ torso
2015-08-26 11:37:18 +02:00
5ad0e192c3
Fix being able to TQ torso
2015-08-26 11:18:54 +02:00
604a33f71b
Merge branch 'master' into medical-adjustments
2015-08-26 10:13:44 +02:00
19bfa478d1
Revert use of param in action string
2015-08-26 10:13:30 +02:00
9488b6cc2c
Merge branch 'master' into medical-adjustments
2015-08-26 10:08:39 +02:00
0d7e7fa0cc
should be type of
2015-08-26 10:08:32 +02:00
307afc0922
Merge branch 'master' into medical-adjustments
2015-08-26 10:05:46 +02:00
81068e6086
fixed dragging getWeight
2015-08-26 10:05:30 +02:00
0cfb492916
Fixes and removal of duplicate code
2015-08-26 10:04:51 +02:00
7a48f595be
Merge branch 'basic-medical-test' into medical-adjustments
2015-08-26 09:13:12 +02:00
26ffcf473f
Merge branch 'master' into medical-adjustments
2015-08-26 09:11:56 +02:00
1a0abf31fd
fix global variable in local name space
2015-08-26 09:11:43 +02:00
3acfc4d2a3
Merge branch 'master' into medical-adjustments
2015-08-26 09:10:45 +02:00
65e16da998
fix missing semi column and bracket
2015-08-26 09:10:29 +02:00
db96d42f25
Merge branch 'CodeCleanUpMedical' into medical-adjustments
2015-08-26 09:06:27 +02:00
13740c06e4
Merge pull request #1816 from voiperr/ace_map_dev
...
Flashlight simulation on map
2015-08-26 09:01:30 +02:00
6a123020d2
fail to find BP on limbs with TQ on
2015-08-26 08:55:50 +02:00
fb5563e7ba
Merge pull request #2048 from MikeMatrix/codeCleanupSwitchunits
...
Code cleanup of Switchunits module
2015-08-26 08:51:22 +02:00
5bec26c721
Merge pull request #2086 from jokoho48/codeCleanUpDragging
...
Code cleanup of Dragging module
2015-08-26 08:45:30 +02:00
222e0183ed
Merge pull request #2202 from jonpas/cargoEvents
...
Cargo Events
2015-08-26 08:36:31 +02:00
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
d97dfce2d3
Merge pull request #2245 from jonpas/repairHitpointSelections
...
Custom Hitpoint Repair Positions Framework
2015-08-26 08:33:01 +02:00
efcfbe47df
Merge pull request #2251 from acemod/orderAuthors
...
Order Authors
2015-08-26 08:32:07 +02:00
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
f1e5ca24bf
Updated required CBA files
2015-08-26 06:11:52 +02:00
ca71dd43e1
Code Cleanup MicroDagr Module
2015-08-26 05:31:33 +02:00
b8a29bfd44
@jokoho482 suggestion
2015-08-26 03:00:43 +02:00
cae5f828fb
run check only on arms
2015-08-26 02:51:05 +02:00
c3af5e81e7
fix my error
2015-08-26 02:41:12 +02:00
5a9817322b
remove tabs
2015-08-26 02:39:34 +02:00
8498589920
pulse zero on limb with TQ on
2015-08-26 02:37:51 +02:00
bcb6c474a0
Merge pull request #2250 from acemod/fixExportColors
...
- Fix Exporting Color Arrays
2015-08-25 16:42:26 -05:00
3098794951
Merge pull request #2194 from NemesisRE/patch-1
...
Changed german strings for aid kit
2015-08-25 23:18:21 +02:00
fe7a02a63d
Updated make.py with changes from CBA
2015-08-25 20:59:55 +02:00
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
86a732c38d
Merge pull request #2213 from Cyruz143/master
...
Removing code thats native to CUP now
2015-08-25 20:27:17 +02:00
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
393b69f20c
Readme * to -
2015-08-25 19:48:18 +02:00
a53221c5b2
Merge pull request #5 from jonpas/docpass11_3
...
Documentation Pass 11 Additions 3
2015-08-25 19:47:56 +02:00
