ViperMaul
d38cb31240
Merge pull request #2109 from acemod/pushSubmaine
...
Push SDV sub, cleanup push
2015-08-26 21:03:46 -07:00
PabstMirror
bc016eac4c
1.50 - use new didJip command (Ref #2241 )
2015-08-26 22:39:27 -05:00
ViperMaul
5ea98143e2
Merge pull request #2211 from jonpas/integrateAsdg
...
Integrated ASDG JR Optional
2015-08-26 17:53:32 -07:00
jonpas
6a6c5008c0
Merge branch 'master' into repairHitpointStrings
...
Conflicts:
addons/repair/functions/fnc_doRepair.sqf
2015-08-26 23:29:36 +02:00
Glowbal
f7679b45ad
Merge pull request #2246 from jonpas/repairHitpointGroups
...
Repair Hitpoint Groups Framework
2015-08-26 23:27:08 +02:00
PabstMirror
9c8e9732ed
Add canInteractWith checks for cargo
2015-08-26 16:26:08 -05:00
jonpas
ce8da8d720
Fixed Full Repair available even when vehicle is already fully repaired
2015-08-26 23:09:46 +02:00
jonpas
b6d5db9157
Reverted IGNORED_HITPOINTS, Added Taru glasses to it
2015-08-26 23:09:04 +02:00
jonpas
cc70580a93
Improved comments
2015-08-26 22:51:41 +02:00
jonpas
e4123c9730
Added 2 strings, changed 1
2015-08-26 22:44:30 +02:00
PabstMirror
ca991712e8
Merge pull request #2270 from acemod/codeCleanUpMicroDagr
...
Code Cleanup MicroDagr Module
2015-08-26 11:03:22 -05:00
PabstMirror
4cf81b493a
Fix stringtable and more cleanup
2015-08-26 11:00:59 -05:00
Michael Braun
9ca19def70
Added autoformatting variations for log macros
2015-08-26 17:09:31 +02:00
jonpas
dc2e146e8b
Merge branch 'master' into repairHitpointStrings
...
Conflicts:
addons/repair/functions/fnc_addRepairActions.sqf
2015-08-26 17:04:05 +02:00
Michael Braun
fd204d972d
Fixed issue with ERROR conflicting with log level input
2015-08-26 16:45:28 +02:00
Michael Braun
5f6584ba3f
Added Log format macros for use with not printing it to the log.
2015-08-26 15:53:03 +02:00
ulteq
f1d41731fb
Merge pull request #2149 from jokoho48/codeCleanupHuntIR
...
Code cleanup of HuntIR module
2015-08-26 15:48:29 +02:00
Michael Braun
a17d94c213
Removed semicolon of log macro
2015-08-26 14:12:17 +02:00
Michael Braun
5a0e95dcf0
Simplified log macros
2015-08-26 14:04:17 +02:00
Grzegorz
5ad0e192c3
Fix being able to TQ torso
2015-08-26 11:18:54 +02:00
Glowbal
19bfa478d1
Revert use of param in action string
2015-08-26 10:13:30 +02:00
Glowbal
0d7e7fa0cc
should be type of
2015-08-26 10:08:32 +02:00
Glowbal
81068e6086
fixed dragging getWeight
2015-08-26 10:05:30 +02:00
Glowbal
1a0abf31fd
fix global variable in local name space
2015-08-26 09:11:43 +02:00
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
