Commit Graph

5716 Commits

Author SHA1 Message Date
Glowbal
65e16da998 fix missing semi column and bracket 2015-08-26 09:10:29 +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
gienkov
6a123020d2 fail to find BP on limbs with TQ on 2015-08-26 08:55:50 +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
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
jokoho48
ca71dd43e1 Code Cleanup MicroDagr Module 2015-08-26 05:31:33 +02:00
Grzegorz
b8a29bfd44 @jokoho482 suggestion 2015-08-26 03:00:43 +02:00
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
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
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
jokoho48
8d29170551 fixing Spelling Issues
Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN
2015-08-25 19:33:10 +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
jokoho48
2af486ab6b Update Main Config File 2015-08-25 18:34:10 +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
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
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
Grzegorz
288457d366 fix 2015-08-24 17:43:02 +02:00
gienkov
0fa10045d2 pl translation of spectator 2015-08-24 14:35:15 +02:00
jokoho48
644c13c971 fix Typo
Remove macro GETVAR
2015-08-24 13:43:11 +02:00
Glowbal
b14dc7cb02 Merge pull request #2242 from jonpas/fixSlideshowModule
Allow spaces in slideshow module
2015-08-24 09:38:10 +02: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
d3db5ad2ed Cleanup 2015-08-24 00:07:40 -05:00
PabstMirror
40634318f0 Move RemoveHandcuffs to Main (always blocked by hands) 2015-08-23 23:41:35 -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
SilentSpike
152faf6388 Improve spectator interface entry and exit
- Use a display rather than a dialog (contextually makes more sense).
- Move the entry/exit functionality to the setSpectator function. Preserves the handleInterface function for purely display related events and makes more sense.
- Fix missing semi-colon
2015-08-24 00:43:20 +01:00
PabstMirror
2e1d734420 #2238 - use config for fences + cleanup 2015-08-23 18:39:08 -05:00
jonpas
6a1b8cc359 Changed to LSTRING 2015-08-24 01:25:00 +02:00
jonpas
d33834261f Removed debug 2015-08-24 01:14:59 +02:00
jonpas
e368ae28f5 Fixed localization on same type hitpoints 2015-08-24 01:13:42 +02:00
jonpas
396e01cd6e Added string checking for less needed string multiplicates 2015-08-24 01:04:57 +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
PabstMirror
a82e5b5436 Fix Colors + Debug Trace 2015-08-23 14:25:41 -05:00
jonpas
0fc9a33d38 Shortened sub-action text localization 2015-08-23 21:11:45 +02:00
jonpas
e08bf59ac2 Removed 'Repair' word from sub-actions 2015-08-23 21:09:36 +02: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
PabstMirror
8ca06a9a76 More FFV animation stuff 2015-08-23 12:32:46 -05:00
Steven Koeberich
d5a1a99f90 Update stringtable.xml
corrected spelling
2015-08-23 18:58:13 +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
PabstMirror
b5fb0daa9b Merge branch 'master' into captiveFFV 2015-08-23 10:46:49 -05: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
69df301e67 Replace one more macro 2015-08-23 02:29:51 -05: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
Grzegorz
33889fa46b Increase "load in bodybag" action time
Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).
2015-08-23 00:13:09 +02:00
Joko
3eae83439b Merge pull request #2231 from gienkov/patch-26
Fix stitching action progress bar
2015-08-22 22:59:46 +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
jonpas
18f5a2ca94 Renamed cargo events 2015-08-22 16:45:50 +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
21b0ee087a Add spectator UI interrupt system
A public API system to allow external systems to interrupt and resume the spectator interface. Also made use of it for the escape menu and zeus support.
2015-08-22 00:26:43 +01: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