Commit Graph

6938 Commits

Author SHA1 Message Date
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
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
19bfa478d1 Revert use of param in action string 2015-08-26 10:13:30 +02:00
0d7e7fa0cc should be type of 2015-08-26 10:08:32 +02:00
81068e6086 fixed dragging getWeight 2015-08-26 10:05:30 +02:00
1a0abf31fd fix global variable in local name space 2015-08-26 09:11:43 +02:00
65e16da998 fix missing semi column and bracket 2015-08-26 09:10:29 +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
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
8d29170551 fixing Spelling Issues
Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN
2015-08-25 19:33:10 +02:00
ea79e5ef01 Updated DE readme, Fixed issues, ACE to ACE3 2015-08-25 19:30:34 +02:00
f0cc1ca333 Merge pull request #2015 from jokoho48/codeCleanupAB
Code cleanup of the Advanced Ballistics module.
2015-08-25 18:56:45 +02:00
2af486ab6b Update Main Config File 2015-08-25 18:34:10 +02:00
ffcf0ecf7d Merge pull request #2253 from gienkov/spectator-pl-translation
Translate spectator strings to polish
2015-08-25 16:25:14 +01:00
e237bea88c Dimmed the glow values. 2015-08-24 15:43:43 -07:00
f8f8d7fd19 Simplified the colour check again. 2015-08-24 15:43:21 -07:00
54f1a87222 Simplified the colour check. 2015-08-24 15:42:12 -07:00
9de7953345 More cba capitalisation. 2015-08-24 14:12:04 -07:00
720f6c075a Removed old references to NVG. 2015-08-24 14:08:02 -07:00
1f8b16f7fb Fixed BFT module weirdness. 2015-08-24 14:06:19 -07:00
72b12e3af4 Fixed indentation. 2015-08-24 14:03:23 -07:00
79e6ce3803 Fixed CBA capitalisation. 2015-08-24 14:02:55 -07:00
b230762abd Add some string checking for flashlight glow type. 2015-08-24 13:59:35 -07:00
9718883599 Consolidated into 1 function 2015-08-24 20:58:54 +02:00
21aa4da4ad Merge pull request #2255 from J3aLeiNe/master
rangecard stringtable : french translation
2015-08-24 20:51:44 +02:00
3f0909ddd5 Fixed typo 2015-08-24 20:12:45 +02:00