From 6512ce406d53b80bf0ca86e2e0b35dd848f90e8d Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Wed, 3 Jul 2019 08:44:45 -0700 Subject: [PATCH 1/8] screenshots --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b7b65df..eac4d30 100644 --- a/README.md +++ b/README.md @@ -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) From ac61f8a82216296d3451ef433c9bc8fb979c1212 Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Wed, 3 Jul 2019 08:46:40 -0700 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eac4d30..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 From d28ff7a88dce3bfe73a11d7fb724ad5ef3bc212f Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Thu, 15 Aug 2019 18:14:49 -0700 Subject: [PATCH 3/8] dropping multiple type usage in schema, for fig support --- Qor/Window.cpp | 6 +++++- bin/settings.schema.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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/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", From 52c28e6fffa1f1da1644d911912831db7bfeaed5 Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Mon, 19 Aug 2019 15:37:54 -0700 Subject: [PATCH 4/8] settings update for new schema --- bin/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 089bf36e8c59dd3fc7341edf824a3209eeb12dc8 Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Tue, 18 May 2021 19:45:26 -0700 Subject: [PATCH 5/8] Update QorBook.md --- QorBook.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QorBook.md b/QorBook.md index 05777c0..7902a9e 100644 --- a/QorBook.md +++ b/QorBook.md @@ -22,13 +22,13 @@ 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. +- 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. From 2185de9b5f34716dfc60a44d1c136f2646185c17 Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Tue, 18 May 2021 19:48:17 -0700 Subject: [PATCH 6/8] Update QorBook.md --- QorBook.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QorBook.md b/QorBook.md index 7902a9e..4d53803 100644 --- a/QorBook.md +++ b/QorBook.md @@ -32,11 +32,11 @@ git submodule foreach --recursive git pull origin master - 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. - Now you may run qor.exe or any qor example program (separate repositories) From 148e07308fb6fd2c1938a64b713a04ee81ef96d0 Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Tue, 18 May 2021 19:49:39 -0700 Subject: [PATCH 7/8] Update QorBook.md --- QorBook.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QorBook.md b/QorBook.md index 4d53803..2422383 100644 --- a/QorBook.md +++ b/QorBook.md @@ -28,8 +28,6 @@ git submodule foreach --recursive git pull origin master - 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) (optional) @@ -38,6 +36,8 @@ git submodule foreach --recursive git pull origin master - 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) ### C++ From 7a2ebf667be4c913fbc7daf5e0b07a4c1723389d Mon Sep 17 00:00:00 2001 From: Grady O'Connell Date: Tue, 18 May 2021 19:52:22 -0700 Subject: [PATCH 8/8] Update QorBook.md --- QorBook.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QorBook.md b/QorBook.md index 2422383..e7bea11 100644 --- a/QorBook.md +++ b/QorBook.md @@ -38,7 +38,7 @@ git submodule foreach --recursive git pull origin master - 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++