Commit Graph

5181 Commits

Author SHA1 Message Date
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
Glowbal
27106ce59f minor refactor 2015-05-28 20:54:13 +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
BullHorn
de1bfa8f80 fix typo, add inert/not-inert description 2015-05-28 18:04:08 +03:00
Macusercom
489751f5aa More German string fixed
As recommended...
2015-05-28 16:21:53 +02:00
BullHorn
da34cfa296 Merge remote-tracking branch 'origin/docs-optional' into docs-optional 2015-05-28 16:54:55 +03:00
BullHorn
fcd7ff5287 docs: optional pbos - add notice for mod makers 2015-05-28 16:51:53 +03:00
BullHorn
f00a032e17 Add notice for mod-makers 2015-05-28 16:41:23 +03:00
Nicolás Badano
6332e035a7 Merge pull request #1412 from Tourorist/patch-4
Alphabetized the contributor list
2015-05-28 10:03:26 -03:00
Nicolás Badano
5f70001ac0 Merge pull request #1409 from acemod/gogglesCacheSurfaceDust
Goggles - Cache Surface Dust
2015-05-28 09:48:42 -03:00
Bracconiere
30156599db All's working for now. 2015-05-28 14:55:45 +03:00
Bracconiere
4ef8bbace8 Alphabetized the contributor list
More recent additions seem to have been just stacked unsorted at the bottom.
2015-05-28 14:30:26 +03:00