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
d125b9ad9c
Add category to options menu. Initial work.
2015-08-07 21:14:45 +02: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
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
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
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
SilentSpike
d036639b46
Adding hideUnit functions to ace_common
2015-07-03 02:14:58 +01: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
ViperMaul
7e6be08153
Improved unloading on roof tops
...
Less chance of patient being unloaded directly to the ground instead of the roof top where the helo has landed.
Probably not fool proof yet due to randomness. #1728
2015-06-23 16:11:00 -07:00
SilentSpike
e4f89a96b7
CheckPBO should ensure client isn't running any addons the server isn't
2015-06-23 15:01:55 +01:00
ViperMaul
6b6ad93848
Fix for unable to unload from driver seat.
...
Improvement for helo's on roof tops and boats.
#1728
2015-06-22 19:48:28 -07:00
jonpas
04c06b51ed
Fixed #1632 - CheckPBOs kick serverCommand changed to display 46
2015-06-15 20:23:16 +02:00
ViperMaul
1322da5537
Merge pull request #1587 from acemod/fixVehicleUnconcious
...
fix animation and consistently unload units from vehicle
2015-06-13 12:44:34 -07:00
ViperMaul
132ec343b0
Suppress debug
2015-06-13 12:39:29 -07:00
ViperMaul
911a18d169
Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk
...
Convert ASLtoPosition
#1575 and #1577
2015-06-13 12:37:10 -07:00
PabstMirror
b2d69611d7
Merge pull request #1118 from acemod/multipleDevices
...
Multiple Devices
2015-06-13 14:20:38 -05:00
Glowbal
5013254769
Merge pull request #1530 from legman/akalegman_zeus_unconscious
...
Fixed Zeus Unconscious
2015-06-13 20:48:18 +02:00
PabstMirror
6ab8b129fa
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-06-13 12:30:35 -05:00
ViperMaul
cbb620ba98
Change setPos to setPosASL to support roof tops and multi-level objects and faster code.
...
#1575 and #1577
2015-06-13 07:24:50 -07:00
ViperMaul
1c0811aa31
Change from globalEvent to targetEvent
...
#1575 and #1577
2015-06-12 16:56:13 -07:00
ViperMaul
072f2cc3a7
fix animation and consistently unload units from vehicle
...
#1575 and #1577
2015-06-11 15:56:11 -07:00
PabstMirror
3e396b416a
One PFEH for execNextFrame and waitAndExec
2015-06-11 02:45:42 -05:00
AKALegman
1ae8e29ac2
updated isPlayer v2
2015-06-08 19:12:16 +01:00
AKALegman
96fccbedf9
updated isPlayer
2015-06-08 11:09:49 +01:00
PabstMirror
470492759c
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/atragmx/initKeybinds.sqf
addons/common/XEH_postInit.sqf
addons/kestrel4500/CfgVehicles.hpp
addons/kestrel4500/initKeybinds.sqf
addons/microdagr/CfgVehicles.hpp
addons/microdagr/XEH_clientInit.sqf
2015-06-05 17:50:04 -05:00
Glowbal
7f2ada38a2
Merge branch 'checkpboSettings' of github.com:usecforce/ACE3
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/config.cpp
2015-06-04 21:51:54 +02:00
Glowbal
0b8896239c
Progress bar stops on death - fix for #1449
2015-05-31 09:23:36 +02:00
jonpas
baca5a25d5
Merge branch 'master' into checkpboSettings
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-05-28 20:52:35 +02:00
jonpas
86264a7b7d
Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized
2015-05-28 20:49:30 +02:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
PabstMirror
4e70bf6e83
Single PFEH for waitAndExecute - using sort
2015-05-25 22:46:56 -05:00
ViperMaul
6a1724343d
remove debug
...
#1375
2015-05-25 11:38:28 -07:00
