Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,736 Commits 73 Branches 88 Tags 752 MiB
a139a3cccc
Commit Graph

5531 Commits

Author SHA1 Message Date
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
3cac137851 Fixed #1893 - Menu closes when patient is more as 10 meters away 2015-08-09 09:14:42 +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
gienkov
ce99404200 move english strings from original to english, remove original 2015-08-09 01:52:22 +02:00
gienkov
1c0a6fb457 PL translation of common, medical_menu, optionsmenu 2015-08-09 01:47:55 +02: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
gienkov
6bd4fcc4fd Fix stringtable error 2015-08-08 23:39:29 +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
SilentSpike
416d559354 Expand common isFeatureCameraActive function 
The function is currently only used by ace_goggles and it makes sense to expand it to detect if any common feature camera is active rather than just BI cameras
 2015-08-08 20:51:24 +01: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
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
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
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
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
Michael Braun
5f313c75d5 Cleanup of medical_menu 2015-08-07 05:37:41 +02:00
jonpas
8b802006a4 Moved no interaction menu support inside the function, made code run selectively on server/clients, fixes #2037, closes #1945 2015-08-07 00:32:12 +02:00
Glowbal
abaf43be11 Selection restrictions 2015-08-07 00:09:40 +02:00
Glowbal
9b380315e5 First working version of the medical menu 2015-08-06 23:51:17 +02:00
Glowbal
5ac2972573 Added local event upon successful treatment. 2015-08-06 23:50:44 +02:00
Glowbal
4b5632a8f6 Added categories and missing displayName entries 2015-08-06 23:50:23 +02:00
jonpas
2e386038b7 Added support without ace_intract_menu 2015-08-06 23:43:18 +02:00
PabstMirror
016f45f0e8 fix speling 2015-08-06 15:41:24 -05:00
PabstMirror
598c1766d8 Merge pull request #2017 from jokoho48/codeCleanupCaptives 
Code cleanup of the Captives module.
 2015-08-06 14:02:50 -05:00
PabstMirror
7ef13cd546 Merge pull request #2009 from jokoho48/codeCleanupVehicle 
Code cleanup Vehicle module
 2015-08-06 13:24:35 -05:00
PabstMirror
f1d44972c9 Attach fix and param trace 2015-08-06 13:17:59 -05:00
PabstMirror
b5a6e1e883 Merge pull request #2013 from jokoho48/codeCleanupAttach 
Code cleanup of the Attach module.
 2015-08-06 12:50:43 -05:00
PabstMirror
6086553fce Move DoNotForce to common 2015-08-06 12:24:56 -05:00
PabstMirror
d8c36663da #2033 - MapTools work on children of itemMap 2015-08-06 12:14:45 -05:00
jokoho48
87b9b5019c AB Performance Optimization (Part 8) 2015-08-06 13:35:55 +02:00
jokoho48
15a1a0d535 AB Performance Optimization (Part 7) 2015-08-06 10:58:07 +02:00
PabstMirror
e45bd43e5e CreateLitter / syncEvents performance fixes 2015-08-06 00:28:43 -05:00
PabstMirror
0bd1e1afce #2024 - EnableTeamManagement setting for joinGroup 2015-08-05 18:02:57 -05:00
Michael Braun
d16a33bee4 Fixed issue with params being incorrectly being parsed in Weaponselect 2015-08-06 00:36:28 +02:00
PabstMirror
6ab72e905c #1807 - Clean bandages if no damage on hitpoint 2015-08-05 17:32:00 -05:00
ViperMaul
d3d3ea756d isTouchingGround is unreliable for ground vehicles 
#2020
 2015-08-05 11:48:04 -07:00
PabstMirror
7203bb2a3d Cleanup Debug, Limit Satchel Mass 2015-08-05 12:22:43 -05:00
PabstMirror
a6292db1e8 #2018 - Dead Mans Switch / unconscious 2015-08-05 11:54:45 -05:00
jokoho48
0ab865171d AB Performance Optimization (Part 6) 
Add some todo comments
 2015-08-05 18:50:37 +02:00
