Commit Graph

7576 Commits

Author SHA1 Message Date
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
jonpas
393b69f20c Readme * to - 2015-08-25 19:48:18 +02:00
Josuan Albin
a53221c5b2 Merge pull request #5 from jonpas/docpass11_3
Documentation Pass 11 Additions 3
2015-08-25 19:47:56 +02:00
jokoho48
8d29170551 fixing Spelling Issues
Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN
2015-08-25 19:33:10 +02:00
jonpas
ea79e5ef01 Updated DE readme, Fixed issues, ACE to ACE3 2015-08-25 19:30:34 +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
jonpas
ac645ef186 Added events to overpressure-framework 2015-08-25 18:52:41 +02:00
jonpas
9ffa770147 Small fix in overpressure-framework 2015-08-25 18:46:03 +02:00
jonpas
3470346d30 Fixed tables even more 2015-08-25 18:39:58 +02:00
jokoho48
2af486ab6b Update Main Config File 2015-08-25 18:34:10 +02:00
jonpas
d0f5a73dab Fixed dragging-framework tables even more 2015-08-25 18:31:58 +02:00
SilentSpike
ffcf0ecf7d Merge pull request #2253 from gienkov/spectator-pl-translation
Translate spectator strings to polish
2015-08-25 16:25:14 +01:00
alganthe
e5cf6bc74c overpressure framework 2015-08-25 14:37:54 +02:00
alganthe
6fc24cde83 dragging framework table fix 2015-08-25 09:09:12 +02:00
Josuan Albin
f035aa4eb3 Merge pull request #4 from jonpas/docpass11_2
Documentation Pass 11 Additions 2
2015-08-25 08:36:38 +02:00
jonpas
258ec6b3f2 Added missile-guidance and reloadlaunchers events 2015-08-25 04:32:04 +02:00
jonpas
d159043ce5 Added goggled events 2015-08-25 04:18:13 +02:00
jonpas
1048562a42 Updated settings-fraemwork and how-to-report-an-issue 2015-08-25 04:05:43 +02:00
jonpas
1019450c30 Updated sitting-framework, added unfinished note 2015-08-25 03:59:56 +02:00
jonpas
3b74cc4f47 Updated parachute-framework and reloadlaunchers-framework 2015-08-25 03:50:06 +02:00
jonpas
e02d28eddf Updated overheating-framework 2015-08-25 03:46:55 +02:00
jonpas
a7ba540b97 Updated NVG-framework 2015-08-25 03:35:58 +02:00
jonpas
bf1c77fcb4 Updated javelin-framework 2015-08-25 03:30:36 +02:00
jonpas
6d84977fd8 Updated huntIR-framework 2015-08-25 03:28:26 +02:00
jonpas
d51ad8280a Updated hearing-framework 2015-08-25 03:26:06 +02:00
jonpas
93baa3b6fa Updated goggles-framework 2015-08-25 03:23:37 +02:00
jonpas
ae1e7afdc8 Updated missile-guidance-framework 2015-08-25 03:13:59 +02:00
jonpas
fa84effb9b Small update in frag-framework 2015-08-25 02:57:28 +02:00
jonpas
ba53ce88a8 Updated frag-framework, fixed typo in dragging-framework 2015-08-25 02:56:11 +02:00
jonpas
126ae37a9a Cleaned up dragging-framework 2015-08-25 02:33:34 +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
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
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