diff --git a/Qor/Window.cpp b/Qor/Window.cpp index 9372530..268d5d1 100644 --- a/Qor/Window.cpp +++ b/Qor/Window.cpp @@ -63,7 +63,11 @@ Window :: Window( bool fullscreen = !(args.has("-w") || args.has("--windowed")); try{ fullscreen = !video_cfg->at("windowed"); - }catch(...){} + }catch(...){ + try{ + fullscreen = video_cfg->at("windowed")=="false"; + }catch(...){} + } bool borderless = args.has("-b") || args.has("--borderless"); try{ diff --git a/QorBook.md b/QorBook.md index 05777c0..e7bea11 100644 --- a/QorBook.md +++ b/QorBook.md @@ -22,23 +22,23 @@ git submodule foreach --recursive git pull origin master - Make sure you have the newest Visual Studio. -- [Download the dependencies here](https://dl.dropboxusercontent.com/u/119549/qor_libs_win32.zip) +- [Download the dependencies here](https://www.dropbox.com/s/nywjkhof2v50zqe/qor_libs_win32.zip?dl=0p) - Run all the installers included (use the default paths) and put the msvc and gtkmm folder into C:\. - Install python 2.7 32-bit and use the default install location. -- Edit this file (as admin) C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\includemutex. On the line that says �unique_lock(_Mutex& _Mtx, const xtime *_Abs_time)� change xtime to ::xtime. On line that says �bool try_lock_until(const xtime *_Abs_time)� change xtime to ::xtime. - - Put C:\msvc\bin32 in your User PATH environment variable. -- Install [siege-tools](http://github.com/flipcoder/siege-tools) +- Install [siege-tools](http://github.com/flipcoder/siege-tools) (optional) - Open a Visual Studio tools console -- Run *sgmake* inside the qor main folder +- Run *sgmake* inside the qor main folder, OR build the solution using premake and msbuild/msvc. + +- If you experience problems with build issues related to "xtime", edit this file (as admin) C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\includemutex. On the line that says “unique_lock(_Mutex& _Mtx, const xtime *_Abs_time)” change xtime to ::xtime. On line that says “bool try_lock_until(const xtime *_Abs_time)” change xtime to ::xtime. -- Now you may run qor.exe or any qor example program (separate repositories) +- Now you may run qor.exe ### C++ diff --git a/README.md b/README.md index b7b65df..7496a87 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This is a rewrite of my [older game engine](https://github.com/flipcoder/qor-old - Basic instancing - Render-to-Texture - Thread-safe OpenGL task handler -- C++ and Python support +- C++ and (wip) Python support - Multi-layer tilemap system for 2D games - Compatible with [Tiled](http://mapeditor.org) map editor - Python Console @@ -85,9 +85,10 @@ More features will be listed as I add them... ## Screenshots -[![Screenshot1](http://i.imgur.com/zQxsEfgl.jpg)](http://i.imgur.com/zQxsEfg.jpg) +[![Micro Army](https://i.imgur.com/cNIOXHal.jpg)](https://i.imgur.com/cNIOXHa.jpg) -[![Screenshot2](http://i.imgur.com/XNxLRtKl.jpg)](http://i.imgur.com/XNxLRtK.jpg) +[![FRAG.EXE](https://i.imgur.com/P5Pntbsl.jpg)](https://i.imgur.com/P5Pntbs.jpg) -[![Screenshot2](http://i.imgur.com/VPH9ZpCl.png)](http://i.imgur.com/VPH9ZpC.jpg) +[![Lights](http://i.imgur.com/XNxLRtKl.jpg)](http://i.imgur.com/XNxLRtK.jpg) +[![Fire](http://i.imgur.com/VPH9ZpCl.png)](http://i.imgur.com/VPH9ZpC.jpg) diff --git a/bin/settings.json b/bin/settings.json index cbfc54f..99e51ea 100644 --- a/bin/settings.json +++ b/bin/settings.json @@ -1,7 +1,7 @@ { "video": { "resolution": "1920x1080", - "windowed": true, + "windowed": "true", "vsync": false, "AA": 4, "anisotropy": 4 diff --git a/bin/settings.schema.json b/bin/settings.schema.json index bb07b90..f003398 100644 --- a/bin/settings.schema.json +++ b/bin/settings.schema.json @@ -7,7 +7,7 @@ "windowed": { ".name": "Window", ".desc": "Play in windowed or fullscreen mode", - ".values": [ false, true, "borderless" ], + ".values": [ "false", "true", "borderless" ], ".options": [ "Fullscreen", "Windowed",