[rbdoom3bfg] 01/03: Imported Upstream version 1.0.3+repack1+git20151103
Tobias Frost
tobi at moszumanska.debian.org
Tue Nov 3 21:47:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 95ac24ecd26381ca5f757e3a712e8c038b60874b
Author: Tobias Frost <tobi at coldtobi.de>
Date: Tue Nov 3 21:07:35 2015 +0100
Imported Upstream version 1.0.3+repack1+git20151103
---
ChangeLog | 48 +++++++++++++++++++++++++++++++++
neo/framework/FileSystem.cpp | 2 +-
neo/renderer/RenderProgs.h | 10 ++++---
neo/renderer/tr_backend_rendertools.cpp | 3 +++
4 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2df21b9..541bfb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-22 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge remote-tracking branch 'RBDOOM-3-BFG/master'
+
+2015-10-22 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Defaulted fs_resourceLoadPriority to 0
+
2015-08-05 Robert Beckebans <robert.beckebans at gmail.com>
* Merge pull request #240 from DanielGibson/fix-rb-crashes
@@ -96,8 +104,16 @@
2015-05-01 Robert Beckebans <robert.beckebans at gmail.com>
+ * Merge remote-tracking branch 'RBDOOM/master'
+
+2015-05-01 Robert Beckebans <robert.beckebans at gmail.com>
+
* Fixed warnings with Clang 3.6
+2015-05-01 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge remote-tracking branch 'RBDOOM/master'
+
2015-03-26 Robert Beckebans <robert.beckebans at gmail.com>
* Merge pull request #221 from Tea23/patch-1
@@ -118,6 +134,10 @@
* Tweaked shadowmap bias to fight Peter Pan effect
+2015-03-15 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge remote-tracking branch 'RBDOOM-3-BFG/master'
+
2015-03-07 Robert Beckebans <robert.beckebans at gmail.com>
* Updated release notes
@@ -134,6 +154,10 @@
* Added release notes to prepare new release
+2015-02-15 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge remote-tracking branch 'RBDOOM-3-BFG/master'
+
2015-02-09 Robert Beckebans <robert.beckebans at gmail.com>
* Merge pull request #216 from DanielGibson/rb_astyle_2.05.1_upd
@@ -632,6 +656,10 @@
2014-05-15 Robert Beckebans <robert.beckebans at gmail.com>
+ * Merge remote-tracking branch 'RBDOOM-3-BFG/master'
+
+2014-05-15 Robert Beckebans <robert.beckebans at gmail.com>
+
* Added cvar r_useHalfLambertLighting to make it optional, it requires reloadShaders
2014-05-15 Robert Beckebans <robert.beckebans at gmail.com>
@@ -1068,6 +1096,10 @@
2013-10-30 Robert Beckebans <robert.beckebans at gmail.com>
+ * Merge remote-tracking branch 'RBDOOM-3-BFG/master'
+
+2013-10-30 Robert Beckebans <robert.beckebans at gmail.com>
+
* Astyle
2013-10-19 Jonathan Young <young.jpc at gmail.com>
@@ -1142,6 +1174,10 @@
* Fix compilation with SDL2 Release
+2013-07-13 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge remote-tracking branch 'RBDOOM-3-BFG/master'
+
2013-06-23 Robert Beckebans <robert.beckebans at gmail.com>
* Merge pull request #51 from DanielGibson/debug-threads-freebsd
@@ -1180,6 +1216,10 @@
2013-05-24 Robert Beckebans <robert.beckebans at gmail.com>
+ * Merge remote-tracking branch 'RBDOOM-3-BFG/master'
+
+2013-05-24 Robert Beckebans <robert.beckebans at gmail.com>
+
* Allow slow-motion sound effect for OpenAL sounds
2013-04-23 Robert Beckebans <robert.beckebans at gmail.com>
@@ -1226,6 +1266,14 @@
* Make it compile with SDL2 again
+2013-03-24 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Fixed some render debugging tools
+
+2013-03-24 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Fixed some render debugging tools
+
2013-03-23 Robert Beckebans <robert.beckebans at gmail.com>
* Removed obsolete old renderer SMP code
diff --git a/neo/framework/FileSystem.cpp b/neo/framework/FileSystem.cpp
index e6608ce..fe87096 100644
--- a/neo/framework/FileSystem.cpp
+++ b/neo/framework/FileSystem.cpp
@@ -307,7 +307,7 @@ idCVar idFileSystemLocal::fs_game_base( "fs_game_base", "", CVAR_SYSTEM | CVAR_
idCVar fs_basepath( "fs_basepath", "", CVAR_SYSTEM | CVAR_INIT, "" );
idCVar fs_savepath( "fs_savepath", "", CVAR_SYSTEM | CVAR_INIT, "" );
-idCVar fs_resourceLoadPriority( "fs_resourceLoadPriority", "1", CVAR_SYSTEM , "if 1, open requests will be honored from resource files first; if 0, the resource files are checked after normal search paths" );
+idCVar fs_resourceLoadPriority( "fs_resourceLoadPriority", "0", CVAR_SYSTEM , "if 1, open requests will be honored from resource files first; if 0, the resource files are checked after normal search paths" );
idCVar fs_enableBackgroundCaching( "fs_enableBackgroundCaching", "1", CVAR_SYSTEM , "if 1 allow the 360 to precache game files in the background" );
idFileSystemLocal fileSystemLocal;
diff --git a/neo/renderer/RenderProgs.h b/neo/renderer/RenderProgs.h
index ccabd23..687a971 100644
--- a/neo/renderer/RenderProgs.h
+++ b/neo/renderer/RenderProgs.h
@@ -232,6 +232,7 @@ public:
{
BindShader_Builtin( BUILTIN_TEXTURE_TEXGEN_VERTEXCOLOR );
};
+
void BindShader_Interaction()
{
BindShader_Builtin( BUILTIN_INTERACTION );
@@ -288,6 +289,7 @@ public:
{
BindShader_Builtin( BUILTIN_SIMPLESHADE );
}
+
void BindShader_Environment()
{
BindShader_Builtin( BUILTIN_ENVIRONMENT );
@@ -350,6 +352,7 @@ public:
{
BindShader_Builtin( BUILTIN_BLENDLIGHT );
}
+
void BindShader_Fog()
{
BindShader_Builtin( BUILTIN_FOG );
@@ -406,6 +409,7 @@ public:
{
BindShader_Builtin( BUILTIN_BINK_GUI );
}
+
void BindShader_MotionBlur()
{
BindShader_Builtin( BUILTIN_MOTION_BLUR );
@@ -572,14 +576,14 @@ protected:
idList<glslUniformLocation_t> uniformLocations;
};
int currentRenderProgram;
- idList<glslProgram_t> glslPrograms;
+ idList<glslProgram_t, TAG_RENDER> glslPrograms;
idStaticList < idVec4, RENDERPARM_USER + MAX_GLSL_USER_PARMS > glslUniforms;
int currentVertexShader;
int currentFragmentShader;
- idList<vertexShader_t > vertexShaders;
- idList<fragmentShader_t > fragmentShaders;
+ idList<vertexShader_t, TAG_RENDER> vertexShaders;
+ idList<fragmentShader_t, TAG_RENDER> fragmentShaders;
};
extern idRenderProgManager renderProgManager;
diff --git a/neo/renderer/tr_backend_rendertools.cpp b/neo/renderer/tr_backend_rendertools.cpp
index 2f87af7..7279cef 100644
--- a/neo/renderer/tr_backend_rendertools.cpp
+++ b/neo/renderer/tr_backend_rendertools.cpp
@@ -587,6 +587,7 @@ static void RB_ShowLightCount()
}
}
+#if 0
/*
===============
RB_SetWeaponDepthHack
@@ -669,6 +670,7 @@ static void RB_LoadMatrixWithBypass( const float m[16] )
glLoadMatrixf( m );
}
+#endif
/*
====================
RB_RenderDrawSurfListWithFunction
@@ -690,6 +692,7 @@ static void RB_RenderDrawSurfListWithFunction( drawSurf_t** drawSurfs, int numDr
{
continue;
}
+
assert( drawSurf->space != NULL );
// RB begin
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
More information about the Pkg-games-commits
mailing list