Commit Graph

6361 Commits

Author SHA1 Message Date
PabstMirror
d5a3c66b89 Minor Spelllings Fixes 2015-08-08 14:17:03 -05:00
PabstMirror
3664afcf90 search_privates.py: use new params command 2015-08-08 13:42:05 -05:00
PabstMirror
0719a3c1c6 Merge pull request #2055 from MikeMatrix/codeCleanupScopes
Code cleanup Scopes module
2015-08-08 11:42:40 -05:00
PabstMirror
7fe6c2fe1b Merge pull request #2063 from jonpas/fixMissingString
Fixed missing string
2015-08-08 11:19:27 -05:00
PabstMirror
8e905af444 Merge pull request #1977 from acemod/attachClickCooldown
Mouse cooldown for click to interact option
2015-08-08 11:18:20 -05:00
PabstMirror
451c88c601 Merge pull request #2027 from acemod/joinGroupTeamManagement
EnableTeamManagement setting for joinGroup
2015-08-08 11:16:20 -05:00
jonpas
8e3a961ee3 Fixed missing string 2015-08-08 18:11:28 +02:00
PabstMirror
7c7fb35cee Merge pull request #2036 from acemod/mapToolsOnOtherMaps
MapTools work on children of itemMap
2015-08-08 11:10:32 -05:00
Glowbal
054ac3443d Merge pull request #2062 from jonpas/removeDuplicatedStrings
Removed duplicated strings
2015-08-08 18:04:44 +02:00
jonpas
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
Glowbal
bd0593f8f4 fixed missing semi-column 2015-08-08 17:49:43 +02:00
Glowbal
be9726ba52 Merge pull request #1985 from acemod/hearingRingingModule
Add Ear Ringing setting to module
2015-08-08 17:44:11 +02:00
Glowbal
12f0808784 Merge branch 'master' into hearingRingingModule
Conflicts:
	addons/common/stringtable.xml
2015-08-08 17:42:18 +02:00
Glowbal
c69aa09d55 Merge pull request #2054 from MikeMatrix/codeCleanupSitting
Code cleanup of Sitting module
2015-08-08 17:00:07 +02:00
Glowbal
9fc94eefd9 Merge pull request #2006 from jokoho48/codeCleanupWinddeflection
Code cleanup Winddeflection module
2015-08-08 15:03:26 +02:00
Glowbal
a65495fb14 Merge pull request #2011 from jokoho48/codeCleanupBallistic
Code cleanup Ballistics module.
2015-08-08 15:00:08 +02:00
Glowbal
ff421db3df Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication
Headdirection based wind indication
2015-08-08 14:51:37 +02:00
Glowbal
66f2dfa31e Merge pull request #2059 from MikeMatrix/documentationFixWeaponselect
Updated function documentation of Weaponselect
2015-08-08 14:45:28 +02:00
Michael Braun
e4a4a942d0 Updated function documentation of Weaponselect 2015-08-08 14:40:23 +02:00
Glowbal
65c06551a5 Merge pull request #1652 from gienkov/patch-22
Fix checking vitals anim
2015-08-08 14:32:36 +02:00
Glowbal
d8d706eb04 Merge pull request #1974 from jokoho48/parachutePrivateScope
Fix that Reserve Parachute can get in Arsenal or in Crate
2015-08-08 14:25:40 +02:00
Glowbal
be00f7ffe4 Merge pull request #2000 from acemod/treatmentResetWeaponMode
Treatment reset weapon mode
2015-08-08 14:20:10 +02:00
Glowbal
94be0d9fbd Merge pull request #2008 from jokoho48/codeCleanupViewdistance
Code cleanup Viewdistance module
2015-08-08 14:18:45 +02:00
Glowbal
13f7d0f632 Merge pull request #2003 from jokoho48/codeCleanupWeaponselect
Code cleanup Weaponselect module
2015-08-08 13:32:45 +02:00
Glowbal
60b6540cbe Merge pull request #2040 from jonpas/slideshowFixes
Slideshow Fixes
2015-08-08 13:23:37 +02:00
jonpas
12399db0ac Merge branch 'master' into slideshowFixes
Conflicts:
	addons/slideshow/functions/fnc_createSlideshow.sqf
