Commit Graph

458 Commits

Author SHA1 Message Date
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
PabstMirror
275f04d876 preInit defines and fix func name 2015-08-25 13:18:59 -05:00
jokoho48
203c4d8a6c add WaitUntilAndExecute 2015-08-24 17:10:54 +02: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
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
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
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
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
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
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
ViperMaul
789e92d8ef Ensuring a proper return value and removing unnecessary code.
#1375
2015-05-25 10:32:52 -07:00
ViperMaul
9a07a9bfd6 modify unloadPerson to use unloadPersonLocal
#1375
2015-05-25 09:43:29 -07:00
ViperMaul
7141d251c7 create unloadPersonLocal
#1375
2015-05-25 09:41:24 -07:00
PabstMirror
f4bf6ea26d Fix Time Calc 2015-05-22 14:29:56 -05:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
jonpas
cccc741a16 #1123 - Added CheckPBOs to ACE_Settings 2015-05-16 00:54:01 +02:00
jaynus
d4dab0275d Me and my typos. 2015-05-15 12:54:02 -07:00
jaynus
e1c3e96eb1 Fixes: Nil scheduled space bug with hashes. This is still a bug everywhere else. 2015-05-15 10:45:07 -07:00
PabstMirror
666db5e245 Fix Typo 2015-05-14 18:13:20 -05:00
PabstMirror
d5db268fc0 Clean unused privates 2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382 Common Privates Redo 2015-05-14 17:12:40 -05:00
PabstMirror
fd8d68c451 Merge branch 'master' into multipleDevices
Conflicts:
	addons/common/stringtable.xml
