Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ioquake3 for openSUSE:Factory checked in at 2021-08-01 21:51:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ioquake3 (Old) and /work/SRC/openSUSE:Factory/.ioquake3.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ioquake3" Sun Aug 1 21:51:47 2021 rev:5 rq:909607 version:1.36+git.20210720 Changes: -------- --- /work/SRC/openSUSE:Factory/ioquake3/ioquake3.changes 2020-11-29 12:33:35.218315237 +0100 +++ /work/SRC/openSUSE:Factory/.ioquake3.new.1899/ioquake3.changes 2021-08-01 21:52:02.499207518 +0200 @@ -1,0 +2,19 @@ +Sun Aug 1 10:14:37 UTC 2021 - Carsten Ziepke <[email protected]> + +- Update to version 1.36+git.20210720 + * Add TOOLS_CFLAGS to build preamble + * Fix use of TOOLS_CC being reported as CC + * Use the correct compiler for tools when cross building under + cygwin + * Allow using pulseaudio for SDL audio capture + * Restore bots crushing unseen player on q3tourney6 in non-CTF + * Fix the number of weights in the IQM model calculation + * Fixes a crash when compiling the project on windows in + 64 bit mode + * Allow unwinding of qvmcall64 call-stub for msvc/masm + * Add epsilon to avoid division by zero in CalcSpecular() + * Add r_parallaxMapOffset + * Fix line not removed in previous commit + * OpenGL2: Flip normals for backfacing triangles + +------------------------------------------------------------------- Old: ---- ioquake3-1.36+git.20201117.tar.xz New: ---- ioquake3-1.36+git.20210720.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ioquake3.spec ++++++ --- /var/tmp/diff_new_pack.GpJ8Gy/_old 2021-08-01 21:52:02.935207005 +0200 +++ /var/tmp/diff_new_pack.GpJ8Gy/_new 2021-08-01 21:52:02.939207001 +0200 @@ -1,7 +1,7 @@ # # spec file for package ioquake3 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %endif Name: ioquake3 # don't forget to change the version in the win32 spec file as well! -Version: 1.36+git.20201117 +Version: 1.36+git.20210720 Release: 0 Summary: Quake III License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.GpJ8Gy/_old 2021-08-01 21:52:02.967206968 +0200 +++ /var/tmp/diff_new_pack.GpJ8Gy/_new 2021-08-01 21:52:02.967206968 +0200 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/ioquake/ioq3.git</param> - <param name="revision">master</param> + <param name="revision">bc8737d707595aebd7cc11d6d5a5d65ede750f59</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">ioquake3</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.GpJ8Gy/_old 2021-08-01 21:52:02.987206944 +0200 +++ /var/tmp/diff_new_pack.GpJ8Gy/_new 2021-08-01 21:52:02.987206944 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ioquake/ioq3.git</param> - <param name="changesrevision">d1b7ab6b22cc99205ac890910e286859e30df40e</param> + <param name="changesrevision">bc8737d707595aebd7cc11d6d5a5d65ede750f59</param> </service> </servicedata> \ No newline at end of file ++++++ ioquake3-1.36+git.20201117.tar.xz -> ioquake3-1.36+git.20210720.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/.gitignore new/ioquake3-1.36+git.20210720/.gitignore --- old/ioquake3-1.36+git.20201117/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/.gitignore 2021-07-20 22:51:19.000000000 +0200 @@ -0,0 +1,41 @@ +build +Makefile.local +*.swp +*tags +*~ + +# OS X +#################### +.Spotlight-V100/ +.Trashes/ +._* +.AppleDouble +.DS_Store +.LSOverride +Icon? + +# Xcode +#################### +*.mode1v3 +*.mode2v3 +*.pbxuser +*.perspectivev3 +*.user +*.xcuserstate +*.moved-aside +*~.nib +.idea/ +DerivedData/ +project.xcworkspace/ +xcuserdata/ +profile +!default.pbxuser +!default.mode1v3 +!default.mode2v3 +!default.perspectivev3 + +# Microsoft Visual Studio +#################### +*.sdf +*.opensdf +*.suo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/Makefile new/ioquake3-1.36+git.20210720/Makefile --- old/ioquake3-1.36+git.20201117/Makefile 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/Makefile 2021-07-20 22:51:19.000000000 +0200 @@ -634,7 +634,19 @@ ifeq ($(COMPILE_PLATFORM),cygwin) TOOLS_BINEXT=.exe - TOOLS_CC=$(CC) + + # Under cygwin the default of using gcc for TOOLS_CC won't work, so + # we need to figure out the appropriate compiler to use, based on the + # host architecture that we're running under (as tools run on the host) + ifeq ($(COMPILE_ARCH),x86_64) + TOOLS_MINGW_PREFIXES=x86_64-w64-mingw32 amd64-mingw32msvc + endif + ifeq ($(COMPILE_ARCH),x86) + TOOLS_MINGW_PREFIXES=i686-w64-mingw32 i586-mingw32msvc i686-pc-mingw32 + endif + + TOOLS_CC=$(firstword $(strip $(foreach TOOLS_MINGW_PREFIX, $(TOOLS_MINGW_PREFIXES), \ + $(call bin_path, $(TOOLS_MINGW_PREFIX)-gcc)))) endif LIBS= -lws2_32 -lwinmm -lpsapi @@ -1384,6 +1396,9 @@ @echo " SERVER_CFLAGS:" $(call print_wrapped, $(SERVER_CFLAGS)) @echo "" + @echo " TOOLS_CFLAGS:" + $(call print_wrapped, $(TOOLS_CFLAGS)) + @echo "" @echo " LDFLAGS:" $(call print_wrapped, $(LDFLAGS)) @echo "" @@ -1584,7 +1599,7 @@ $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS) $(STRINGIFY): $(TOOLSDIR)/stringify.c - $(echo_cmd) "CC $@" + $(echo_cmd) "TOOLS_CC $@" $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(TOOLSDIR)/stringify.c $(TOOLS_LIBS) define DO_Q3LCC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/asm/vm_x86_64.asm new/ioquake3-1.36+git.20210720/code/asm/vm_x86_64.asm --- old/ioquake3-1.36+git.20201117/code/asm/vm_x86_64.asm 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/asm/vm_x86_64.asm 2021-07-20 22:51:19.000000000 +0200 @@ -28,13 +28,35 @@ ; Call to compiled code after setting up the register environment for the VM ; prototype: ; uint8_t qvmcall64(int *programStack, int *opStack, intptr_t *instructionPointers, byte *dataBase); +; +; This call-stub has its own custom calling convention due to pushing all non-volatile registers +; to the stack. The game uses set/longjmp which on Windows uses "RtlUnwindEx" to unwind the callstack. +; This function cannot be unwound by default due to the custom calling convention. +; To allow unwinding, we need to add custom SEH unwind data to the function. -qvmcall64 PROC - push rsi ; push non-volatile registers to stack +qvmcall64 PROC FRAME + push r12 ; push all non-volatile registers to stack + .pushreg r12 + push r13 + .pushreg r13 + push r14 + .pushreg r14 + push r15 + .pushreg r15 push rdi + .pushreg rdi + push rsi + .pushreg rsi push rbx + .pushreg rbx + push rbp + .pushreg rbp + ; need to save pointer in rcx so we can write back the programData value to caller push rcx + .pushreg rcx + + .endprolog ; custom unwind data ends here ; registers r8 and r9 have correct value already thanx to __fastcall xor rbx, rbx ; opStackOfs starts out being 0 @@ -48,9 +70,14 @@ mov dword ptr [rcx], esi ; write back the programStack value mov al, bl ; return opStack offset + pop rbp ; restore all non-volatile registers after the call pop rbx - pop rdi pop rsi + pop rdi + pop r15 + pop r14 + pop r13 + pop r12 ret qvmcall64 ENDP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/autoupdater/rsa_tools/.gitignore new/ioquake3-1.36+git.20210720/code/autoupdater/rsa_tools/.gitignore --- old/ioquake3-1.36+git.20201117/code/autoupdater/rsa_tools/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/autoupdater/rsa_tools/.gitignore 2021-07-20 22:51:19.000000000 +0200 @@ -0,0 +1,8 @@ +crypt-*.tar.bz2 +tfm-*.tar.xz +libtomcrypt-* +tomsfastmath-* +rsa_make_keys +rsa_sign +rsa_verify +*.exe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/game/ai_dmq3.c new/ioquake3-1.36+git.20210720/code/game/ai_dmq3.c --- old/ioquake3-1.36+git.20201117/code/game/ai_dmq3.c 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/game/ai_dmq3.c 2021-07-20 22:51:19.000000000 +0200 @@ -3733,7 +3733,7 @@ shootbutton = qfalse; break; } - else if (bs->enemy == i) { + else if (gametype < GT_CTF || bs->enemy == i) { shootbutton = qtrue; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/renderergl1/tr_model_iqm.c new/ioquake3-1.36+git.20210720/code/renderergl1/tr_model_iqm.c --- old/ioquake3-1.36+git.20201117/code/renderergl1/tr_model_iqm.c 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/renderergl1/tr_model_iqm.c 2021-07-20 22:51:19.000000000 +0200 @@ -1346,7 +1346,7 @@ vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10]; vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11]; - for( j = 1; j < 3; j++ ) { + for( j = 1; j < 4; j++ ) { if ( blendWeights[j] <= 0.0f ) { break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/renderergl2/glsl/lightall_fp.glsl new/ioquake3-1.36+git.20210720/code/renderergl2/glsl/lightall_fp.glsl --- old/ioquake3-1.36+git.20201117/code/renderergl2/glsl/lightall_fp.glsl 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/renderergl2/glsl/lightall_fp.glsl 2021-07-20 22:51:19.000000000 +0200 @@ -89,6 +89,9 @@ // current size of search window float size = 1.0 / float(linearSearchSteps); + // adjust position if offset above surface + dp -= ds * r_parallaxMapOffset; + // current depth position float depth = 0.0; @@ -141,7 +144,7 @@ } #endif - return bestDepth; + return bestDepth - r_parallaxMapOffset; } float LightRay(vec2 dp, vec2 ds, sampler2D normalMap) @@ -201,7 +204,7 @@ float rr = roughness*roughness; float rrrr = rr*rr; float d = (NH * NH) * (rrrr - 1.0) + 1.0; - float v = (EH * EH) * (roughness + 0.5); + float v = (EH * EH) * (roughness + 0.5) + EPSILON; return specular * (rrrr / (4.0 * d * d * v)); } @@ -261,7 +264,8 @@ float NL, NH, NE, EH, attenuation; #if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT) - mat3 tangentToWorld = mat3(var_Tangent.xyz, var_Bitangent.xyz, var_Normal.xyz); + vec3 surfNormal = (!gl_FrontFacing ? var_Normal : -var_Normal).xyz; + mat3 tangentToWorld = mat3(var_Tangent.xyz, var_Bitangent.xyz, surfNormal); viewDir = vec3(var_Normal.w, var_Tangent.w, var_Bitangent.w); E = normalize(viewDir); #endif @@ -332,7 +336,7 @@ N.z = sqrt(clamp((0.25 - N.x * N.x) - N.y * N.y, 0.0, 1.0)); N = tangentToWorld * N; #else - N = var_Normal.xyz; + N = surfNormal; #endif N = normalize(N); @@ -358,7 +362,7 @@ #if !defined(USE_LIGHT_VECTOR) ambientColor = lightColor; - float surfNL = clamp(dot(var_Normal.xyz, L), 0.0, 1.0); + float surfNL = clamp(dot(surfNormal, L), 0.0, 1.0); // reserve 25% ambient to avoid black areas on normalmaps lightColor *= 0.75; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/renderergl2/tr_glsl.c new/ioquake3-1.36+git.20210720/code/renderergl2/tr_glsl.c --- old/ioquake3-1.36+git.20201117/code/renderergl2/tr_glsl.c 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/renderergl2/tr_glsl.c 2021-07-20 22:51:19.000000000 +0200 @@ -1125,6 +1125,8 @@ if (r_parallaxMapShadows->integer) Q_strcat(extradefines, 1024, "#define USE_PARALLAXMAP_SHADOWS\n"); + + Q_strcat(extradefines, 1024, va("#define r_parallaxMapOffset %f\n", r_parallaxMapOffset->value)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/renderergl2/tr_init.c new/ioquake3-1.36+git.20210720/code/renderergl2/tr_init.c --- old/ioquake3-1.36+git.20201117/code/renderergl2/tr_init.c 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/renderergl2/tr_init.c 2021-07-20 22:51:19.000000000 +0200 @@ -132,6 +132,7 @@ cvar_t *r_specularMapping; cvar_t *r_deluxeMapping; cvar_t *r_parallaxMapping; +cvar_t *r_parallaxMapOffset; cvar_t *r_parallaxMapShadows; cvar_t *r_cubeMapping; cvar_t *r_cubemapSize; @@ -1243,6 +1244,7 @@ r_specularMapping = ri.Cvar_Get( "r_specularMapping", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_deluxeMapping = ri.Cvar_Get( "r_deluxeMapping", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_parallaxMapping = ri.Cvar_Get( "r_parallaxMapping", "0", CVAR_ARCHIVE | CVAR_LATCH ); + r_parallaxMapOffset = ri.Cvar_Get( "r_parallaxMapOffset", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_parallaxMapShadows = ri.Cvar_Get( "r_parallaxMapShadows", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_cubeMapping = ri.Cvar_Get( "r_cubeMapping", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_cubemapSize = ri.Cvar_Get( "r_cubemapSize", "128", CVAR_ARCHIVE | CVAR_LATCH ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/renderergl2/tr_local.h new/ioquake3-1.36+git.20210720/code/renderergl2/tr_local.h --- old/ioquake3-1.36+git.20201117/code/renderergl2/tr_local.h 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/renderergl2/tr_local.h 2021-07-20 22:51:19.000000000 +0200 @@ -1778,6 +1778,7 @@ extern cvar_t *r_specularMapping; extern cvar_t *r_deluxeMapping; extern cvar_t *r_parallaxMapping; +extern cvar_t *r_parallaxMapOffset; extern cvar_t *r_parallaxMapShadows; extern cvar_t *r_cubeMapping; extern cvar_t *r_cubemapSize; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/renderergl2/tr_model_iqm.c new/ioquake3-1.36+git.20210720/code/renderergl2/tr_model_iqm.c --- old/ioquake3-1.36+git.20201117/code/renderergl2/tr_model_iqm.c 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/renderergl2/tr_model_iqm.c 2021-07-20 22:51:19.000000000 +0200 @@ -1528,7 +1528,7 @@ vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10]; vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11]; - for( j = 1; j < 3; j++ ) { + for( j = 1; j < 4; j++ ) { if ( blendWeights[j] <= 0.0f ) { break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/code/sdl/sdl_snd.c new/ioquake3-1.36+git.20210720/code/sdl/sdl_snd.c --- old/ioquake3-1.36+git.20201117/code/sdl/sdl_snd.c 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/code/sdl/sdl_snd.c 2021-07-20 22:51:19.000000000 +0200 @@ -281,12 +281,7 @@ #ifdef USE_SDL_AUDIO_CAPTURE // !!! FIXME: some of these SDL_OpenAudioDevice() values should be cvars. s_sdlCapture = Cvar_Get( "s_sdlCapture", "1", CVAR_ARCHIVE | CVAR_LATCH ); - // !!! FIXME: pulseaudio capture records audio the entire time the program is running. https://bugzilla.libsdl.org/show_bug.cgi?id=4087 - if (Q_stricmp(SDL_GetCurrentAudioDriver(), "pulseaudio") == 0) - { - Com_Printf("SDL audio capture support disabled for pulseaudio (https://bugzilla.libsdl.org/show_bug.cgi?id=4087)\n"); - } - else if (!s_sdlCapture->integer) + if (!s_sdlCapture->integer) { Com_Printf("SDL audio capture support disabled by user ('+set s_sdlCapture 1' to enable)\n"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/misc/msvc12/.gitignore new/ioquake3-1.36+git.20210720/misc/msvc12/.gitignore --- old/ioquake3-1.36+git.20201117/misc/msvc12/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/misc/msvc12/.gitignore 2021-07-20 22:51:19.000000000 +0200 @@ -0,0 +1,338 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true +**/wwwroot/lib/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20201117/opengl2-readme.md new/ioquake3-1.36+git.20210720/opengl2-readme.md --- old/ioquake3-1.36+git.20201117/opengl2-readme.md 2020-11-17 19:08:13.000000000 +0100 +++ new/ioquake3-1.36+git.20210720/opengl2-readme.md 2021-07-20 22:51:19.000000000 +0200 @@ -184,6 +184,11 @@ 1 - Use parallax occlusion mapping. 2 - Use relief mapping. (slower) +* `r_parallaxMapOffset` - Set the parallax height offset. + 0 - Values map to -255 - 0. (default) + 0.5 - Values map to -127 - 127. + 1.0 - Values map to 0 - 255. + * `r_parallaxMapShadows` - Enable self-shadowing on parallax map supported materials. 0 - No. (default)
