Commit Graph

6018 Commits

Author SHA1 Message Date
jokoho48
afee398b11 woops 2015-09-01 00:51:32 +02:00
jokoho48
5d612abd02 posible Fix for #2310 2015-09-01 00:42:13 +02:00
commy2
3362bbf0bf fix protection 1.50 ubc issues 2015-09-01 00:01:42 +02:00
commy2
5a164c5cdc fix UBC issues, simplify uniform hitpoint config 2015-08-31 23:36:59 +02:00
commy2
87cf7ded83 Merge pull request #2311 from acemod/322backpack
objectParent command replacing fnc_getBackpackAssignedUnit
2015-08-31 21:32:42 +02:00
commy2
e7d9e8c0dc Merge pull request #2312 from acemod/322opendoor3rdperson
increase reach in 3rd person for opening doors, fix #2301
2015-08-31 21:32:34 +02:00
commy2
aa1ad1bc2a Merge pull request #2313 from acemod/322ffvweaponselect
fix weapon select in ffv slots not working
2015-08-31 21:32:26 +02:00
commy2
9b6bc73c1a Merge pull request #2314 from acemod/322spottingscope
better animation for spotting scope, fix #1638
2015-08-31 21:32:17 +02:00
commy2
591327aaf3 Merge pull request #2315 from acemod/3220xgrenadebug
fix autoriflemen spawning with 0x frag grenade bug
2015-08-31 21:32:09 +02:00
commy2
80a0c93bdc Merge pull request #2316 from acemod/322customcamera
fix custom cameras (for intros) being broken with ACE, fix #2248
2015-08-31 21:32:02 +02:00
commy2
d85f96eac0 Merge pull request #2320 from acemod/322notonladder
disable all actions while being on a ladder by default, close #2289
2015-08-31 21:31:54 +02:00
commy2
e241c70a78 Merge pull request #2318 from acemod/322tripotmagsize
tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190
2015-08-31 21:31:44 +02:00
commy2
2a82b97b5a Merge pull request #2328 from acemod/322laserpointer
laserpointer with new command lineintersectssurface
2015-08-31 21:31:35 +02:00
commy2
37aec2b3c3 enable repairing while on ladder 2015-08-31 21:22:22 +02:00
PabstMirror
ba3ecf2a0a Merge pull request #2321 from acemod/HearingStuff
Hearing stuff
2015-08-31 13:24:29 -05:00
PabstMirror
38122ffeaf Merge pull request #2197 from acemod/mapOpenCloseEvents
Map open close events / MapTools Cleanup
2015-08-31 13:23:10 -05:00
commy2
f15805d1f3 setStructuralDamage function 2015-08-31 20:05:38 +02:00
commy2
e1d683d8dc laserpointer with new command lineintersectssurface 2015-08-31 17:31:37 +02:00
SilentSpike
397d77e5b5 Remove special goggles treatment of vehicle units
The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.
2015-08-31 15:25:40 +01:00
SilentSpike
543e829278 Fix goggles overlay for FFV seats
When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats
2015-08-31 14:56:51 +01:00
SilentSpike
5e57cad669 Merge pull request #2216 from acemod/isolateZeusMenuKeybind
Prevent CBA keybindings in zeus interface
2015-08-31 14:41:48 +01:00
SilentSpike
04269831e8 Consider modifier keys for zeus interaction hack
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
2015-08-31 14:40:31 +01:00
Glowbal
8c6f896164 fixed script error when canceling treatment actions 2015-08-31 13:00:17 +02:00
jokoho48
228eeab1a8 fix comments 2015-08-31 00:05:55 +02:00
jokoho48
4e6f289493 fix Function Names
fix Input
2015-08-30 23:40:53 +02:00
jokoho48
317706cf46 add Trace 2015-08-30 23:10:03 +02:00
jokoho48
bda274efff fix wrong config access point 2015-08-30 22:59:27 +02:00
PabstMirror
4be7411a05 Use "visibleMapChanged" event 2015-08-30 15:26:43 -05:00
commy2
7a4c37c085 disable all actions on ladders by default, close #2289 2015-08-30 22:03:45 +02:00
commy2
fae38a2232 tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190 2015-08-30 20:20:00 +02:00
commy2
c18af0d34b completely prevent ace_optics from interfering with any mission camera scripts 2015-08-30 19:30:44 +02:00
commy2
74dfd73167 fix issues with pip optics camera in virtual arsenal 2015-08-30 19:05:35 +02:00
commy2
8d589ea8f0 solution for custom cameras (for intros) being broken with ACE 2015-08-30 15:50:51 +02:00
commy2
fc6f97e09e fix autoriflemen spawning with 0x frag grenade bug 2015-08-30 13:30:21 +02:00
commy2
610bb7a1df better animation for spotting scope, fix #1638 2015-08-30 13:10:25 +02:00
commy2
58ec4a68cb fix weapon select in ffv slots not working 2015-08-30 12:01:13 +02:00
commy2
4682235d8a increase reach in 3rd person for opening doors, fix #2301 2015-08-30 11:13:26 +02:00
commy2
32300a0a80 objectParent command replacing fnc_getBackpackAssignedUnit 2015-08-30 10:45:14 +02:00
PabstMirror
910bb151e2 #1988 - Boost explosive hearing damage 2015-08-30 01:47:40 -05:00
PabstMirror
8307ccea96 firedNear - use new isKindOf 2015-08-30 01:37:14 -05:00
PabstMirror
2f54cfadbc Merge pull request #2146 from jokoho48/codeCleanupHearing
Code cleanup of Hearing module
2015-08-30 01:18:47 -05:00
jokoho48
05e07f37ac Merge branch 'master' of https://github.com/acemod/ACE3 into BackBlastEnhanced 2015-08-30 07:49:55 +02:00
jokoho48
d97cb8e78f add Missing Include 2015-08-30 07:49:12 +02:00
jokoho48
6d2e25d40b change some DFUNC to FUNC 2015-08-30 07:38:17 +02:00
jokoho48
35b6e04345 rewrite Caching in overpressure
update code to params command
update Comments
2015-08-30 07:35:58 +02:00
Grzegorz
5662e9eb62 proper name for stabilizer 2015-08-30 01:54:43 +02:00
gienkov
9187b31b92 pitot tube 2015-08-30 01:47:20 +02:00
gienkov
17f647f341 PL translation 2015-08-30 01:42:42 +02:00
KoffeinFlummi
6a17e3fa83 Merge remote-tracking branch 'origin/master' 2015-08-30 00:42:46 +02:00
KoffeinFlummi
5f63290508 Merge branch 'ptbr' 2015-08-30 00:42:31 +02:00
Glowbal
b968a32ea2 Merge pull request #2260 from acemod/updateMainConfig
Update Main Config File
2015-08-30 00:37:46 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
Glowbal
4bde554854 Merge branch 'master' into medical-adjustments
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
2015-08-29 23:49:58 +02:00
PabstMirror
f67809b18c Merge branch 'master' into mapOpenCloseEvents 2015-08-29 16:43:24 -05:00
PabstMirror
22f8b2e8c2 Merge pull request #2305 from acemod/attachEventHandlers
Attach event handlers
2015-08-29 16:35:51 -05:00
Glowbal
2fd30ba20c fixes #2274 2015-08-29 22:57:52 +02:00
Glowbal
602ef690fc Allow diagnose on torso #1879 2015-08-29 22:54:51 +02:00
Glowbal
ce42f5864f fix #2155 2015-08-29 22:53:08 +02:00
Glowbal
b291141d11 Should Be a better fix for #2298 2015-08-29 22:51:42 +02:00
Glowbal
183e872f1f Possible fix for #2298 2015-08-29 22:44:52 +02:00
PabstMirror
fa3a0213b7 Merge pull request #2249 from acemod/captiveFFV
Captive ffv animation fix + cleanup
2015-08-29 15:39:23 -05:00
Michael Braun
657157d767 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/hearing/functions/fnc_moduleHearing.sqf
2015-08-29 22:38:26 +02:00
Glowbal
998bc2d45a Merge pull request #2297 from acemod/addMoreHearingProtection
Add Hearing Protection to Helmets with Peltor Headsets
2015-08-29 22:34:59 +02:00
Joko
91a8463198 Merge pull request #2299 from acemod/FixTactialLadderAnimation
Fix Tactical Ladder Animation Clipping
Fixes #2287
2015-08-29 22:33:08 +02:00
SilentSpike
620136a1a7 Merge branch 'master' into spectator
Conflicts:
	AUTHORS.txt
