Glowbal
0cfb492916
Fixes and removal of duplicate code
2015-08-26 10:04:51 +02:00
Glowbal
7a48f595be
Merge branch 'basic-medical-test' into medical-adjustments
2015-08-26 09:13:12 +02:00
Glowbal
26ffcf473f
Merge branch 'master' into medical-adjustments
2015-08-26 09:11:56 +02:00
Glowbal
1a0abf31fd
fix global variable in local name space
2015-08-26 09:11:43 +02:00
Glowbal
3acfc4d2a3
Merge branch 'master' into medical-adjustments
2015-08-26 09:10:45 +02:00
Glowbal
65e16da998
fix missing semi column and bracket
2015-08-26 09:10:29 +02:00
Glowbal
db96d42f25
Merge branch 'CodeCleanUpMedical' into medical-adjustments
2015-08-26 09:06:27 +02:00
Glowbal
13740c06e4
Merge pull request #1816 from voiperr/ace_map_dev
...
Flashlight simulation on map
2015-08-26 09:01:30 +02:00
Glowbal
fb5563e7ba
Merge pull request #2048 from MikeMatrix/codeCleanupSwitchunits
...
Code cleanup of Switchunits module
2015-08-26 08:51:22 +02:00
Glowbal
5bec26c721
Merge pull request #2086 from jokoho48/codeCleanUpDragging
...
Code cleanup of Dragging module
2015-08-26 08:45:30 +02:00
Glowbal
222e0183ed
Merge pull request #2202 from jonpas/cargoEvents
...
Cargo Events
2015-08-26 08:36:31 +02:00
Glowbal
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
Glowbal
d97dfce2d3
Merge pull request #2245 from jonpas/repairHitpointSelections
...
Custom Hitpoint Repair Positions Framework
2015-08-26 08:33:01 +02:00
Glowbal
efcfbe47df
Merge pull request #2251 from acemod/orderAuthors
...
Order Authors
2015-08-26 08:32:07 +02:00
Glowbal
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
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
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
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
bux578
21aa4da4ad
Merge pull request #2255 from J3aLeiNe/master
...
rangecard stringtable : french translation
2015-08-24 20:51:44 +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
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
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
PabstMirror
27d974687e
Merge pull request #2235 from acemod/mdagrFixes
...
Mdagr fixes
2015-08-23 17:00:37 -05:00
PabstMirror
05925ad7c2
Merge pull request #1902 from acemod/virtualExplosivesPlace
...
Virtual explosives place
2015-08-23 16:57:24 -05:00
Michael Braun
fc45d1216a
Simplyfied bounding value detection
2015-08-23 22:26:31 +02:00
PabstMirror
58f4ef5b62
Merge pull request #2226 from acemod/codeCleanupMarker
...
Code Cleanup Marker Module
2015-08-23 14:27:07 -05:00
