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,429 Commits 73 Branches 88 Tags 752 MiB
1a2b99c76c
Commit Graph

5244 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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