PabstMirror
|
512011a756
|
Remove Debug Code
|
2015-08-10 15:16:16 -05:00 |
|
PabstMirror
|
47b18b2b39
|
Cleanup disposables also fix #2090 (alt add for AI)
|
2015-08-10 15:12:42 -05:00 |
|
Glowbal
|
e5eaefafdb
|
fixed #2097 - script error because of global variable in params
|
2015-08-10 09:51:14 +02:00 |
|
jokoho48
|
f3fbf0c5ff
|
Code cleanup of Finger module is Incomming.
|
2015-08-10 00:19:27 +02:00 |
|
Glowbal
|
0c2c71e70e
|
Merge pull request #2056 from MikeMatrix/codeCleanupSandbag
Code cleanup of Sandbag module
|
2015-08-09 23:56:25 +02:00 |
|
jokoho48
|
5db5e34edf
|
Fix Git Shit
|
2015-08-09 23:50:02 +02:00 |
|
jokoho48
|
a3fd072328
|
Make New Model
|
2015-08-09 22:44:39 +02:00 |
|
PabstMirror
|
dc06927418
|
missing ;
|
2015-08-09 13:57:39 -05:00 |
|
PabstMirror
|
6755b8766a
|
Merge pull request #2085 from jokoho48/codeCleanupDisposable
Code cleanup of Disposable module
|
2015-08-09 13:24:18 -05:00 |
|
Glowbal
|
9c8a03b0b3
|
fixes #2070 - medication is not translated on activity log
|
2015-08-09 20:12:31 +02:00 |
|
Glowbal
|
aa4840d860
|
fixes #2075 - menu doesn't show which bodypart is selected on Basic medical
|
2015-08-09 20:08:45 +02:00 |
|
Glowbal
|
298f64a7bf
|
fixes #2078
1. Fixed incorrect activity string for tourniquet
2. Fixed incorrect macro usage, should have grabbed variables from medical module.
|
2015-08-09 20:07:06 +02:00 |
|
PabstMirror
|
207c002f3a
|
params
|
2015-08-09 13:02:08 -05:00 |
|
PabstMirror
|
5723c5eaac
|
Merge branch 'master' into addMainAction
|
2015-08-09 13:00:56 -05:00 |
|
jokoho48
|
fb56517099
|
Merge branch 'master' of https://github.com/acemod/ACE3 into repair
|
2015-08-09 18:58:02 +02:00 |
|
Glowbal
|
e4abf7c8cc
|
added spare wheel to config
|
2015-08-09 18:26:49 +02:00 |
|
Glowbal
|
ed6a53a402
|
Attempt at repairing tracks. Improved repair wheel actions
|
2015-08-09 18:08:53 +02:00 |
|
Glowbal
|
872d026cd0
|
All repair actions are now functional
|
2015-08-09 17:23:32 +02:00 |
|
Glowbal
|
9adbb07367
|
Moved replace and repair wheel actions into the repair action framework
|
2015-08-09 15:53:52 +02:00 |
|
jokoho48
|
fab0eee5dd
|
corrected some small point
|
2015-08-09 15:28:11 +02:00 |
|
Glowbal
|
58fc69c2a6
|
Updated litter configuration. Closes #2002
|
2015-08-09 08:59:04 +02:00 |
|
PabstMirror
|
ec97cd2edd
|
Fix wheel texture
|
2015-08-09 01:58:49 -05:00 |
|
PabstMirror
|
4b603ff46f
|
Localization, params
|
2015-08-09 01:54:44 -05:00 |
|
PabstMirror
|
0e17bebd23
|
Merge branch 'master' into repair
|
2015-08-09 00:33:08 -05:00 |
|
jokoho48
|
b23f9c0de2
|
Code cleanup of Disposable module
|
2015-08-09 05:25:19 +02:00 |
|
jokoho48
|
156609aab2
|
Code cleanup of Disarming module
|
2015-08-09 05:18:26 +02:00 |
|
PabstMirror
|
7624a459eb
|
Merge pull request #2010 from jokoho48/codeCleanupInteractMenu
Code cleanup Interact_menu module
|
2015-08-08 21:35:54 -05:00 |
|
PabstMirror
|
95d88b920e
|
#2079 - RemoveTourniquet doesn't require any items
|
2015-08-08 21:25:36 -05:00 |
|
PabstMirror
|
5628ce1bcd
|
#2074 - Medical Menu Module not unique
|
2015-08-08 20:27:56 -05:00 |
|
PabstMirror
|
879826de8b
|
Merge pull request #2077 from jonpas/fixNametagsString
Fixed incorrect string path in nametags
|
2015-08-08 19:58:52 -05:00 |
|
PabstMirror
|
c949daae1f
|
OptionMenu C->LStrings
|
2015-08-08 19:57:57 -05:00 |
|
jonpas
|
7d36d80072
|
Fixed incorrect string path in nametags
|
2015-08-09 01:23:20 +02:00 |
|
Glowbal
|
2b3c936e99
|
count should be a foreach
|
2015-08-09 00:41:43 +02:00 |
|
Glowbal
|
c7ac190f58
|
Finalized settings
|
2015-08-09 00:21:59 +02:00 |
|
Glowbal
|
54ad9d1444
|
Merge branch 'master' into require-surrender-captive
|
2015-08-08 23:21:00 +02:00 |
|
Glowbal
|
493254619c
|
Merge pull request #2039 from acemod/medical-menu
Medical menu
|
2015-08-08 23:11:11 +02:00 |
|
Glowbal
|
f02a00ae69
|
Merge pull request #2058 from acemod/add-category-optionsmenu
Add category optionsmenu #852
|
2015-08-08 22:59:19 +02:00 |
|
PabstMirror
|
d5a3c66b89
|
Minor Spelllings Fixes
|
2015-08-08 14:17:03 -05:00 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|