2015-08-08 13:00:11 +02:00
Michael Braun
680bbebc02 Fixed missing private in scopes 2015-08-08 11:25:45 +02:00
Glowbal
b798058ef8 Merge pull request #2032 from acemod/unloadVehicleBug
isTouchingGround is unreliable for ground vehicles
2015-08-08 11:04:09 +02:00
Glowbal
831af1bbf8 Merge pull request #2043 from MikeMatrix/keybindCategoryLocalization
Added localizations for keybinding categories
2015-08-08 10:59:34 +02:00
Glowbal
7c24d9dbad Merge pull request #2057 from jonpas/sittingFixes
Sitting Fixes
2015-08-08 10:58:47 +02:00
Glowbal
2951c9a965 Merge pull request #2046 from MikeMatrix/codeCleanupTripod
Code cleanup in Tripod module
2015-08-08 10:58:01 +02:00
Glowbal
02bffce4c4 Merge pull request #2047 from MikeMatrix/codeCleanupTacticalladder
Code cleanup in Tacticalladder module
2015-08-08 10:57:13 +02:00
Glowbal
df0e13b21c Merge pull request #2050 from MikeMatrix/codeCleanupSpottingscope
Cleanup code of Spottingscope module
2015-08-08 10:52:50 +02:00
Glowbal
6b256a604c Merge pull request #2051 from MikeMatrix/codeCleanupSlideshow
Code cleanup of Slideshow module
2015-08-08 10:52:08 +02:00
jonpas
52ac13273c Fixed #1937 - Made use of CfgMoves to make free-look head movement visible, Fixed grenade throwing while sitting 2015-08-08 02:13:14 +02:00
Michael Braun
8355558db1 Small readability improvement in slideshow 2015-08-08 01:18:48 +02:00
jonpas
9e64e8c2aa Increased sitting interaction distance - fixes #1950 2015-08-07 21:41:07 +02:00
jonpas
cc34a16e47 Added images size note to slideshow mission-tools documentation 2015-08-07 21:07:33 +02:00
jonpas
6a085a679f Added BI issue reference and mission-tools note about the issue 2015-08-07 20:52:02 +02:00
PabstMirror
a9ed1052dd vehLock - debug trace / type checking 2015-08-07 13:24:47 -05:00
PabstMirror
50adc7c096 Merge pull request #2004 from jokoho48/codeCleanupVehiclelock
Code cleanup Vehiclelock module
2015-08-07 13:01:56 -05:00
jonpas
256536467b Fixed no interaction menu support condition 2015-08-07 19:36:10 +02:00
Michael Braun
fb32bbf8de Code cleanup of scopes module 2015-08-07 16:43:06 +02:00
Glowbal
f21da3ead6 Merge pull request #2026 from acemod/cleanBandages
Clean bandages if no damage on hitpoint
2015-08-07 15:46:44 +02:00
Michael Braun
1cec4400b3 Missing count replacement in slideshow module 2015-08-07 15:44:41 +02:00
Michael Braun
d192f7eea4 Added parentheses back 2015-08-07 15:35:52 +02:00
Michael Braun
b2e7cf04c0 Fixed function argument documentation in slideshow 2015-08-07 15:19:59 +02:00
Michael Braun
60e4c2e601 Code cleanup of sitting module 2015-08-07 15:12:24 +02:00
Michael Braun
7839224aa2 Added Polish Keybind Category translations thanks to @gienkov 2015-08-07 13:01:36 +02:00
Michael Braun
fa56196fe3 Code cleanup of slideshow module 2015-08-07 12:11:34 +02:00