Commit Graph

6868 Commits

Author SHA1 Message Date
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
gienkov
8498589920 pulse zero on limb with TQ on 2015-08-26 02:37:51 +02:00
PabstMirror
bcb6c474a0 Merge pull request #2250 from acemod/fixExportColors
- Fix Exporting Color Arrays
2015-08-25 16:42:26 -05:00
Felix Wiegand
3098794951 Merge pull request #2194 from NemesisRE/patch-1
Changed german strings for aid kit
2015-08-25 23:18:21 +02:00
jonpas
fe7a02a63d Updated make.py with changes from CBA 2015-08-25 20:59:55 +02:00
PabstMirror
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
ulteq
86a732c38d Merge pull request #2213 from Cyruz143/master
Removing code thats native to CUP now
2015-08-25 20:27:17 +02:00
Grzegorz
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
ulteq
f0cc1ca333 Merge pull request #2015 from jokoho48/codeCleanupAB
Code cleanup of the Advanced Ballistics module.
2015-08-25 18:56:45 +02:00
voiper
e237bea88c Dimmed the glow values. 2015-08-24 15:43:43 -07:00
voiper
f8f8d7fd19 Simplified the colour check again. 2015-08-24 15:43:21 -07:00
voiper
54f1a87222 Simplified the colour check. 2015-08-24 15:42:12 -07:00
Michael Braun
431bd309a8 Fixed variable privatization 2015-08-24 23:26:03 +02:00
voiper
9de7953345 More cba capitalisation. 2015-08-24 14:12:04 -07:00
voiper
720f6c075a Removed old references to NVG. 2015-08-24 14:08:02 -07:00
voiper
1f8b16f7fb Fixed BFT module weirdness. 2015-08-24 14:06:19 -07:00
voiper
72b12e3af4 Fixed indentation. 2015-08-24 14:03:23 -07:00
voiper
79e6ce3803 Fixed CBA capitalisation. 2015-08-24 14:02:55 -07:00
voiper
b230762abd Add some string checking for flashlight glow type. 2015-08-24 13:59:35 -07:00
Michael Braun
93acdbcb4d Replaced custom mapping implementation with ACE Hash 2015-08-24 22:45:59 +02:00
Michael Braun
2b0ef7bc6d Removed explicitly stated isClientSettable in Map Gestures ace settings 2015-08-24 22:10:02 +02:00
Michael Braun
3cbe6a3ebc Fixed multiple group settings not applying properly.
Added client configuration options for default colors.
2015-08-24 22:03:47 +02:00
Michael Braun
0ff5e86b52 Another missing semi-colon 2015-08-24 21:00:24 +02:00
jonpas
9718883599 Consolidated into 1 function 2015-08-24 20:58:54 +02:00
bux578
21aa4da4ad Merge pull request #2255 from J3aLeiNe/master
rangecard stringtable : french translation
2015-08-24 20:51:44 +02:00
jonpas
3f0909ddd5 Fixed typo 2015-08-24 20:12:45 +02:00
jonpas
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
jonpas
2c521527f4 Readded newline 2015-08-24 18:19:25 +02:00
jonpas
cb6efc7c9a Removed copy/paste minuses 2015-08-24 18:18:54 +02:00
jonpas
04da19190f Changed custom hitpoint positions config entry to 2d array 2015-08-24 18:17:56 +02:00
jonpas
449af180c7 Moved check for zero position in it's own line 2015-08-24 17:58:19 +02:00
jonpas
32d5ac99d9 Readded ignored hitpoints 2015-08-24 17:56:34 +02:00
Michael Braun
ee2cc22801 Added missing semicolon 2015-08-24 17:28:08 +02:00
Michael Braun
7217d5ec10 Various code cleanups and switch to player UIDs instead of sanitized names 2015-08-24 17:03:47 +02:00
bux578
329c3591e4 add head's email address 2015-08-24 16:37:07 +02:00
jokoho48
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
Glowbal
b14dc7cb02 Merge pull request #2242 from jonpas/fixSlideshowModule
Allow spaces in slideshow module
2015-08-24 09:38:10 +02:00
ViperMaul
3a9d6a6a6c Added running time elapsed to make.py 2015-08-23 23:00:22 -07:00
PabstMirror
5d104106c5 #2188 - Fix Exporting Color Arrays 2015-08-24 00:58:45 -05:00
PabstMirror
a2022bb6fb Merge pull request #2176 from acemod/remove-asdg-message
remove asdg message
2015-08-24 00:17:18 -05:00
PabstMirror
bb616887dc Don't run when mounted 2015-08-23 22:55:43 -05:00
jonpas
7f175bad5f Added support for display messages 2015-08-24 05:24:25 +02:00
jonpas
144af2ed17 Added support for when one of the grouped hitpoints is damaged but not main 2015-08-24 05:14:04 +02:00
jonpas
f2bda7c434 Added hitpoint groups framework 2015-08-24 04:17:24 +02:00
jonpas
94c4c411e2 Added custom hitpoint selection framework with a starting example, removed blacklist 2015-08-24 03:23:37 +02:00
jonpas
1253d1267c Inlined selection check 2015-08-24 01:54:12 +02:00
jonpas
5c33f7736c Added support in repair for hitpoints with non-center selections 2015-08-24 01:51:34 +02:00