2015-05-14 15:38:13 -05:00
SAM
0b6f02f45e Second batch of cleaned up files. 2015-05-14 20:06:06 +02:00
SAM
9b55dd0b57 First batch of cleaned up files 2015-05-14 20:02:42 +02:00
jaynus
9f3a57bf32 Changed: checkFiles extension check prints version returned by extension
Changed: Build changed to SSE2 instead of defaulting to AVX.
2015-05-13 09:57:24 -07:00
jaynus
ed2f73d4d9 Merge pull request #1117 from acemod/waveHeightAtFunc
Added: waveHeightAt Function
2015-05-12 21:15:35 -07:00
PabstMirror
e613db1fea Add missing script_component include 2015-05-12 15:40:12 -05:00
PabstMirror
ffce1f6386 Condense mDagr interactions - intergrate kestral 2015-05-11 21:49:13 -05:00
jaynus
7efe8ccba5 Added: waveHeightAt Function, refs #1024 for use. 2015-05-11 16:44:17 -07:00
PabstMirror
57d6ad988b Kestral WIP 2015-05-10 16:54:24 -05:00
PabstMirror
05f1b884fa Localization/ headers 2015-05-10 15:17:50 -05:00
PabstMirror
f7ff4a2f36 Base Device Handler Framework
Multiple devices share Home/Ctrl-home keys
2015-05-10 14:59:53 -05:00
jaynus
e1c3c40cdd I need more coffee. this should be more accurate. 2015-05-10 07:50:58 -07:00
jaynus
318b2437f9 Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution. 2015-05-10 07:42:53 -07:00
jaynus
7fb7b04a85 And one final bugfix for fast machines. 2015-05-09 23:13:02 -07:00
jaynus
8e34b99c0f Optimization of variables. 2015-05-09 23:09:33 -07:00
jaynus
b3833c665d Time magic. 2015-05-09 22:53:20 -07:00
commy2
aa6c3ddf2c fix: check files script, order in activatedAddons is not guaranteed 2015-05-09 19:34:35 +02:00
commy2
7fb56d4fd5 simple check to compare client and server version of ace 2015-05-09 17:03:51 +02:00
commy2
3976c4d64f the spaces 2015-05-09 16:06:44 +02:00
commy2
f0cca5b33e ignore ace in checkPBO module, also fix #1020 2015-05-09 16:01:53 +02:00
commy2
57131496f2 check for outdated pbo files 2015-05-09 13:25:19 +02:00
Glowbal
518dfb4373 Added missing privates 2015-05-07 21:51:03 +02:00
PabstMirror
d8a6dd1bbd Stuff 2015-05-01 12:58:56 -05:00
PabstMirror
8d1ac26e24 Save and replay valid awake animations 2015-05-01 12:12:13 -05:00
PabstMirror
0f736ae684 GetDeathAnim 2015-05-01 03:13:26 -05:00
Glowbal
432a0102e8 Improved unloadPerson function
Removed caller parameter.
2015-04-30 20:44:43 +02:00
commy2
8e54e6ec13 fix setFWS locality issues, fix #892 2015-04-30 00:53:49 +02:00
Glowbal
89a1306605 Merge branch 'master' into KeyPressesWhileUnconscious 2015-04-20 22:19:40 +02:00
Glowbal
362051e2db Merge pull request #717 from acemod/medicalFixes
Medical fixes
2015-04-20 22:16:57 +02:00
commy2
14214090dc manual merge 2015-04-20 18:22:17 +02:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
jaynus
dccc869a6a Merge pull request #753 from acemod/fixSettingsLocalization
Fix settings localization is done by the server instead of client
2015-04-18 20:09:56 -07:00
jaynus
c438d9e790 Merge remote-tracking branch 'origin/master' into localMedicalGarbage 2015-04-18 11:12:22 -07:00
Glowbal
54a70f26b1 Moved to own function. 2015-04-18 20:06:01 +02:00
Glowbal
85e5293c37 Fix settings localization is done by the server instead of client #744 2015-04-18 19:59:41 +02:00
PabstMirror
d7da259c11 Merge pull request #688 from acemod/optionMenuStuff
Option menu stuff
2015-04-17 23:49:37 -05:00
PabstMirror
71e62711c6 #731 - stop error if target offscreen 2015-04-17 22:02:23 -05:00
jaynus
93d03b404f JIP Sync events complete. 2015-04-17 19:26:27 -07:00
jaynus
8fa0c91632 Added PlayerJIP event, handled full requests on JIP. 2015-04-17 18:23:26 -07:00
commy2
3ec5acbdb0 stuff 2015-04-18 01:05:30 +02:00
commy2
25d8c6c93e function to show error message box 2015-04-17 23:24:43 +02:00
Glowbal
31bc09a9a3 fixed AI standing up before being killed
Doesn't matter if we enable AI again on dead units
2015-04-17 21:06:30 +02:00
jaynus
2be38c493c ACE JIP synchronized event infastructure. 2015-04-17 10:21:41 -07:00
PabstMirror
bb2383cffd #700 - ProgressBar Visual Improvement 2015-04-17 09:51:47 -05:00
PabstMirror
53af014eab Fix Localization in value[] array 2015-04-16 19:29:39 -05:00
commy2
4169351b1a fix addActionEH didn't work after respawn 2015-04-16 02:00:37 +02:00
PabstMirror
e54d8dc827 ProgressBar - Fixed Alignment 2015-04-15 12:55:20 -05:00
jaynus
85c10328ae missed one. 2015-04-14 14:58:19 -07:00
jaynus
df3c8155a0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:45:30 -07:00
jaynus
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
KoffeinFlummi
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
commy2
fa64225e55 Merge pull request #505 from acemod/muteunit
Muteunit framework, fix #473
2015-04-13 19:18:45 +02:00
PabstMirror
74967910a3 opps 2015-04-12 18:27:55 -05:00
PabstMirror
d50bff866b addToInventory use addMagazineArray -maybe fix #530 2015-04-12 18:27:25 -05:00
commy2
e87f491470 mute implementation in noradio, handle post init on remote units 2015-04-12 11:17:58 +02:00
commy2
54f29d75f5 functions to mute unit 2015-04-12 10:05:49 +02:00
commy2
018854a7c3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit 2015-04-12 09:15:45 +02:00
jaynus
2a2f96a034 ACRE API functions and core functions were incorrect. 2015-04-11 14:10:30 -07:00
jaynus
458c49b0a7 Merge remote-tracking branch 'origin/master' into javelinLocking
Conflicts:
	addons/common/XEH_preInit.sqf
2015-04-11 14:01:47 -07:00
commy2
b9077888aa unmute handleing 2015-04-11 20:26:43 +02:00
Glowbal
24765741ab Enabled setAccTime fix from commy 2015-04-11 20:05:22 +02:00
Glowbal
dd7e746368 formatting 2015-04-11 19:52:30 +02:00
commy2
761e4aec64 edit description 2015-04-11 16:27:04 +02:00
commy2
62b45a8a07 initial commit 2015-04-11 15:59:21 +02:00
commy2
9cf44b1d32 initial commit 2015-04-11 15:46:41 +02:00
jaynus
4188893839 Move spatial model translations to ace_common 2015-04-10 14:23:55 -07:00
jaynus
0a88220fc2 Constraints work, added worldToScreenBounds to common. 2015-04-10 14:20:06 -07:00
commy2
11ad74735c Merge pull request #458 from Tenga/master
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
2015-04-10 22:12:55 +02:00
PabstMirror
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func)
Still some small head movements, but I don't know how to fix that.
2015-04-10 15:02:40 -05:00
Tenga
229590ed20 Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera 2015-04-10 21:54:47 +02:00