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
7,547 Commits 73 Branches 88 Tags 752 MiB
6c968d8bc7
Commit Graph

724 Commits

Author SHA1 Message Date
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
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
PabstMirror
fde8f7383f Map Opened/Closed Events + use in maptools 2015-06-28 13:08:47 -05:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR) 
Made all remaining translations, including new ones like the sitting
module, for example.
 2015-06-27 15:48:39 -03: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
293fa4f16b Coding standards applied to common/CfgVehicles.hpp 2015-06-22 19:29:19 +02:00
jonpas
ec5cc606c3 Fixed CheckPBOs Whitelist default value in module 2015-06-22 19:24:10 +02:00
Macusercom
cac8dd8b02 German translations fixes 2015-06-20 02:16:30 +02:00
ViperMaul
85c40a4cf2 Merge pull request #1668 from acemod/release 
Release v3.1.1 merge into Master
 2015-06-17 19:15:35 -07:00
Macusercom
f1691f2562 Fixed a typo 2015-06-16 03:23:32 +02:00
Macusercom
24cea18ae5 Revert "Revert "Added German translations"" 
This reverts commit 4403e3c665.
 2015-06-16 03:21:25 +02:00
Macusercom
4403e3c665 Revert "Added German translations" 
This reverts commit 0adc07d284.
 2015-06-16 03:06:23 +02:00
Macusercom
0adc07d284 Added German translations 2015-06-16 03:06:13 +02:00
Nicolás Badano
fbf99224c4 Merge pull request #1635 from jonpas/fixCheckPBOkick 
Fixed CheckPBO Kick
 2015-06-15 15:43:28 -03:00
jonpas
04c06b51ed Fixed #1632 - CheckPBOs kick serverCommand changed to display 46 2015-06-15 20:23:16 +02:00
jonpas
f61066f11a Fixed checkPBO function not executing on server 2015-06-15 19:55:30 +02:00
Ivan Navarro Cabello
76f7962dac Updated spanish stringatable 
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
 2015-06-14 13:52:55 +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
Nicolás Badano
c168afe8bb Merge pull request #1598 from acemod/serverModulesFirst 
Fix Server not reading modules
 2015-06-13 12:01:22 -03:00
ViperMaul
cb1d016a39 Merge pull request #1592 from ProfessorCZ/master 
CZ - Translation
 2015-06-13 07:39:18 -07: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
PabstMirror
177f590dda Make "InitSettingsFromModules" pfeh run on dedicated 2015-06-12 22:57:01 -05:00
PabstMirror
1804c6ceab Merge branch 'master' into serverModulesFirst 2015-06-12 22:40:04 -05:00
ViperMaul
1c0811aa31 Change from globalEvent to targetEvent 
#1575 and #1577
 2015-06-12 16:56:13 -07:00
ProfessorCZ
acc5f4d29f CZ - Translation 2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02: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
5431ab5e01 fixed conflicts 2015-06-10 20:03:00 +01:00
PabstMirror
8abd488a43 Read server modules before "SettingsInitialized" on clients 2015-06-09 01:27:59 -05:00
PabstMirror
b61bd1fb75 1.46 New RscInfoType (fix UBC) 2015-06-08 13:26:18 -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
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05: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
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
Glowbal
1c0c73be54 Merge pull request #1433 from acemod/fixSettingsFromModules 
Delay initialization of modules until settings are properly setup
 2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
Glowbal
0b8896239c Progress bar stops on death - fix for #1449 2015-05-31 09:23:36 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
jonpas
66ceaa1d31 Fixed IS_STRING error due to regex replacing it with LSTRING 2015-05-30 20:09:53 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
PabstMirror
d7d225cebc Send waiting debug msg only once 2015-05-30 01:28:15 -05:00
PabstMirror
84d940e69d Fix circular dependency - ModuleDescription 2015-05-30 00:31:07 -05:00
esteldunedain
9d29aa2107 - Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing. 
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
 2015-05-30 01:37:41 -03:00
esteldunedain
333cb80171 Delay initialization of ACE_Modules until settings are properly setup 2015-05-30 01:18:23 -03:00
esteldunedain
afa6a2fad9 Remove the "ServerSettingsReceived" event, which is not longer needed. As per @pabstmirror solution, the GVAR(Settings) variable is monitored to determine when the server info has arrived. Fix #1273 2015-05-30 00:43:51 -03:00
PabstMirror
5efde25585 Fix ace_settings 2015-05-29 21:03:47 -05:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +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
jonpas
b85ae8f194 Fixed missed external strings 2015-05-27 22:34:57 +02:00
Glowbal
7dd01ebb69 Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient 
Possible fix medical unload patient
 2015-05-27 19:34:23 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
esteldunedain
39fec12528 Merge branch 'master' into reliableSettings 2015-05-27 12:09:06 -03:00
Ivan Navarro Cabello
047a2ee736 added spansih translate 
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).

I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
 2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65 German translations 
Added a lot of German translations and fixed even more typos.
 2015-05-26 17:04:53 +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
