chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-11 00:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prs1-refactor-for-testing

Browse Source
This commit is contained in:
sawinglogz 2019-05-06 12:25:29 -04:00
commit 545d48afc4
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar/SleepLib/common.cpp
View File

@ -151,6 +151,11 @@ float getOpenGLVersion()
#endif #endif
} }
// Obtains graphic engine as a string, for use in title bar
// This is a bad approach as it depends on the exact version
// id strings to distinguish engines.
// (But too much work to find an alternate solution today)
// This works on Windows. Don't know about other platforms.
QString getGraphicsEngine() QString getGraphicsEngine()
{ {
QString gfxEngine = QString(); QString gfxEngine = QString();
@ -158,8 +163,11 @@ QString getGraphicsEngine()
gfxEngine = CSTR_GFX_BrokenGL; gfxEngine = CSTR_GFX_BrokenGL;
#else #else
QString glversion = getOpenGLVersionString(); QString glversion = getOpenGLVersionString();
qDebug() << glversion << glversion;
if (glversion.contains(CSTR_GFX_ANGLE)) { if (glversion.contains(CSTR_GFX_ANGLE)) {
gfxEngine = CSTR_GFX_ANGLE; gfxEngine = CSTR_GFX_ANGLE;
} else if (glversion.contains("Mesa")) {
gfxEngine = CSTR_GFX_BrokenGL;
} else { } else {
gfxEngine = CSTR_GFX_OpenGL; gfxEngine = CSTR_GFX_OpenGL;
} }

14
oscar/docs/release_notes.html
View File

@ -6,6 +6,20 @@
Which was written and copyright 2011-2018 &copy; Mark Watkins Which was written and copyright 2011-2018 &copy; Mark Watkins
</p> </p>
<p>
<b>Changes and fixes in OSCAR v1.0.2-beta-1</b>
<ul>
<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
<li>Offer migration to non-default directory on first use</li>
<li>Add "Use Legacy Graphics.reg" to ask OSCAR to use simpler graphics for older systems</li>
<li>Change Preferences measurement units choice to Metric or English</li>
<li>Improve display of cmH2O numbers</li>
<li>Re-organize build instructions and other cleanup</li>
<li>Show graphics engine in title bar correctly</li>
<li>Adjust size of Preferences dialog to fit smaller screens</li>
</ul>
</p>
<p> <p>
<b>Changes and fixes in OSCAR v1.0.1-r-1</b> <b>Changes and fixes in OSCAR v1.0.1-r-1</b>
<ul> <ul>

4
oscar/version.h
View File

@ -14,8 +14,8 @@
const int major_version = 1; // incompatible API changes const int major_version = 1; // incompatible API changes
const int minor_version = 0; // new features that don't break things const int minor_version = 0; // new features that don't break things
const int revision_number = 1; // bugfixes, revisions const int revision_number = 2; // bugfixes, revisions
const QString ReleaseStatus = "r"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number); const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number); const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);