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
5,263 Commits 73 Branches 88 Tags 752 MiB
3f3ffe117e
Commit Graph

4291 Commits

Author SHA1 Message Date
ulteq
d733527f71 Ported the ACE2 sandbags 2015-06-02 19:30:50 +02:00
bux578
6ebf9067ef Merge pull request #1478 from acemod/switchunitscleanup 
cleanup switchunits
 2015-06-02 19:20:34 +02:00
PabstMirror
d727cb400a Modules - fix addEventHandler 2015-06-02 12:15:58 -05:00
bux578
0bd358c415 cleanup switchunits 2015-06-02 19:13:58 +02:00
ulteq
d0b8a97e79 Fixed requiredAddons[] 2015-06-02 13:40:10 +02:00
ulteq
f1dbe0fffc Ported the ACE2 MX-2A thermal imaging device 2015-06-02 12:58:47 +02:00
ulteq
048e5b6f6d Body bag cleanup: 
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
 2015-06-01 22:33:25 +02:00
Glowbal
cf0b2c2a52 Merge pull request #1469 from acemod/placeInBodyBagFix 
Fixes random body bag teleports
 2015-06-01 22:06:35 +02:00
SilentSpike
e3c09a7099 Added icon to unconscious module 2015-06-01 20:56:58 +01:00
SilentSpike
bfd1f8a102 Localise module names 2015-06-01 20:56:57 +01:00
SilentSpike
a30f6be713 Better module naming convention 2015-06-01 20:56:56 +01:00
SilentSpike
8fe1a65207 Cleaned up event handler 2015-06-01 20:56:54 +01:00
SilentSpike
bfce854be3 Localise module messages 2015-06-01 20:50:19 +01:00
SilentSpike
4c1641b64a Generalized contextual modules system 2015-06-01 20:44:54 +01:00
SilentSpike
7d71d85ffc Death to tabs 2015-06-01 20:44:53 +01:00
SilentSpike
e27ac53713 Implemented contextual modules 2015-06-01 20:44:51 +01:00
SilentSpike
eefe995a0c Transfer curator functionality from ace_captives 2015-06-01 20:44:50 +01:00
SilentSpike
b72512e3f1 Zeus modules require larger icons 2015-06-01 20:44:50 +01:00
SilentSpike
97a1ff9bd6 Include no longer needed 2015-06-01 20:44:48 +01:00
SilentSpike
cd6474c748 Adding module icons 2015-06-01 20:44:47 +01:00
SilentSpike
9619b7d167 Improved naming and removed pointless category 2015-06-01 20:43:21 +01:00
SilentSpike
44ca13fe3a Implemented capture module 2015-06-01 20:36:06 +01:00
SilentSpike
6251248a09 Fixed conditions 2015-06-01 20:36:05 +01:00
SilentSpike
49ef30ca5b Corrected macro 2015-06-01 20:36:05 +01:00
SilentSpike
aad56866ea Forgot my privates 2015-06-01 20:36:04 +01:00
SilentSpike
90033aa591 Updated function headers 2015-06-01 20:36:03 +01:00
SilentSpike
5f1725cf1f Missing setUnconscious parameter 2015-06-01 20:36:02 +01:00
SilentSpike
0dcfd9f941 Use zeus category 2015-06-01 20:36:02 +01:00
SilentSpike
a4512e4740 Implemented surrender module 
Improved knockout module
 2015-06-01 20:36:01 +01:00
SilentSpike
3702d0b671 Implemented knockout module 2015-06-01 20:36:00 +01:00
ulteq
14607f7aba Fixes random body bag teleports 2015-06-01 21:23:00 +02:00
ulteq
47acb0f470 Merge pull request #1458 from acemod/drag_carry_fix 
Fixes random teleport when dragging/carrying inside of buildings.
 2015-06-01 20:22:29 +02:00
PabstMirror
25a597e5fe Merge pull request #1460 from acemod/hitReactionsMounted 
HitReactions - Don't do when mounted, add setting
 2015-06-01 13:17:06 -05:00
