AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from OpenMW/master

Browse Source 
Add OpenMW commits up to 24 Jul 2017
This commit is contained in:
David Cernat 2017-07-24 20:21:04 +03:00 committed by GitHub
commit 3d1458b5a2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/model/prefs/state.cpp
View File

@ -153,11 +153,11 @@ void CSMPrefs::State::declare()
declareInt ("error-height", "Initial height of the error panel", 100). declareInt ("error-height", "Initial height of the error panel", 100).
setRange (100, 10000); setRange (100, 10000);
declareBool ("highlight-occurrences", "Highlight other occurrences of selected names", true); declareBool ("highlight-occurrences", "Highlight other occurrences of selected names", true);
declareColour ("colour-highlight", "Colour of highlighted occurrences", QColor("lightcyan"));
declareSeparator(); declareSeparator();
declareColour ("colour-int", "Highlight Colour: Integer Literals", QColor ("darkmagenta")); declareColour ("colour-int", "Highlight Colour: Integer Literals", QColor ("darkmagenta"));
declareColour ("colour-float", "Highlight Colour: Float Literals", QColor ("magenta")); declareColour ("colour-float", "Highlight Colour: Float Literals", QColor ("magenta"));
declareColour ("colour-name", "Highlight Colour: Names", QColor ("grey")); declareColour ("colour-name", "Highlight Colour: Names", QColor ("grey"));
declareColour ("colour-highlight", "Highlight Colour: Highlighting", QColor("palegreen"));
declareColour ("colour-keyword", "Highlight Colour: Keywords", QColor ("red")); declareColour ("colour-keyword", "Highlight Colour: Keywords", QColor ("red"));
declareColour ("colour-special", "Highlight Colour: Special Characters", QColor ("darkorange")); declareColour ("colour-special", "Highlight Colour: Special Characters", QColor ("darkorange"));
declareColour ("colour-comment", "Highlight Colour: Comments", QColor ("green")); declareColour ("colour-comment", "Highlight Colour: Comments", QColor ("green"));

3
apps/openmw/mwstate/statemanagerimp.cpp
View File

@ -146,6 +146,9 @@ void MWState::StateManager::newGame (bool bypass)
MWBase::Environment::get().getWorld()->startNewGame (bypass); MWBase::Environment::get().getWorld()->startNewGame (bypass);
mState = State_Running; mState = State_Running;
MWBase::Environment::get().getWindowManager()->fadeScreenOut(0);
MWBase::Environment::get().getWindowManager()->fadeScreenIn(1);
} }
catch (std::exception& e) catch (std::exception& e)
{ {