2015-08-29 21:20:04 +01:00
PabstMirror
0b3b3871ff Merge pull request #2065 from acemod/hearingDisableZeus
Setting to disable hearing for zeus RC
2015-08-29 15:15:14 -05:00
PabstMirror
d06680e2a0 #1571 - Handle Null Attached Objects 2015-08-29 11:47:56 -05:00
SilentSpike
200f44d963 Adjust spectator camera speed based on height
Slows the camera movement close to the ground as it feels more natural when spectating units up close and such
2015-08-29 16:05:04 +01:00
PabstMirror
6eba898301 Merge pull request #2160 from acemod/updatingBaseClass150
realisticnames 1.50 Updating Base Class Changes
2015-08-29 09:55:25 -05:00
PabstMirror
321ca815a2 semi-colon 2015-08-29 09:52:28 -05:00
PabstMirror
f6c752045c Cleanup 2015-08-29 09:38:57 -05:00
jokoho48
8916b70fe1 Improve some Code 2015-08-29 15:29:02 +02:00
Glowbal
6796b3126d Staged work on fixing updating base classes for hitpoints 2015-08-29 12:59:28 +02:00
Glowbal
1e08244f21 Removed debug output 2015-08-29 12:59:11 +02:00
Glowbal
1a4736e663 Clean up 2015-08-29 12:01:00 +02:00
Glowbal
1c9e88f213 fixes #1964 2015-08-29 11:58:28 +02:00
Glowbal
d56f3cea81 Added pain and unconsciousness handling for new basic medical code 2015-08-29 11:58:03 +02:00
Glowbal
354e4410d1 Merge pull request #2268 from gienkov/pulse-enhancement
HR and BP enhancement
2015-08-29 11:47:00 +02:00
Glowbal
70c0edf436 Merge pull request #2283 from acemod/cargoCanInteract
Add canInteractWith checks for cargo
2015-08-29 11:45:50 +02:00
PabstMirror
007859d42e Attach - getin/out/killed event handlers (#2200 #2300) 2015-08-28 16:57:16 -05:00
jokoho48
3269114861 Fix Tactical Ladder Animation Clipping 2015-08-28 11:55:32 +02:00
bux578
19a6226ced add Hearing Protection to Helmets with Peltors 2015-08-28 09:10:58 +02:00
PabstMirror
80d18c468e Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup
wirecutters config for fences + cleanup
2015-08-27 16:01:31 -05:00
ViperMaul
a86ff93c16 Merge pull request #2052 from MikeMatrix/logMacros
ACE specific logging macros
2015-08-26 21:52:20 -07:00
Michael Braun
93106697ab Added debug log macros 2015-08-27 06:21:02 +02:00
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
6d27299883 Cleaned up spare parts collection after SettingsInitialized, Check if vehicle already in collection 2015-08-26 23:43:06 +02:00
jonpas
48e0f5757d Merge branch 'master' into trackToTrackedVehicles
Conflicts:
	addons/repair/stringtable.xml
2015-08-26 23:38:51 +02:00
jonpas
ef1b4cbd26 Merge branch 'master' into trackToTrackedVehicles
Conflicts:
	addons/repair/XEH_preInit.sqf
2015-08-26 23:33:05 +02: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
jonpas
8529e5c9b7 Merge branch 'master' into trackToTrackedVehicles 2015-08-26 21:25:08 +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
36aeb61d81 Fixed error caused by closing square bracket 2015-08-26 17:51:56 +02:00
Michael Braun
3dc3331d87 Replaced rogue format with FORMAT_# 2015-08-26 17:45:17 +02:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02: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
jonpas
c0379c7809 Updated with correct cargo events and settings category 2015-08-26 17:02:29 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +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
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +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
604a33f71b Merge branch 'master' into medical-adjustments 2015-08-26 10:13:44 +02:00
Glowbal
19bfa478d1 Revert use of param in action string 2015-08-26 10:13:30 +02:00
Glowbal
9488b6cc2c Merge branch 'master' into medical-adjustments 2015-08-26 10:08:39 +02:00
Glowbal
0d7e7fa0cc should be type of 2015-08-26 10:08:32 +02:00
Glowbal
307afc0922 Merge branch 'master' into medical-adjustments 2015-08-26 10:05:46 +02:00
Glowbal
81068e6086 fixed dragging getWeight 2015-08-26 10:05:30 +02:00
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
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
ca1b47beb5 Use correct module group 2015-08-23 19:54:55 +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
jokoho48
260b048da4 some more Improvements 2015-08-23 14:13:55 +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
jokoho48
fab4c6a67f fix Spelling Issues 2015-08-22 21:32:36 +02:00
jokoho48
19dd55147a Code Cleanup Medical Module (Part 4). 2015-08-22 19:47:23 +02:00
jokoho48
2d4ef16429 fix CTD 2015-08-22 18:54:51 +02:00
jokoho48
ff6c8a31be Code Cleanup Medical Module (Part 3). 2015-08-22 18:33:06 +02:00
jokoho48
10127ed957 Fix Typo 2015-08-22 17:10:19 +02:00
jonpas
18f5a2ca94 Renamed cargo events 2015-08-22 16:45:50 +02:00
jokoho48
21e0a9fff3 Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupMedical 2015-08-22 16:32:15 +02:00
jokoho48
c2d94239a2 Code Cleanup Medical Module (Part 2). 2015-08-22 16:26:53 +02:00
jokoho48
d09ca9ec8b Code Cleanup Medical Module (Part 1). 2015-08-22 16:25:10 +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
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
jonpas
ccd0a7bd88 Merge branch 'master' into trackToTrackedVehicles
Conflicts:
	addons/repair/stringtable.xml
2015-08-21 21:04:50 +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
SilentSpike
5112bd9bdf Merge pull request #2163 from acemod/add-objects-to-curator
Add objects to all curators
2015-08-21 13:53:45 +01:00
Glowbal
bf8318530e Merge pull request #2081 from acemod/close-med-menus-distance
Fixed #1893 - Menu closes when patient is more as 10 meters away
2015-08-21 14:20:41 +02:00
Glowbal
b3ee889cac Merge pull request #2113 from MikeMatrix/codeCleanupSafemode
Code cleanup Safemode module
2015-08-21 14:20:08 +02:00
Glowbal
f0792233ae Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack
Code Cleanup Magazine Repack Module
2015-08-21 14:09:55 +02:00
Glowbal
2f0ed4fba1 Merge pull request #2207 from jonpas/readmes
Added and Updated README.md files
2015-08-21 14:07:30 +02:00
Glowbal
26c172ff11 Merge pull request #2066 from acemod/fixDisableUserInput
Fix and enhancement of two common functions
2015-08-21 14:05:47 +02:00