PabstMirror
f57427ec96 switch waitAndExecute with 0 delay to execNextFrame 
Should Fix #1463
 2015-06-01 13:14:05 -05:00
ulteq
9d4c572261 Fixes build error: "config.cpp has externs but no RequiredAddons" 2015-06-01 20:12:07 +02:00
Nicolás Badano
9ed851a966 Merge pull request #1265 from gienkov/module-translations-2 
Stringtable Zeus and View Distance
 2015-06-01 14:44:04 -03: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
ulteq
8de5129313 Merge pull request #1464 from acemod/densityAltitude 
Implemented Density Altitude calculation
 2015-06-01 16:22:41 +02:00
ulteq
e626794866 Fixes array init 2015-06-01 16:21:30 +02:00
ulteq
0364975c12 Implemented Density Altitude calculation 2015-06-01 16:09:35 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
PabstMirror
473ab7d7c0 Fix mmg UBC 2015-05-31 23:48:20 -05:00
PabstMirror
e2217220eb HitReactions - Don't do when mounted, add setting 2015-05-31 16:16:14 -05:00
Macusercom
53e0b35c12 German 1 correction for Advanced Ballistics 2015-05-31 20:31:38 +02:00
ulteq
4802ffeebf Fixes random teleport when dragging/carrying inside of buildings. 2015-05-31 18:34:48 +02:00
ulteq
3a2fd9dc08 Merge pull request #1457 from acemod/weatherReadme 
New weather module readme/feature description.
 2015-05-31 17:39:52 +02:00
ulteq
a1f199bfdc New weather module readme/feature description. 2015-05-31 17:39:24 +02:00
ulteq
903fb89d77 Overcast > 0.7 no longer implies rain: 
* The higher the overcast value the higher the chance for rain
* But you can end up having no rain with an overcast value of 1.0
 2015-05-31 17:30:52 +02:00
ulteq
5c8e79c50a Updated all airFriction values according to: extras/airFrictionAnalysis.txt 2015-05-31 16:45:59 +02:00
Macusercom
0a47396d10 Corrections for German translation 2015-05-31 14:25:52 +02:00
Glowbal
0b8896239c Progress bar stops on death - fix for #1449 2015-05-31 09:23:36 +02:00
Macusercom
5d1f2eafaa Fix German Translation 2015-05-30 23:34:19 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
PabstMirror
23d300df52 Merge pull request #1417 from acemod/localDefuseObjects 
Explosives - Local defuse objects
 2015-05-30 15:46:07 -05:00
Glowbal
3e3fdcf66e Merge pull request #1429 from acemod/cseNVGadjustment 
NightVision adjustment - use CSE's gamma
 2015-05-30 21:50:56 +02:00
jonpas
66ceaa1d31 Fixed IS_STRING error due to regex replacing it with LSTRING 2015-05-30 20:09:53 +02:00
ulteq
5746128a0f Further improved error handling when AB is enabled with incomplete configs: 
* Calculates correct solutions when parts of the ammo config are missing
* Calculates correct solutions when parts of the weapon config are missing
* Performance improvement when AB is enabled
 2015-05-30 20:06:55 +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
b49b2fa3d1 Send to RPT and Clipboard 2015-05-30 01:21:47 -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
Glowbal
552b2f390f Merge pull request #1256 from acemod/medicalExtension 
Medical Extension for handleDamage wounds
 2015-05-29 23:16:00 +02:00
PabstMirror
d457d9ffea NightVision adjustment - use CSE's gamma 2015-05-29 15:37:53 -05:00
Nicolás Badano
8fbd7e8575 Merge pull request #1426 from alganthe/barrel_swap_fix 
navid and SPMG barrel swapping added
 2015-05-29 17:11:01 -03:00
