Commit Graph

6564 Commits

Author SHA1 Message Date
Glowbal
e7a607ca35 Finalized server export category select 2015-08-08 13:07:22 +02:00
jonpas
12399db0ac Merge branch 'master' into slideshowFixes
Conflicts:
	addons/slideshow/functions/fnc_createSlideshow.sqf
2015-08-08 13:00:11 +02:00
Glowbal
c6af8aaeb6 Localized category name for interaction menu related settings 2015-08-08 11:52:53 +02:00
Glowbal
e9151d921c Localized category names for medical settings 2015-08-08 11:52:37 +02:00
Glowbal
0601aa80bb Localized All categories string
Enabled categories for config export menu
2015-08-08 11:52:23 +02:00
Glowbal
38b9fdab4d fixes #1948 2015-08-08 11:51:31 +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
Michael Braun
940cd8e921 Small documentation correction in sandbag module 2015-08-08 02:28:27 +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
d1a2bec7fd Code cleanup of sandbag module 2015-08-08 02:00:00 +02:00
Michael Braun
8355558db1 Small readability improvement in slideshow 2015-08-08 01:18:48 +02:00
Glowbal
10169276a2 Merge branch 'add-category-optionsmenu' of github.com:acemod/ACE3 into add-category-optionsmenu 2015-08-07 22:10:09 +02:00
Glowbal
4895c5b57e fixed wrong index used 2015-08-07 22:09:59 +02:00
PabstMirror
a3a481f96d Some fixes 2015-08-07 15:08:52 -05:00
jonpas
9e64e8c2aa Increased sitting interaction distance - fixes #1950 2015-08-07 21:41:07 +02:00
Glowbal
d125b9ad9c Add category to options menu. Initial work. 2015-08-07 21:14:45 +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
Glowbal
cd5b5f1d24 clean up of the config 2015-08-07 20:15:09 +02: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
Glowbal
f21023b4ee Added logs for quick view and activity view separate from the activity log for medical menu 2015-08-07 19:11:57 +02:00
Glowbal
d7db2e159c Split up into activity and quick view logs 2015-08-07 19:11:27 +02:00
Glowbal
471e8d27df Fixed clean up 2015-08-07 19:11: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
Glowbal
27ec3adeac Added stringtable entries requireSurrender setting 2015-08-07 14:51:56 +02:00
Glowbal
997ac53c11 Added isSurrendering check 2015-08-07 14:49:01 +02:00
Glowbal
4c935bb504 Added setting for require surrender 2015-08-07 14:46:28 +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
Michael Braun
2f5f282431 Cleanup code of Spottingscope module 2015-08-07 11:47:23 +02:00
bux578
d636b4b5c7 Merge pull request #2038 from jonpas/docFixes
Documentation Fixes
2015-08-07 08:53:29 +02:00
Glowbal
40e260b36e Merge pull request #2042 from MikeMatrix/cleanupMedicalMenu
Cleanup for medical_menu PR #2039
2015-08-07 08:29:58 +02:00
Michael Braun
0fafe27da9 Code cleanup in Tacticalladder module 2015-08-07 08:19:15 +02:00
Michael Braun
ef01660ab3 Code cleanup in Tripod module 2015-08-07 08:07:10 +02:00
Michael Braun
c6cb18749d Fixed translation typo 2015-08-07 05:51:26 +02:00
Michael Braun
d9eb7a3d2c Added localizations for keybinding categories 2015-08-07 05:48:51 +02:00