Glowbal
|
c0562aaf6c
|
clean up debug messages
|
2015-08-08 20:31:19 +02:00 |
|
Glowbal
|
696546de5c
|
Finalized ACE medical menu settings
|
2015-08-08 20:22:19 +02:00 |
|
SilentSpike
|
d294989cb0
|
Allow chat use on input disabled listen server
Listen server technically doesn't have serverCommandAvailable.
|
2015-08-08 19:11:41 +01:00 |
|
PabstMirror
|
c6be0bbb8c
|
Merge branch 'master' into add-category-optionsmenu
Conflicts:
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
|
2015-08-08 12:39:14 -05:00 |
|
PabstMirror
|
feceff2746
|
Polish the stringtable
|
2015-08-08 12:36:42 -05:00 |
|
PabstMirror
|
0719a3c1c6
|
Merge pull request #2055 from MikeMatrix/codeCleanupScopes
Code cleanup Scopes module
|
2015-08-08 11:42:40 -05:00 |
|
Glowbal
|
4c7bcbb6fe
|
Added triage card display
|
2015-08-08 18:29:30 +02: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 |
|
Glowbal
|
31a5f8899b
|
Changed default keybinding value to be H
|
2015-08-08 18:16:25 +02:00 |
|
PabstMirror
|
451c88c601
|
Merge pull request #2027 from acemod/joinGroupTeamManagement
EnableTeamManagement setting for joinGroup
|
2015-08-08 11:16:20 -05:00 |
|
Glowbal
|
bb79feeaf1
|
Clean up duplicate files
|
2015-08-08 18:16:11 +02: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
|
364e0455ee
|
Merge branch 'master' into medical-menu
|
2015-08-08 17:55:43 +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
|
e8961e3d0e
|
Use display instead of just idc
|
2015-08-08 13:41:25 +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 |
|
Glowbal
|
872c257901
|
Used the wrong string macro.
|
2015-08-08 13:21:13 +02:00 |
|
Glowbal
|
25597704ed
|
Added fail save for incorrect string value input
|
2015-08-08 13:07:40 +02:00 |
|
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 |
|