16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 12:29:18 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-04-19 23:08:39 +02:00
20 changed files with 1498 additions and 318 deletions

View File

@@ -130,6 +130,10 @@ global_settings::ConfigParse(cParser &Parser) {
Parser >> AudioVolume;
AudioVolume = clamp( AudioVolume, 1.f, 4.f );
}
else if (token == "sound.maxsources") {
Parser.getTokens();
Parser >> audio_max_sources;
}
// else if (str==AnsiString("renderalpha")) //McZapkie-1312302 - dwuprzebiegowe renderowanie
// bRenderAlpha=(GetNextSymbol().LowerCase()==AnsiString("yes"));
else if (token == "physicslog")