archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-13 11:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	src/render/Timecycle.cpp
This commit is contained in:
Sergeanur
2021-01-08 20:24:43 +02:00
parent bf3135eb41 68e8c1ce04
commit 4debd89d8e
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Frontend.h
View File

@ -661,8 +661,8 @@ public:
int32 m_nSelectedScreenMode;
#endif
#ifdef MULTISAMPLING
static int8 m_nPrefsMSAALevel;
static int8 m_nDisplayMSAALevel;
int8 m_nPrefsMSAALevel;
int8 m_nDisplayMSAALevel;
#endif
enum LANGUAGE

3
src/core/config.h
View File

@ -314,7 +314,7 @@ enum Config {
# define GRAPHICS_MENU_OPTIONS // otherwise Display settings will be scrollable
//# define NO_ISLAND_LOADING // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
# define CUTSCENE_BORDERS_SWITCH
//# define MULTISAMPLING // adds MSAA option
# define MULTISAMPLING // adds MSAA option
# define INVERT_LOOK_FOR_PAD // enable the hidden option
# endif
#endif
@ -384,7 +384,6 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
#ifdef LIBRW
// these are not supported with librw yet
# undef MULTISAMPLING
#endif
// IMG
#define BIG_IMG // allows to read larger img files