Commit Graph

6848 Commits

Author SHA1 Message Date
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
f0cc1ca333 Merge pull request #2015 from jokoho48/codeCleanupAB
Code cleanup of the Advanced Ballistics module.
2015-08-25 18:56:45 +02: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
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
2c521527f4 Readded newline 2015-08-24 18:19:25 +02:00
cb6efc7c9a Removed copy/paste minuses 2015-08-24 18:18:54 +02:00
04da19190f Changed custom hitpoint positions config entry to 2d array 2015-08-24 18:17:56 +02:00
449af180c7 Moved check for zero position in it's own line 2015-08-24 17:58:19 +02:00
32d5ac99d9 Readded ignored hitpoints 2015-08-24 17:56:34 +02:00
329c3591e4 add head's email address 2015-08-24 16:37:07 +02:00
644c13c971 fix Typo
Remove macro GETVAR
2015-08-24 13:43:11 +02:00
bux
e7bf803056 fix order of authors, move joko to core 2015-08-24 13:19:18 +02:00
b14dc7cb02 Merge pull request #2242 from jonpas/fixSlideshowModule
Allow spaces in slideshow module
2015-08-24 09:38:10 +02:00
3a9d6a6a6c Added running time elapsed to make.py 2015-08-23 23:00:22 -07:00
5d104106c5 #2188 - Fix Exporting Color Arrays 2015-08-24 00:58:45 -05:00
a2022bb6fb Merge pull request #2176 from acemod/remove-asdg-message
remove asdg message
2015-08-24 00:17:18 -05:00
bb616887dc Don't run when mounted 2015-08-23 22:55:43 -05:00
7f175bad5f Added support for display messages 2015-08-24 05:24:25 +02:00
144af2ed17 Added support for when one of the grouped hitpoints is damaged but not main 2015-08-24 05:14:04 +02:00
f2bda7c434 Added hitpoint groups framework 2015-08-24 04:17:24 +02:00
94c4c411e2 Added custom hitpoint selection framework with a starting example, removed blacklist 2015-08-24 03:23:37 +02:00
1253d1267c Inlined selection check 2015-08-24 01:54:12 +02:00
5c33f7736c Added support in repair for hitpoints with non-center selections 2015-08-24 01:51:34 +02:00
2e1d734420 #2238 - use config for fences + cleanup 2015-08-23 18:39:08 -05:00
6a1b8cc359 Changed to LSTRING 2015-08-24 01:25:00 +02:00
d33834261f Removed debug 2015-08-24 01:14:59 +02:00
e368ae28f5 Fixed localization on same type hitpoints 2015-08-24 01:13:42 +02:00
396e01cd6e Added string checking for less needed string multiplicates 2015-08-24 01:04:57 +02:00
27d974687e Merge pull request #2235 from acemod/mdagrFixes
Mdagr fixes
2015-08-23 17:00:37 -05:00
05925ad7c2 Merge pull request #1902 from acemod/virtualExplosivesPlace
Virtual explosives place
2015-08-23 16:57:24 -05:00
fc45d1216a Simplyfied bounding value detection 2015-08-23 22:26:31 +02:00
58f4ef5b62 Merge pull request #2226 from acemod/codeCleanupMarker
Code Cleanup Marker Module
2015-08-23 14:27:07 -05:00