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

# Conflicts: # src/core/config.h
2020-08-19 23:35:10 +03:00
parent 827b240078 bb948904b6
commit dab6d6dd6d
78 changed files with 3941 additions and 126 deletions
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -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