Codebase list iortcw / 4a65da5
Refresh patches. Debian Janitor 2 years ago
4 changed file(s) with 48 addition(s) and 48 deletion(s). Raw diff Collapse all Expand all
99 SP/code/rend2/glsl/lightall_fp.glsl | 2 +-
1010 2 files changed, 2 insertions(+), 2 deletions(-)
1111
12 diff --git a/MP/code/rend2/glsl/lightall_fp.glsl b/MP/code/rend2/glsl/lightall_fp.glsl
13 index 443aff1..73b92ac 100644
14 --- a/MP/code/rend2/glsl/lightall_fp.glsl
15 +++ b/MP/code/rend2/glsl/lightall_fp.glsl
16 @@ -441,7 +441,7 @@ void main()
12 Index: iortcw/MP/code/rend2/glsl/lightall_fp.glsl
13 ===================================================================
14 --- iortcw.orig/MP/code/rend2/glsl/lightall_fp.glsl
15 +++ iortcw/MP/code/rend2/glsl/lightall_fp.glsl
16 @@ -445,7 +445,7 @@ void main()
1717 // from http://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/
1818 vec3 parallax = u_CubeMapInfo.xyz + u_CubeMapInfo.w * viewDir;
1919
2222 vec3 cubeLightColor = hitCube(R * u_CubeMapInfo.w, parallax, u_CubeMapInfo.www, ROUGHNESS_MIPS * roughness, u_CubeMap).rgb * u_EnableTextures.w;
2323 #else
2424 vec3 cubeLightColor = textureCubeLod(u_CubeMap, R + parallax, ROUGHNESS_MIPS * roughness).rgb * u_EnableTextures.w;
25 diff --git a/SP/code/rend2/glsl/lightall_fp.glsl b/SP/code/rend2/glsl/lightall_fp.glsl
26 index 443aff1..73b92ac 100644
27 --- a/SP/code/rend2/glsl/lightall_fp.glsl
28 +++ b/SP/code/rend2/glsl/lightall_fp.glsl
29 @@ -441,7 +441,7 @@ void main()
25 Index: iortcw/SP/code/rend2/glsl/lightall_fp.glsl
26 ===================================================================
27 --- iortcw.orig/SP/code/rend2/glsl/lightall_fp.glsl
28 +++ iortcw/SP/code/rend2/glsl/lightall_fp.glsl
29 @@ -445,7 +445,7 @@ void main()
3030 // from http://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/
3131 vec3 parallax = u_CubeMapInfo.xyz + u_CubeMapInfo.w * viewDir;
3232
1111 MP/code/client/cl_main.c | 2 +-
1212 1 file changed, 1 insertion(+), 1 deletion(-)
1313
14 diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
15 index 41b69b8..5b9d768 100644
16 --- a/MP/code/client/cl_main.c
17 +++ b/MP/code/client/cl_main.c
18 @@ -4031,7 +4031,7 @@ void CL_Init( void ) {
14 Index: iortcw/MP/code/client/cl_main.c
15 ===================================================================
16 --- iortcw.orig/MP/code/client/cl_main.c
17 +++ iortcw/MP/code/client/cl_main.c
18 @@ -4033,7 +4033,7 @@ void CL_Init( void ) {
1919
2020 cl_showMouseRate = Cvar_Get( "cl_showmouserate", "0", 0 );
2121
3131 SP/code/qcommon/files.c | 10 ++++++++++
3232 2 files changed, 18 insertions(+), 4 deletions(-)
3333
34 diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
35 index 7460b4d..c3375a0 100644
36 --- a/MP/code/qcommon/files.c
37 +++ b/MP/code/qcommon/files.c
38 @@ -704,7 +704,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
34 Index: iortcw/MP/code/qcommon/files.c
35 ===================================================================
36 --- iortcw.orig/MP/code/qcommon/files.c
37 +++ iortcw/MP/code/qcommon/files.c
38 @@ -704,7 +704,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const
3939 Com_Printf( "FS_SV_FOpenFileWrite: %s\n", ospath );
4040 }
4141
4646
4747 if( FS_CreatePath( ospath ) ) {
4848 return 0;
49 @@ -938,7 +940,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
49 @@ -938,7 +940,9 @@ fileHandle_t FS_FOpenFileWrite( const ch
5050 Com_Printf( "FS_FOpenFileWrite: %s\n", ospath );
5151 }
5252
5757
5858 if ( FS_CreatePath( ospath ) ) {
5959 return 0;
60 @@ -1593,7 +1597,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
60 @@ -1593,7 +1597,7 @@ int FS_FindVM(void **startSearch, char *
6161 return VMI_COMPILED;
6262 }
6363
6666 // extract the dlls from the mp_bin.pk3 so
6767 // that they can be referenced
6868 if (Q_stricmp(name, "qagame"))
69 @@ -1637,7 +1641,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
69 @@ -1637,7 +1641,7 @@ int FS_FindVM(void **startSearch, char *
7070
7171 // TTimo
7272 // relevant to client only
7575 /*
7676 ==================
7777 FS_CL_ExtractFromPakFile
78 diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
79 index caf9f41..c18d437 100644
80 --- a/SP/code/qcommon/files.c
81 +++ b/SP/code/qcommon/files.c
82 @@ -175,6 +175,8 @@ or configs will never get loaded from disk!
78 Index: iortcw/SP/code/qcommon/files.c
79 ===================================================================
80 --- iortcw.orig/SP/code/qcommon/files.c
81 +++ iortcw/SP/code/qcommon/files.c
82 @@ -175,6 +175,8 @@ or configs will never get loaded from di
8383
8484 */
8585
8888 // every time a new demo pk3 file is built, this checksum must be updated.
8989 // the easiest way to get it is to just run the game and see what it spits out
9090 #ifndef STANDALONE
91 @@ -613,6 +615,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
91 @@ -613,6 +615,10 @@ static void FS_CopyFile( char *fromOSPat
9292 return;
9393 }
9494
9999 f = Sys_FOpen( fromOSPath, "rb" );
100100 if ( !f ) {
101101 return;
102 @@ -662,6 +668,10 @@ void FS_CopyFileOS( char *from, char *to ) {
102 @@ -662,6 +668,10 @@ void FS_CopyFileOS( char *from, char *to
103103 return;
104104 }
105105
1212 MP/code/sys/sys_unix.c | 20 ------
1313 3 files changed, 2 insertions(+), 187 deletions(-)
1414
15 diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
16 index 5b9d768..ef3411d 100644
17 --- a/MP/code/client/cl_main.c
18 +++ b/MP/code/client/cl_main.c
15 Index: iortcw/MP/code/client/cl_main.c
16 ===================================================================
17 --- iortcw.orig/MP/code/client/cl_main.c
18 +++ iortcw/MP/code/client/cl_main.c
1919 @@ -2195,24 +2195,7 @@ void CL_DownloadsComplete( void ) {
2020
2121 // DHM - Nerve :: Auto-update (not finished yet)
4242 }
4343
4444 #ifdef USE_CURL
45 @@ -2905,14 +2888,6 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
45 @@ -2905,14 +2888,6 @@ void CL_ConnectionlessPacket( netadr_t f
4646 }
4747 }
4848
5757 #ifdef LEGACY_PROTOCOL
5858 Netchan_Setup(NS_CLIENT, &clc.netchan, from, Cvar_VariableValue("net_qport"),
5959 clc.challenge, clc.compat);
60 @@ -3536,119 +3511,9 @@ int CL_ScaledMilliseconds( void ) {
60 @@ -3538,119 +3513,9 @@ int CL_ScaledMilliseconds( void ) {
6161
6262 // DHM - Nerve
6363 void CL_CheckAutoUpdate( void ) {
177177 }
178178 // DHM - Nerve
179179
180 @@ -3980,7 +3845,7 @@ void CL_Init( void ) {
180 @@ -3982,7 +3847,7 @@ void CL_Init( void ) {
181181 #ifdef UPDATE_SERVER_NAME
182182 cl_motd = Cvar_Get( "cl_motd", "1", 0 );
183183 #endif
186186
187187 cl_timeout = Cvar_Get( "cl_timeout", "200", 0 );
188188
189 @@ -4505,30 +4370,6 @@ CL_UpdateInfoPacket
189 @@ -4507,30 +4372,6 @@ CL_UpdateInfoPacket
190190 ===================
191191 */
192192 void CL_UpdateInfoPacket( netadr_t from ) {
217217 }
218218 // DHM - Nerve
219219
220 diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h
221 index a677f94..a96f351 100644
222 --- a/MP/code/qcommon/qcommon.h
223 +++ b/MP/code/qcommon/qcommon.h
224 @@ -1272,12 +1272,6 @@ void Sys_StartProcess( char *cmdline, qboolean doexit ); // NERVE - S
220 Index: iortcw/MP/code/qcommon/qcommon.h
221 ===================================================================
222 --- iortcw.orig/MP/code/qcommon/qcommon.h
223 +++ iortcw/MP/code/qcommon/qcommon.h
224 @@ -1272,12 +1272,6 @@ void Sys_StartProcess( char *cmdline, qb
225225 void Sys_OpenURL( const char *url, qboolean doexit ); // NERVE - SMF
226226 int Sys_GetHighQualityCPU( void );
227227
234234 typedef enum
235235 {
236236 DR_YES = 0,
237 diff --git a/MP/code/sys/sys_unix.c b/MP/code/sys/sys_unix.c
238 index acd3bc2..ff76dfc 100644
239 --- a/MP/code/sys/sys_unix.c
240 +++ b/MP/code/sys/sys_unix.c
241 @@ -1008,26 +1008,6 @@ int Sys_GetHighQualityCPU() {
237 Index: iortcw/MP/code/sys/sys_unix.c
238 ===================================================================
239 --- iortcw.orig/MP/code/sys/sys_unix.c
240 +++ iortcw/MP/code/sys/sys_unix.c
241 @@ -1016,26 +1016,6 @@ int Sys_GetHighQualityCPU() {
242242 return 1;
243243 }
244244