PabstMirror
72273c5ad0 Merge branch 'master' into virtualExplosivesPlace 2015-08-05 11:36:58 -05:00
jokoho48
c4e4f184ff AB Performance Optimization (Part 5) 2015-08-05 18:33:28 +02:00
Grzegorz
fb072811fc Proper PL concertina wire translation 2015-08-05 14:49:20 +02:00
SilentSpike
d2f7913c9f Merge pull request #2005 from jokoho48/codeCleanupZeus 
Code cleanup Zeus module
 2015-08-05 12:38:02 +01:00
Michael Braun
9eb560ff3d AB Performance Optimization (Part 4) 2015-08-05 10:28:02 +02:00
Michael Braun
8fbcdfec5a Fixed missing bracket and parameter list issue in AB 2015-08-05 10:04:24 +02:00
Michael Braun
1b488a17b5 Fixed typo that slipped into the code 2015-08-05 08:36:01 +02:00
ViperMaul
78d4da85cd Updated version to 3.2.2 2015-08-04 21:36:03 -07:00
Michael Braun
441baf3f86 Fixed documentation typo in Vehicles module 2015-08-05 06:02:21 +02:00
Michael Braun
eca7f83cca AB Performance Optimization (Part 3) 2015-08-05 06:01:38 +02:00
Michael Braun
b8f1fa82ae AB Performance Optimization (Part 2) 2015-08-05 05:19:08 +02:00
Michael Braun
f6bc361734 Minimal performance improvement and fixed missing semicolon 2015-08-05 05:04:34 +02:00
Michael Braun
6b58b0b3bd AB Performance Optimization and documentation cleanup 2015-08-05 05:01:30 +02:00
jokoho48
c7e104437f Update Docu Comments in AB 2015-08-05 04:38:04 +02:00
jokoho48
12aa0b5584 revert Merge Issue 2015-08-05 04:27:11 +02:00
jokoho48
d95bc3c299 AB Performance Optimization (Part 1) 2015-08-05 04:13:36 +02:00
jokoho48
3a2963c252 Fixed mission semicolon 2015-08-05 02:09:51 +02:00
jokoho48
24dd320c3c Updated parameterization in Captives module. 2015-08-05 01:15:20 +02:00
jokoho48
469445a030 Updated parameterization in Ballistics module. 2015-08-05 01:14:03 +02:00
jokoho48
57d484d382 Updated parameterization in Backpack module. 2015-08-05 01:12:55 +02:00
jokoho48
3ea545782f Updated parameterization in Attach module. 2015-08-05 00:47:31 +02:00
Michael Braun
77e62946ae Updated parameterization in Interact_menu module. 2015-08-05 00:47:18 +02:00
jokoho48
7a0a1ead6e Updated parameterization in Advanced Ballistics module. 2015-08-05 00:32:48 +02:00
Michael Braun
1b7f7534da Small correction 2015-08-05 00:16:23 +02:00
Michael Braun
820d1c50a5 Small correction 2015-08-05 00:13:50 +02:00
Michael Braun
13b7e7ae72 Updated parameterization in Zeus module. 2015-08-05 00:10:54 +02:00
Michael Braun
f5a497332a Updated parameterization in Winddeflection module. 2015-08-04 23:52:16 +02:00
Michael Braun
d51d87ba2c Updated parameterization in Weaponselect module. 2015-08-04 23:35:47 +02:00
Michael Braun
ade6c99dac Updated parameterization in Viewdistance module. 2015-08-04 23:33:03 +02:00
Michael Braun
84be21c64e Updated parameterization in Vehicle module. 2015-08-04 23:30:51 +02:00
Michael Braun
2423798753 Updated parameterization in Vehiclelock module. 2015-08-04 23:18:29 +02:00
Glowbal
275b0c4300 Merge branch 'release' 
Conflicts:
	README.md
	addons/finger/stringtable.xml
 2015-08-04 22:29:05 +02:00
