Merge remote-tracking branch 'origin/miami' into miami

# Conflicts:
#	src/core/config.h
This commit is contained in:
Sergeanur 2020-08-19 23:35:10 +03:00
commit dab6d6dd6d
78 changed files with 3941 additions and 126 deletions

View file

@ -226,6 +226,7 @@ enum Config {
//#define USE_TEXTURE_POOL
//#define CUTSCENE_BORDERS_SWITCH
//#define EXTENDED_COLOURFILTER // more options for colour filter (replaces mblur)
//#define EXTENDED_PIPELINES // custom render pipelines (includes Neo)
//#define MULTISAMPLING // adds MSAA option TODO
#ifdef LIBRW