From 342c6048bfcfb0249ee5c699af8d10e540cef350 Mon Sep 17 00:00:00 2001 From: def Date: Fri, 20 Oct 2017 22:47:45 +0200 Subject: [PATCH] Use new opengl by default --- scripts/make_release.py | 4 ++++ src/engine/shared/config_variables.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/make_release.py b/scripts/make_release.py index f81037c0e..1a2a4ac1d 100644 --- a/scripts/make_release.py +++ b/scripts/make_release.py @@ -66,6 +66,8 @@ shutil.copy("autoexec_server.cfg", package_dir) if include_data and not use_bundle: os.mkdir(os.path.join(package_dir, "data")) copydir("data", package_dir) + os.mkdir(os.path.join(package_dir, "shader")) + copydir("shader", package_dir) if platform[:3] == "win": shutil.copy("other/config_directory.bat", package_dir) shutil.copy("SDL2.dll", package_dir) @@ -119,7 +121,9 @@ if use_bundle: os.mkdir(clientbundle_resource_dir) os.mkdir(clientbundle_framework_dir) os.mkdir(os.path.join(clientbundle_resource_dir, "data")) + os.mkdir(os.path.join(clientbundle_resource_dir, "shader")) copydir("data", clientbundle_resource_dir) + copydir("shader", clientbundle_resource_dir) shutil.copy("other/icons/DDNet.icns", clientbundle_resource_dir) diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 88b21e9c6..6503f5b17 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -400,7 +400,7 @@ MACRO_CONFIG_INT(ClDemoSliceEnd, cl_demo_slice_end, -1, 0, 0, CFGFLAG_SAVE|CFGFL MACRO_CONFIG_INT(ClDemoShowSpeed, cl_demo_show_speed, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Show speed meter on change") //opengl -MACRO_CONFIG_INT(GfxForceOldOpenGL, gfx_force_old_opengl, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Forces to use the old opengl version.") +MACRO_CONFIG_INT(GfxForceOldOpenGL, gfx_force_old_opengl, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Forces to use the old opengl version.") #if !defined(CONF_PLATFORM_MACOSX) MACRO_CONFIG_INT(GfxEnableTextureUnitOptimization, gfx_enable_texture_unit_optimization, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Use multiple texture units, instead of only one.") #else