Commit Graph

6736 Commits

Author SHA1 Message Date
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
bux578
21aa4da4ad Merge pull request #2255 from J3aLeiNe/master
rangecard stringtable : french translation
2015-08-24 20:51:44 +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
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
PabstMirror
a82e5b5436 Fix Colors + Debug Trace 2015-08-23 14:25:41 -05:00
jonpas
2808ae6fc9 Removed debug 2015-08-23 19:55:52 +02:00
jonpas
6d15e63f85 Fixed #2222 - Allow spaces in slideshow module by just trimming the splitted input string rather than removing all whitespace 2015-08-23 19:48:57 +02:00
Steven Koeberich
d5a1a99f90 Update stringtable.xml
corrected spelling
2015-08-23 18:58:13 +02:00
Joko
50e851d2c8 Merge pull request #2239 from MikeMatrix/hotfix/projectileDirectionIgnoredWindage
Hotfix for projectile direction adjustment in Scopes module
2015-08-23 18:41:10 +02:00
Michael Braun
9352a8dbcb Hotfix for missreplaced variable in projectile direction adjustment 2015-08-23 18:38:19 +02:00
Michael Braun
021c835b02 Removed debug messages 2015-08-23 17:54:10 +02:00
Michael Braun
20b45e10a4 Fixed issue with selecting the wrong value, when perfect barrel length match occured. 2015-08-23 17:53:33 +02:00
Michael Braun
1c14897194 Fixed velocity limit detection and small comment fix 2015-08-23 17:39:48 +02:00
J3aLeiNe
490602facd rangecard stringtable : french translation
rangecard stringtable : french translation
2015-08-23 17:01:41 +02:00
PabstMirror
9aed148e8a Default Action parameters is [] for self (ref #2228)
Makes it match fnc_compileMenu.sqf
2015-08-23 00:16:01 -05:00
PabstMirror
248b4449bf #2204 - Tweak road draw for performance 2015-08-22 22:07:29 -05:00
PabstMirror
3df5b82402 #2225 - Fix mdagr list box colors 2015-08-22 20:53:29 -05:00
Joko
3eae83439b Merge pull request #2231 from gienkov/patch-26
Fix stitching action progress bar
2015-08-22 22:59:46 +02:00
Glowbal
f3d297b49c Merge pull request #2232 from acemod/codeCleanupMedical_Menu
Code Cleanup Medical Menu Module
2015-08-22 22:54:50 +02:00
jokoho48
29cc4c2697 stringtable Cleanup 2015-08-22 22:50:36 +02:00
jokoho48
9d0f3c7f5b stringtable Cleanup 2015-08-22 22:45:14 +02:00
jokoho48
4d81e4a99e Code Cleanup Medical Menu Module. 2015-08-22 22:33:15 +02:00
Grzegorz
07019ed928 Fix stitching action progress bar 2015-08-22 22:20:20 +02:00
Glowbal
7d2ca74402 Merge pull request #2220 from acemod/fixHitEffectRepair
Fix Hit Effect on Track and Wheel
2015-08-22 14:32:03 +02:00
jokoho48
f35b82ddb9 Code Cleanup Marker Module. 2015-08-22 14:08:35 +02:00
bux578
bfc3a4048e Merge pull request #2221 from gienkov/pl-translation-6
PL translation and fixes
2015-08-22 12:38:52 +02:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00
SilentSpike
b8b71e1c76 Merge pull request #2195 from jonpas/fixVDlimit
Fixed View Distance limit not applied on Video Settings
2015-08-21 23:47:02 +01:00
jonpas
295acddc7a Added view distance set on module load, so it is guaranteed to be set 2015-08-22 00:33:16 +02:00
gienkov
96c3b62cb9 zeus translation 2015-08-22 00:19:51 +02:00
gienkov
75c31c10fd optionsmenu and repair first version of translation 2015-08-22 00:17:01 +02:00
jokoho48
11f753f873 Fix Hit Effect on Track and Wheel 2015-08-22 00:13:29 +02:00
gienkov
cc430fc8c2 medical translation 2015-08-21 23:54:01 +02:00
gienkov
1bbf721ef6 main translation 2015-08-21 23:51:48 +02:00
gienkov
f22531cc59 cargo translation 2015-08-21 23:50:54 +02:00
gienkov
8f483ba8df fix medical_menu stringtable error 2015-08-21 23:46:05 +02:00
PabstMirror
cc9eee5609 Typo 2015-08-21 09:42:23 -05:00
PabstMirror
e0f20350a2 Merge branch 'master' into virtualExplosivesPlace 2015-08-21 09:16:15 -05:00