Glowbal
43f8c87387 Merge pull request #1972 from jokoho48/MedicalModelUpdate 
Medical Litter model update
 2015-08-04 20:06:51 +02:00
ViperMaul
8ac98ed950 Better immersion through using hideUnit 2015-08-04 07:43:42 -07:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
710135ae3f Opps 2015-08-03 21:49:16 -05:00
PabstMirror
fa49842c53 #1866 - Restore weapon mode after treatment 2015-08-03 19:57:49 -05:00
PabstMirror
52130d5a45 Switch to some already translated CSTRINGs 2015-08-03 15:52:35 -05:00
PabstMirror
98649e2bdf Additional output to dumpPerformanceCounters 
For `[] call ace_common_fnc_dumpPerformanceCounters`   Requires `#define
ENABLE_PERFORMANCE_COUNTERS`
 2015-08-03 13:53:44 -05:00
SilentSpike
17e6aca0c8 Fix ace_map changes to compass display object 
1. RscDisplayDiary doesn't even have a compass object that needs to be changed
2. The briefing displays (RscDisplayGetReady, RscDisplayClientGetReady, RscDisplayServerGetReady) were all inheriting from base class RscDisplayMainMap and re-defined the compass object subclasses was overriding that subclass inheritance chain (producing missing idc errors in the .rpt).
 2015-08-03 13:30:08 +01:00
PabstMirror
93d2035fed #1984 - Always make sure ACE_MainActions exists 
Also add debuging output when adding action with no parent
 2015-08-02 15:33:16 -05:00
