Glowbal
0b8896239c
Progress bar stops on death - fix for #1449
2015-05-31 09:23:36 +02:00
PabstMirror
23d300df52
Merge pull request #1417 from acemod/localDefuseObjects
...
Explosives - Local defuse objects
2015-05-30 15:46:07 -05:00
ulteq
b1f0f318ae
Merge pull request #1443 from acemod/cupConfig
...
CUP config
2015-05-30 21:54:12 +02:00
ulteq
cb12146f41
Tabs -> Spaces
2015-05-30 21:53:28 +02:00
ulteq
75518af90f
Tabs -> Spaces
2015-05-30 21:52:57 +02:00
ulteq
e41c51966b
Added cup scopes config entries
2015-05-30 21:51:24 +02:00
Glowbal
3e3fdcf66e
Merge pull request #1429 from acemod/cseNVGadjustment
...
NightVision adjustment - use CSE's gamma
2015-05-30 21:50:56 +02:00
ulteq
9936af3e4c
Added config entries for all cup weapon classes
2015-05-30 21:20:40 +02:00
ulteq
872501dad2
Removed newline brackets
2015-05-30 21:20:17 +02:00
ulteq
6f1c6ae8c1
Added missing ammo class
2015-05-30 20:33:32 +02:00
ulteq
08b779956d
Merge pull request #1441 from acemod/rangeCardFixes
...
Improved error handling when AB is enabled with incomplete configs
2015-05-30 20:08:11 +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
PabstMirror
d7d225cebc
Send waiting debug msg only once
2015-05-30 01:28:15 -05:00
Nicolás Badano
d46074ad27
Merge pull request #1432 from acemod/fixSettings
...
Fix ace_settings
2015-05-30 00:59:23 -03:00
esteldunedain
81bd167ecd
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fixSettings
...
Conflicts:
addons/common/XEH_preInit.sqf
2015-05-30 00:49:02 -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
esteldunedain
b416e66509
Fix problem with #1214 . Probably solve #1273
2015-05-30 00:31:52 -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
Nicolás Badano
8dc8d62bd3
Merge pull request #1428 from acemod/blurInteractionMenu
...
Blur background while interaction menu is open
2015-05-29 16:58:33 -03:00
Glowbal
00acbaf44d
Added blur background client setting
2015-05-29 21:56:07 +02:00
ulteq
67308ab00d
Merge pull request #1418 from acemod/rangecard
...
Rangecards
2015-05-29 21:15:07 +02:00
ulteq
a57d8486ca
Removed some unneeded code
2015-05-29 20:51:20 +02:00
Nicolás Badano
9bec910211
Merge pull request #1422 from alganthe/documentation_pass_5
...
Documentation pass 5
2015-05-29 15:32:22 -03:00
ulteq
44fbefa0e2
Merge pull request #1427 from acemod/bwmodCompatFix
...
Fixed incorrect barrel length
2015-05-29 20:12:14 +02:00
ulteq
2d7b4e5bdc
Fixed incorrect barrel length
2015-05-29 20:11:44 +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
Glowbal
aee783c1e0
Merge pull request #378 from acemod/ace2Tracers
...
ACE2 ball tracers port.
2015-05-29 17:52:08 +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
Josuan Albin
98652c7bdc
reloadlaunchers usage
2015-05-29 13:37:12 +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
f2e21fcfef
Merge pull request #1425 from acemod/speedOfSound
...
Added speed of sound calculation:
2015-05-29 12:36:08 +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
Josuan Albin
45f5bb8625
typos
2015-05-29 09:40:29 +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
Josuan Albin
f48127e6ec
Documentation pass 5
...
- Documentation done except (medical, AtragMX, MicroDAGR, Vector, Kestrel 4500)
- Typos fixed
- enjoy the review MOWHAHAHAHAH.
2015-05-28 23:56:43 +02:00
Nicolás Badano
8810fc981a
Merge pull request #1378 from BullHorn7/docs-optional
...
Docs: Installation - add optionals
2015-05-28 16:30:16 -03: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