Josuan Albin
7603e71468 removed useless entries 2015-05-29 22:08:13 +02:00
Glowbal
00acbaf44d Added blur background client setting 2015-05-29 21:56:07 +02:00
ulteq
a57d8486ca Removed some unneeded code 2015-05-29 20:51:20 +02:00
ulteq
65b9e67991 Refined the abort condition for the range card calculation 2015-05-29 20:11:07 +02:00
ulteq
d0e1af6e47 Improved missing config error handling 2015-05-29 19:39:54 +02:00
Josuan Albin
26a9f7f38e navid and SPMG barrel swapping added 
- added navid class to barrel swapping config
- added SPMG class to barrel swapping config
 2015-05-29 15:31:48 +02:00
ulteq
6d1e8eebce Reworked the range card output when AB is disabled 2015-05-29 15:07:30 +02:00
ulteq
a5a96052b8 Made use of the newly implemented speed of sound calculation 2015-05-29 13:34:34 +02:00
ulteq
ade2cc1c56 Refined the reference barometric pressure calculation 2015-05-29 12:55:16 +02:00
ulteq
988a12327f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rangecard 2015-05-29 12:44:11 +02:00
ulteq
1ec37aabed Merge pull request #1424 from acemod/barometricPressureFix 
Fixed incorrect barometric pressure calculation
 2015-05-29 12:40:17 +02:00
ulteq
abf0149b1d Added speed of sound calculation: 
* Influences the advanced ballistics transonic instability
* Influences the ATragMX range card output
 2015-05-29 11:36:37 +02:00
ulteq
69b9d0e122 More in-depth barometric pressure calculation: 
* Temperature is now taken into account
 2015-05-29 11:18:40 +02:00
ulteq
83f2e35907 Fixed incorrect unit conversion in the barometric pressure calculation 2015-05-29 10:30:30 +02:00
ulteq
01810b8723 - Altitude is only taken into account when AB is enabled 
- Separate solution caches for Vanilla and AB ballistics
 2015-05-29 09:49:07 +02:00
Garth "L-H" de Wet
e2970ab40e Merge pull request #1414 from acemod/Explosives_ZeusCompatible 
Made explosives Zeus and AI compatible specifically in regards to Dea…
 2015-05-29 07:48:50 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
Glowbal
d34c96038e Merge branch 'master' of github.com:acemod/ACE3 2015-05-28 20:56:35 +02:00
Glowbal
9135d956f0 Merge branch 'surgicalkit' 2015-05-28 20:54:52 +02:00
Glowbal
27106ce59f minor refactor 2015-05-28 20:54:13 +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
ulteq
4ad82d9629 Switched to ctrlCreate to avoid aspect ratio problems with the listbox. 2015-05-28 20:13:22 +02:00
jonpas
d597149fc6 Merge branch 'master' into nametagsToggle 
Conflicts:
	addons/nametags/ACE_Settings.hpp
	addons/nametags/XEH_postInit.sqf
	addons/nametags/functions/fnc_onDraw3d.sqf
	addons/nametags/stringtable.xml
 2015-05-28 19:51:40 +02:00
ulteq
697710d40d Initial draft of the range card implementation. 2015-05-28 19:17:29 +02:00
IngoKauffmann
ab31891b8d runOnHover can now be CODE 
Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be
CODE
 2015-05-28 18:16:05 +02:00
Garth L-H de Wet
529e200a4c Made explosives Zeus and AI compatible specifically in regards to Deadman's switches. 2015-05-28 17:56:45 +02:00
Macusercom
489751f5aa More German string fixed 
As recommended...
 2015-05-28 16:21:53 +02:00
Nicolás Badano
5f70001ac0 Merge pull request #1409 from acemod/gogglesCacheSurfaceDust 
Goggles - Cache Surface Dust
 2015-05-28 09:48:42 -03:00
Glowbal
5df9bb4a60 Merge pull request #1322 from acemod/SendSettingsDirectlyInsteadOfSplitting 
Send directly to extension instead of splitting it
 2015-05-28 11:54:11 +02:00
PabstMirror
2cf9519702 Send to extension directly 2015-05-28 04:33:13 -05:00
PabstMirror
bfa75b833d Merge branch 'master' into debugButton 2015-05-28 04:12:30 -05:00