Commit Graph

573 Commits

Author SHA1 Message Date
Glowbal
bac1a8fce4 Merge pull request #186 from acemod/repair
add repair PBO, fix #185
2015-08-15 17:36:31 +02:00
Glowbal
d3aa6a7f6b Added missing assign modules 2015-08-15 15:49:41 +02:00
PabstMirror
c54081d677 Don't broadcast localization for settings
smaller `publicVariable`
2015-08-15 03:48:25 -05:00
PabstMirror
fc51ad9a5e Merge pull request #2137 from acemod/checkPBO-spawnloop
CheckPBO Fix endless waitUntil if checkAll is false
2015-08-14 19:31:36 -05:00
PabstMirror
13abee2612 Merge pull request #2106 from acemod/optionMenuFiltering
Option Menu Fixes for categories
2015-08-14 19:31:17 -05:00
PabstMirror
a7ad6dafc9 Remove PFEH hack 2015-08-13 14:09:25 -05:00
PabstMirror
763f793d0e Localize Catagoires in loadSettingsLocalizedText
Minor, but allows us to use CSTRINGS in configs for consistancy
2015-08-13 13:20:37 -05:00
PabstMirror
cfaf046e29 CheckPBO Fix endless waitUntil if checkAll is false 2015-08-13 00:31:29 -05:00
Glowbal
493254619c Merge pull request #2039 from acemod/medical-menu
Medical menu
2015-08-08 23:11:11 +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
Glowbal
12f0808784 Merge branch 'master' into hearingRingingModule
Conflicts:
	addons/common/stringtable.xml
2015-08-08 17:42:18 +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
d125b9ad9c Add category to options menu. Initial work. 2015-08-07 21:14:45 +02:00
Michael Braun
7839224aa2 Added Polish Keybind Category translations thanks to @gienkov 2015-08-07 13:01:36 +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
PabstMirror
6086553fce Move DoNotForce to common 2015-08-06 12:24:56 -05:00
PabstMirror
e45bd43e5e CreateLitter / syncEvents performance fixes 2015-08-06 00:28:43 -05:00
ViperMaul
d3d3ea756d isTouchingGround is unreliable for ground vehicles
#2020
2015-08-05 11:48:04 -07:00
Glowbal
275b0c4300 Merge branch 'release'
Conflicts:
	README.md
	addons/finger/stringtable.xml
2015-08-04 22:29:05 +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
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
c0fb2e1b65 Add Ear Ringing setting to module (Ref #1981) 2015-08-02 12:15:26 -05: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
ViperMaul
63dd19825b moveInAny seems to work better than moveInDriver. WIP 2015-07-28 13:56:22 -07:00
ViperMaul
626a9cf5f9 Disable headBugFix if unconscious 2015-07-28 13:06:58 -07:00
ViperMaul
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01: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
ViperMaul
951afef495 Merge pull request #1911 from acemod/fixLoadUnloadUnconscious
Fix load unload unconscious
2015-07-26 14:33:46 -07:00
SzwedzikPL
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
KoffeinFlummi
88a5609016 Merge branch 'master' of https://github.com/acemod/ACE3 2015-07-25 19:35:26 +02:00
KoffeinFlummi
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02:00
PabstMirror
9e831d257d Merge pull request #1768 from acemod/10digitGrids2
10 digit grids 2
2015-07-25 12:32:02 -05:00
PabstMirror
1b590bf0f9 More nametag fixes / setSetting casting 2015-07-23 14:05:20 -05:00
PabstMirror
f438c6d0c5 Revert "Use new worldSize command instead of whileLoop"
This reverts commit 7d26519b2e.
2015-07-16 18:10:10 -05:00
PabstMirror
7d26519b2e Use new worldSize command instead of whileLoop 2015-07-16 17:47:39 -05:00
PabstMirror
b47a17230b Merge branch 'master' into 10digitGrids2 2015-07-16 17:26:19 -05:00
SilentSpike
19c16b1f59 Comment out dev branch command 2015-07-04 17:40:23 +01:00
ProfessorCZ
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
SilentSpike
909fbb5dc4 Merge pull request #1732 from acemod/checkPBOfix
CheckPBO should ensure client isn't running any addons the server isn't
2015-07-03 22:33:17 +01:00
Nicolás Badano
8052dd8ea3 Merge pull request #1782 from gienkov/pl-translation
PL translation
2015-07-02 23:06:13 -03:00
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +01:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
PabstMirror
c1dd2df57a Move grid funcs and map long,lat,altitude to common 2015-06-30 12:26:51 -05:00
SilentSpike
873936dc31 Simplify addon checking code 2015-06-29 14:15:46 +01:00