19a6226ced
add Hearing Protection to Helmets with Peltors
2015-08-28 09:10:58 +02:00
80d18c468e
Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup
...
wirecutters config for fences + cleanup
2015-08-27 16:01:31 -05:00
6fe79c4fe2
remove obsolete compat pbo for BWMod, fix #2293
2015-08-27 22:10:09 +02:00
a86ff93c16
Merge pull request #2052 from MikeMatrix/logMacros
...
ACE specific logging macros
2015-08-26 21:52:20 -07:00
93106697ab
Added debug log macros
2015-08-27 06:21:02 +02:00
d38cb31240
Merge pull request #2109 from acemod/pushSubmaine
...
Push SDV sub, cleanup push
2015-08-26 21:03:46 -07:00
728aafc3c2
Merge pull request #2265 from jonpas/makeUpdate
...
Updated make.py with changes from CBA
2015-08-26 21:01:21 -07:00
bc016eac4c
1.50 - use new didJip command (Ref #2241 )
2015-08-26 22:39:27 -05:00
1187b73419
make.py version bump to 0.7
2015-08-27 03:23:56 +02:00
5ea98143e2
Merge pull request #2211 from jonpas/integrateAsdg
...
Integrated ASDG JR Optional
2015-08-26 17:53:32 -07:00
3db981a2c5
Merge pull request #2243 from jonpas/repairHitpointStrings
...
Improved Repair Hitpoint String Localization
2015-08-26 23:32:37 +02:00
6a6c5008c0
Merge branch 'master' into repairHitpointStrings
...
Conflicts:
addons/repair/functions/fnc_doRepair.sqf
2015-08-26 23:29:36 +02:00
f7679b45ad
Merge pull request #2246 from jonpas/repairHitpointGroups
...
Repair Hitpoint Groups Framework
2015-08-26 23:27:08 +02:00
a0f030c35c
Merge pull request #2282 from jonpas/fixFullRepairCondition
...
Fixed Full Repair available even when vehicle is already fully repaired
2015-08-26 23:23:08 +02:00
ce8da8d720
Fixed Full Repair available even when vehicle is already fully repaired
2015-08-26 23:09:46 +02:00
b6d5db9157
Reverted IGNORED_HITPOINTS, Added Taru glasses to it
2015-08-26 23:09:04 +02:00
cc70580a93
Improved comments
2015-08-26 22:51:41 +02:00
e4123c9730
Added 2 strings, changed 1
2015-08-26 22:44:30 +02:00
ca991712e8
Merge pull request #2270 from acemod/codeCleanUpMicroDagr
...
Code Cleanup MicroDagr Module
2015-08-26 11:03:22 -05:00
4cf81b493a
Fix stringtable and more cleanup
2015-08-26 11:00:59 -05: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
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
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
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
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
f0cc1ca333
Merge pull request #2015 from jokoho48/codeCleanupAB
...
Code cleanup of the Advanced Ballistics module.
2015-08-25 18:56:45 +02:00
