commy2
ca43520b7f
Merge pull request #2482 from acemod/340fixdaylaserlight
...
fix daylasers being a virtual light source
2015-09-17 22:47:13 +02:00
commy2
36a279012c
cleanup common
2015-09-17 18:25:02 +02:00
commy2
864c0b4baf
fix daylasers being a virtual light source, fix #2416
2015-09-17 14:17:48 +02:00
commy2
a09ca8fb80
tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474
2015-09-17 12:23:56 +02:00
commy2
014203413d
handle optional pbos in checkFiles
2015-09-17 02:13:21 +02:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
PabstMirror
e254af9964
Fix missing )
2015-09-15 19:26:37 -05:00
Glowbal
7e5ab07e32
Merge pull request #2387 from acemod/FixHCPPE
...
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
Glowbal
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
jokoho48
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
jokoho48
defbdf1b1a
fix that HC throw a issue if PPEffect was used/applyed
2015-09-09 17:05:48 +02:00
Michael Braun
a5fb09a7e1
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
[OMCB]kaban
9f416b796c
Fix due ti review
2015-09-05 02:07:26 +03:00
PabstMirror
024dc3effe
Cleanup
2015-09-03 00:16:48 -05:00
PabstMirror
789de9d111
runAfterSettingsInit helper func
2015-09-03 00:11:49 -05:00
PabstMirror
cbccd898ea
Run functions after setting init
2015-09-02 23:58:24 -05:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd
Czech Translations - Update
2015-09-03 01:20:24 +02:00
commy2
dd788342fe
remove commented debug messages
2015-09-01 16:37:46 +02:00
commy2
5e68486233
high command module breaks ace, fix #2134
2015-09-01 10:06:01 +02:00
commy2
73911f701d
add debug messages for #2134
2015-09-01 08:53:11 +02:00
Michael Braun
035b3432c5
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
commy2
80a0c93bdc
Merge pull request #2316 from acemod/322customcamera
...
fix custom cameras (for intros) being broken with ACE, fix #2248
2015-08-31 21:32:02 +02:00
PabstMirror
38122ffeaf
Merge pull request #2197 from acemod/mapOpenCloseEvents
...
Map open close events / MapTools Cleanup
2015-08-31 13:23:10 -05:00
PabstMirror
4be7411a05
Use "visibleMapChanged" event
2015-08-30 15:26:43 -05:00
commy2
74dfd73167
fix issues with pip optics camera in virtual arsenal
2015-08-30 19:05:35 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
PabstMirror
f67809b18c
Merge branch 'master' into mapOpenCloseEvents
2015-08-29 16:43:24 -05:00
Michael Braun
657157d767
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/hearing/functions/fnc_moduleHearing.sqf
2015-08-29 22:38:26 +02:00
PabstMirror
bc016eac4c
1.50 - use new didJip command (Ref #2241 )
2015-08-26 22:39:27 -05:00
Michael Braun
36aeb61d81
Fixed error caused by closing square bracket
2015-08-26 17:51:56 +02:00
Michael Braun
3dc3331d87
Replaced rogue format with FORMAT_#
2015-08-26 17:45:17 +02:00
Michael Braun
5047d4de1c
Switched to ACE_LOG<LEVEL>_# variation
2015-08-26 17:39:44 +02:00
Michael Braun
097506076f
Fixed format usage in macros requiring ARR_# for it to work
2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7
Standardize logging format through ACE_LOG macros
2015-08-26 15:32:54 +02:00
Glowbal
13740c06e4
Merge pull request #1816 from voiperr/ace_map_dev
...
Flashlight simulation on map
2015-08-26 09:01:30 +02:00
voiper
9de7953345
More cba capitalisation.
2015-08-24 14:12:04 -07:00
voiper
79e6ce3803
Fixed CBA capitalisation.
2015-08-24 14:02:55 -07:00
Glowbal
26c172ff11
Merge pull request #2066 from acemod/fixDisableUserInput
...
Fix and enhancement of two common functions
2015-08-21 14:05:47 +02:00
PabstMirror
4a245bd935
Remove Spawn for CBA_fnc_addPerFrameHandler
2015-08-17 22:21:18 -05:00
PabstMirror
980fc7a235
Merge branch 'master' into mapOpenCloseEvents
2015-08-17 21:08:07 -05:00
bux578
905628bc1c
Merge pull request #2165 from acemod/enhanceRespawn
...
after respawn select last weapon, muzzle and mode
2015-08-16 22:05:41 +02:00
Glowbal
0c1b828946
Merge pull request #2171 from acemod/fix-error-invalid-hitpoints
...
Fixed error pop-up invalid configured hitpoints
2015-08-16 10:24:24 +02:00
bux578
ec29890780
Merge pull request #2128 from acemod/gienkov-pl-translation-5
...
Gienkov pl translation 5
2015-08-16 08:54:47 +02:00
Glowbal
0420f0b216
Fixed error pop-up kicking you out of game in case a third party vehicle has incorrect configured hitpoints/selections
2015-08-16 00:15:16 +02:00
bux578
675cfc2da7
after respawn select last weapon, muzzle and mode
...
#2138
2015-08-15 18:54:39 +02:00
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
voiper
f676f605f3
Fix 00000101.
2015-08-11 11:18:54 -07:00
voiper
4aa28368ad
Git fix numero 5.
2015-08-11 11:10:42 -07:00
gienkov
1c0a6fb457
PL translation of common, medical_menu, optionsmenu
2015-08-09 01:47:55 +02:00
Glowbal
493254619c
Merge pull request #2039 from acemod/medical-menu
...
Medical menu
2015-08-08 23:11:11 +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
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
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
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02: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
