Christoph Oelckers 198fbf9297 Merge branch 'master' into whaven ... # Conflicts: # source/core/screenjob.cpp # source/core/searchpaths.cpp		2021-06-03 08:52:19 +02:00
..
build	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
common	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
core	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
games	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
glbackend	Give -1 to model light index otherwise mLightIndex in renderstate ends up getting set to 0 which is a valid light index	2021-05-13 10:04:40 +02:00
platform	- Remove leftover Ion Fury stuffs causing log errors like "Script error, 'D:/Program Files (x86)/Steam/steamapps/common/Ion Fury/fury.grpinfo" line 10: Warning: GRP without game defined. Ignoring'".	2020-09-25 18:06:06 +10:00
thirdparty	- macOS backend update, plus moving base64.cpp around.	2020-09-27 16:12:50 +02:00
CMakeLists.txt	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
g_pch.h	- cleaned up the remaining dependencies on windows.h	2020-02-03 21:30:57 +01:00
gitinfo.cpp	- rewrote the screenshot code to use m_png as its backend.	2019-11-02 12:59:59 +01:00