ViperMaul
59a3e62d69 Attempt to improve the immersion of the magic 2015-08-02 10:44:49 -07:00
PabstMirror
f99e8ba5bc Don't allow forcing the tinnitus effect 2015-08-02 12:30:35 -05:00
PabstMirror
c0fb2e1b65 Add Ear Ringing setting to module (Ref #1981) 2015-08-02 12:15:26 -05:00
KoffeinFlummi
261cd42202 Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge 2015-08-02 17:14:41 +02:00
KoffeinFlummi
8f848947ac Merge https://github.com/Clon1998/ACE3 into german-merge 2015-08-02 17:11:06 +02:00
Glowbal
4dfef8025b Medical menu port from CSE 2015-08-02 16:56:27 +02:00
PabstMirror
eb5ac22b8d Cleanup 2015-08-02 01:05:28 -05:00
Michael Braun
f3e8a8ae42 Updated wind indicator to use head direction instead of player direction. Fixes #1892. 2015-08-02 03:29:53 +02:00
ViperMaul
876a039e36 Disable headbugfix for Handcuffed/Surrender,unconscious,water surface and log the situation locally and on server. 2015-08-01 18:01:35 -07:00
PabstMirror
5bcc867bac #1785 - Handle option for all "deploy" actions 2015-08-01 18:26:38 -05:00
PabstMirror
c5a371e9b6 #1965 - Mouse cooldown for click to interact option 2015-08-01 15:07:09 -05:00
jokoho48
d0d585d0f5 Fix that Parachute can get in Arsenal or in Crate 2015-08-01 20:47:40 +02:00
Glowbal
19a4f3fbb1 Merge pull request #1954 from acemod/improve-adv-med-pain 
Improvement for handling minor levels of pain in advanced medical
 2015-08-01 19:05:47 +02:00
jokoho48
ee11622cd5 Fix Position 2015-08-01 16:10:08 +02:00
jokoho48
9d8daf84a4 add New Medical Models 2015-08-01 15:46:25 +02:00
SilentSpike
f6d8625fcb Transfer zeus module fixes from master into hotfix 2015-08-01 12:55:33 +01:00
Glowbal
02cfbeda8c Updated version to 3.2.1 2015-08-01 12:10:42 +02:00
Glowbal
b33d377b9d Merge pull request #1940 from acemod/fixRemoveAction 
#1939 - Fix Remove Action From Class
 2015-08-01 11:54:41 +02:00
PabstMirror
6ea1b95179 #1939 - Fix Remove Action From Class 2015-08-01 11:53:49 +02:00
bux578
1ad1a4b561 rename fingering to pointing 2015-08-01 11:49:28 +02:00
PabstMirror
fb34efdd04 Cleanup stringtable phrasing 2015-08-01 11:48:41 +02:00
Glowbal
a2eeff53a8 Merge pull request #1960 from acemod/laserHandleWeirdData 
Laser - Handle Bad Data Returns
 2015-08-01 11:41:04 +02:00
Glowbal
1878d448ae Merge pull request #1968 from acemod/fixBftModule321 
Fix BFT Module / Settings (for 3.2.1)
 2015-08-01 11:39:01 +02:00
PabstMirror
efb1f356db Cleanup stringtable phrasing 2015-08-01 01:30:54 -05:00
PabstMirror
2d051188a7 #1957 - Fix BFT Module / Settings (for 3.2.1) 2015-08-01 00:01:33 -05:00
PabstMirror
1d82a3c193 #1962 - Fix Changes in Wind Deflection s in AB 2015-07-31 23:39:05 -05:00
SilentSpike
e147138274 Update setUnconscious module with to be indefinite 
The zeus toggle unconscious module was using the default value for minimum unconscious time when it should have been indefinite (to act as a toggle)
 2015-07-31 17:32:13 +01:00
PabstMirror
822115214f Laser - Handle Bad Data Returns 2015-07-31 03:06:27 -05:00
SzwedzikPL
eb6abd69b8 default laser code down keybind fix 2015-07-30 22:37:08 +02:00
Glowbal
ca2a16af02 fix #1946 2015-07-30 18:21:24 +02:00
Glowbal
a4d5d9cb27 Possible improvement for handling minor levels of pain in advanced medical 2015-07-30 17:43:52 +02:00
SilentSpike
67e5e31394 Change zeus modules to run globally 
Zeus modules were only running on the *server* rather than the local machine. This resulted in the variable used to cache the object zeus has its cursor over not existing and therefore the modules didn't work at all.
 2015-07-29 12:25:04 +01:00
PabstMirror
6f90185f18 #1939 - Fix Remove Action From Class 2015-07-28 17:26:23 -05:00
ViperMaul
63dd19825b moveInAny seems to work better than moveInDriver. WIP 2015-07-28 13:56:22 -07:00
PabstMirror
214fda074a Merge branch 'master' into virtualExplosivesPlace 2015-07-28 15:48:37 -05:00
PabstMirror
bfd3aa71c4 Manual Fix #1931 2015-07-28 15:25:52 -05:00
ViperMaul
626a9cf5f9 Disable headBugFix if unconscious 2015-07-28 13:06:58 -07:00
SilentSpike
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
PabstMirror
9b551e3fdf #1931 - Fix Explosives Module Strings 2015-07-28 14:42:23 -05:00
Glowbal
6289601b4e Merge pull request #1935 from jokoho48/ParachuteFix 
change form addBackpack to addBackpackGlobal
 2015-07-28 20:11:42 +02:00
Glowbal
7a65af4926 Merge pull request #1928 from acemod/headbugfix 
Headbugfix
 2015-07-28 20:10:51 +02:00
Joko
46531b916a change form addBackpack to addBackpackGlobal 2015-07-28 20:08:38 +02:00
Joko
baa1aab257 Fix Spelling 2015-07-28 19:24:34 +02:00
Joko
b2eeaacfc1 Fix Double Config Entry 2015-07-28 18:51:17 +02:00
Joko
55cac4b6d9 posible fix for #1932 2015-07-28 18:36:13 +02:00
ViperMaul
92940ea1a9 Removed improper translations 
#1738
 2015-07-28 15:17:22 +01:00
ViperMaul
675996d67b Adding HeadBugFix button to the ACE Options dialog (missing file) 
#1738
 2015-07-28 15:17:20 +01:00
ViperMaul
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01:00
SilentSpike
c73eef28ed Pushing back ace_spectator to feature branch 2015-07-27 21:25:39 +01:00
Glowbal
5ec59045c1 Default disable sitting 2015-07-27 22:00:30 +02:00
Glowbal
7d30bc53ed Removed non chairs 2015-07-27 21:59:38 +02:00
SilentSpike
47d96835c6 Fix arrayIntersect oversight 2015-07-27 18:32:21 +01:00
Grzegorz
d23cab06aa + and - 2015-07-27 13:20:07 +02:00
PabstMirror
ceb12662e0 Version To 3.2.0 2015-07-27 02:05:58 -05:00
ViperMaul
4f53bdefb9 Suppress debug in fnc_unloadPersonLocal.sqf 2015-07-26 23:54:42 -07:00
ViperMaul
9a98530392 Add support for loading unconscious into boats, refs #1729 2015-07-26 18:33:25 -07:00
ViperMaul
6142d99626 Add support for loading unconscious into co-pilot seat 
fixes #1727
 2015-07-26 18:20:36 -07:00
gienkov
5136215e79 finger, parachute and spectator translation 2015-07-27 01:46:58 +02:00
gienkov
5bb1dded4b Merge remote-tracking branch 'origin' into pl-translation-4 2015-07-27 00:47:54 +02:00
PabstMirror
bf4e95e750 Merge pull request #1548 from acemod/fingering 
Fingering
 2015-07-26 16:47:41 -05:00
PabstMirror
4f9dba61ee Mk6 - Misc cleanup 2015-07-26 16:45:34 -05:00
Glowbal
41196c15aa Merge pull request #1686 from acemod/fixFrag 
Fix frag
 2015-07-26 23:42:16 +02:00
ViperMaul
951afef495 Merge pull request #1911 from acemod/fixLoadUnloadUnconscious 
Fix load unload unconscious
 2015-07-26 14:33:46 -07:00
Glowbal
0af6c5d852 Merge pull request #1913 from acemod/improveSwitchUnits 
Improve SwitchUnits
 2015-07-26 21:13:21 +02:00
Glowbal
d1809e597c Removed requirement for the medical dll 
Medical extension is now an optional requirement that improves performance for advanced medical when used.
 2015-07-26 20:54:49 +02:00
SilentSpike
159937dc45 Merge branch 'master' into ace_spectator 
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
 2015-07-26 14:15:24 +01:00
SilentSpike
e6f016f195 GVAR typo 2015-07-26 13:13:46 +01:00
SilentSpike
e431365586 Spectate on death setting 2015-07-26 13:12:58 +01:00
SilentSpike
ec6a0da01c Adjust camera speed while moving 2015-07-26 12:23:01 +01:00
SilentSpike
b0adf2e2ee Fix 3D icons not rendering 2015-07-26 12:13:05 +01:00
SilentSpike
efbd5189ce Close all dialogs when exiting 2015-07-26 12:05:41 +01:00
SilentSpike
f0f6edb549 Transition camera post-escape menu 2015-07-26 11:28:14 +01:00
bux578
cff54efbe0 add missing private 2015-07-26 09:20:38 +02:00
bux578
993f6bde16 remove respawnCounter in certain respawn template conditions 2015-07-26 09:19:29 +02:00
bux578
4ab1123efd fix unlimited growing array 2015-07-26 09:19:09 +02:00
Glowbal
dfec850aa8 Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs 
addX macro in configs
 2015-07-26 08:37:47 +02:00
PabstMirror
0b9d1fb05d Disabled by default - Safe FOV Check 2015-07-26 00:48:53 -05:00