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
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
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
ulteq
4ad82d9629
Switched to ctrlCreate to avoid aspect ratio problems with the listbox.
2015-05-28 20:13:22 +02:00
ulteq
697710d40d
Initial draft of the range card implementation.
2015-05-28 19:17:29 +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
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
236ae767b5
Goggles - Cache Surface Dust
2015-05-28 00:18:45 -05:00
PabstMirror
3a4a02e524
#1407 - Make Saline 500ml match mass blood/plasma
2015-05-27 16:23:25 -05:00
jonpas
700c4cb962
Removed mistakenly added quotes in realisticnames comments
2015-05-27 22:57:50 +02:00
jonpas
b85ae8f194
Fixed missed external strings
2015-05-27 22:34:57 +02:00
jonpas
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
jonpas
a99c02ff02
Added ESTRING and ECSTRING for external module references
2015-05-27 22:02:03 +02:00
jonpas
1c58ff823d
Stringtable fixes medical
2015-05-27 21:58:35 +02:00
jonpas
6f6f2a55f0
Stringtable fixes except medical
2015-05-27 21:43:30 +02:00
jonpas
87db721d4f
Stringtable fixes up to medical
2015-05-27 21:19:14 +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
9ed15d9702
Merge pull request #1302 from acemod/nameTagFixes
...
Nametags - Use EyePos of target / windows
2015-05-27 12:19:17 -05:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
PabstMirror
30adc2d463
Patch Merge of PR #1156 - Optics for tripplehead
2015-05-27 11:28:06 -05:00
Nicolás Badano
c365008330
Merge pull request #1275 from acemod/fixUAVandInteractionInhert
...
Fix UAV and Interaction Compile Inheritance
2015-05-27 12:20:46 -03:00
jonpas
600fe61f72
Added STRING and CSTRING Macros
2015-05-27 17:10:34 +02:00
esteldunedain
39fec12528
Merge branch 'master' into reliableSettings
2015-05-27 12:09:06 -03:00
esteldunedain
bb99d5a860
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
2015-05-27 12:08:47 -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
BaerMitUmlaut
f2e6a98eb4
Killed tabs
2015-05-27 13:51:22 +02:00