1a468cb4ff Split common ACE_Settings.hpp from config.cpp, shortened sampleSetting 2015-05-16 01:06:29 +02:00
jonpas
cccc741a16 #1123 - Added CheckPBOs to ACE_Settings 2015-05-16 00:54:01 +02:00
esteldunedain
0b1beed219 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reliableSettings 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-05-15 18:18:13 -03:00
jaynus
d4dab0275d Me and my typos. 2015-05-15 12:54:02 -07:00
esteldunedain
d189cffce6 Fix event names 2015-05-15 15:49:22 -03: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
esteldunedain
ca94fd4c78 Remove the pfh 2015-05-14 20:58:45 -03:00
esteldunedain
5e3b6f389a Reliable settings framework 2015-05-14 20:45:53 -03: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
cac70762f5 Merge pull request #1149 from acemod/extBuildFix 
Extensions build system updates, changes and crash fixes
 2015-05-14 07:25:49 -07:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations' 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-14 16:01:41 +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
jaynus
d972f14649 Merge pull request #1092 from acemod/superTime 
ACE_time variables for accurate purposeful time use
 2015-05-12 19:34:20 -07:00
PabstMirror
e613db1fea Add missing script_component include 2015-05-12 15:40:12 -05:00
GieNkoV
ed1acd8c15 Some small errors fixed #2 
Mainly tabs and wrong italian strings (got those from newest master)
 2015-05-12 19:42:35 +02:00
GieNkoV
bc72c71e8e Fix small errors inside stringtables 2015-05-12 19:11:56 +02:00
Grzegorz Sikora
44466e8be8 Remove tabs and repair errors @Glowbal found 
Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp

Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:27 +02:00
Grzegorz Sikora
156bba3321 Yes/No to BOOL 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
 2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules 
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
 2015-05-12 18:25:40 +02:00
PabstMirror
043fee03bd Return Valid bool for keybind 2015-05-11 22:48:03 -05:00
PabstMirror
de2a89613c ATragMX 2015-05-11 22:22:24 -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
jaynus
9660978b92 Changed: search for ace_server, not ace_serverconfig 2015-05-11 09:02:13 -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
Alessandro Foresi
2dd06babec Added: Italian translations completed. 
Fixed: BOM markers where missing
 2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02: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
349d723fea Merge pull request #928 from acemod/AdjustUnloadPerson 
Adjust unload person
 2015-04-30 20:55:17 +02:00
Glowbal
67370f3340 Handles waking up 2015-04-30 20:49:38 +02:00
Glowbal
432a0102e8 Improved unloadPerson function 
Removed caller parameter.
 2015-04-30 20:44:43 +02:00
bux578
367da1f4bf cleaned up insignias 2015-04-30 19:36:35 +02:00
commy2
8e54e6ec13 fix setFWS locality issues, fix #892 2015-04-30 00:53:49 +02:00
bux578
fce91279b5 add ace3 and banana insignia 
`[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;`
and
`[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`
 2015-04-29 22:04:31 +02:00
Glowbal
dfbc9b74fd Added arsenalScope #913 2015-04-29 15:14:37 +02:00
commy2
d149db61e8 ace insignia, #906 2015-04-29 13:01:08 +02:00
KoffeinFlummi
b263ac6847 Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge 
Conflicts:
	addons/common/stringtable.xml
 2015-04-29 12:57:48 +02:00
KoffeinFlummi
a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 
Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-29 12:52:55 +02:00
NukeDev
1d434949de Some Italian Translation's Changes 2015-04-28 17:46:35 +02:00
VyMajoris
ba89bc8faa Added - Myself to AUTHORS.txt 2015-04-26 03:15:25 -03:00
Nou
7c857a5a7e Make sure load spawns the function, not calls it. 2015-04-25 00:52:51 -07:00
Nou
c8e6e7018c Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission. 2015-04-25 00:49:47 -07:00
Nicolás Badano
1bfb13abac Revert "remove author from items inheriting ACE_ItemCore" 2015-04-21 19:07:42 -03:00
bux578
3897b73d56 remove author from items inheriting ACE_ItemCore 2015-04-21 19:16:54 +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
ea368511b7 ace extensions class for modularity 2015-04-20 18:48:58 +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
commy2
c9a2505031 Merge pull request #755 from acemod/fixoptics2 
Fix for PIP scopes, fix #547
 2015-04-19 07:46:41 +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
commy2
7ac7bc3f29 eventhandler for creating and deleting cameras 2015-04-18 22:06:42 +02:00
Glowbal
9825d030e3 Merge pull request #714 from acemod/localMedicalGarbage 
ACE JIP data and event synchronization (Tested with Litter change)
 2015-04-18 21:25:53 +02:00
jaynus
f5705a91e6 oops. 2015-04-18 12:04:48 -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
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
PabstMirror
d7da259c11 Merge pull request #688 from acemod/optionMenuStuff 
Option menu stuff
 2015-04-17 23:49:37 -05:00