Christoph Oelckers 3e17f3cb97 Merge commit 'fd0e9824b60a8cae288102551f0f3134a221cf3c' into whaven ... # Conflicts: # source/build/include/build.h # source/build/src/engine.cpp # source/build/src/engine_priv.h		2021-03-26 15:35:19 +01:00
..
build	Merge commit 'fd0e9824b60a8cae288102551f0f3134a221cf3c' into whaven	2021-03-26 15:35:19 +01:00
common	Merge commit 'fd0e9824b60a8cae288102551f0f3134a221cf3c' into whaven	2021-03-26 15:35:19 +01:00
core	Merge commit 'fd0e9824b60a8cae288102551f0f3134a221cf3c' into whaven	2021-03-26 15:35:19 +01:00
games	Merge commit 'fd0e9824b60a8cae288102551f0f3134a221cf3c' into whaven	2021-03-26 15:35:19 +01:00
glbackend	- moved shadeToLight out of build.h.	2021-03-25 09:13:59 +01:00
libsmackerdec	- fixed the noisiest value truncation warnings after shortly re-enabling them in the compiler, plus a few places where the warning pointed to incorrect code.	2020-09-26 11:59:24 +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 commit 'e47b4507e4c0460dcc7f92b6f440c2f0d4832433' into whaven	2021-03-24 19:07:23 +01:00
g_pch.h	- cleaned up the remaining dependencies on windows.h	2020-02-03 21:30:57 +01:00
gitinfo.cpp