eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-04-06 22:33:08 +02:00
parent 5380666fa6 87f078925c
commit a914065dd0
13 changed files with 908 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Globals.cpp
View File

@@ -307,6 +307,11 @@ global_settings::ConfigParse(cParser &Parser) {
Parser.getTokens( 1, false );
Parser >> ScenarioTimeOffset;
}
else if( token == "scenario.time.current" ) {
// sync simulation time with local clock
Parser.getTokens( 1, false );
Parser >> ScenarioTimeCurrent;
}
else if( token == "scalespeculars" ) {
// whether strength of specular highlights should be adjusted (generally needed for legacy 3d models)
Parser.getTokens();