okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2

Browse source 
Conflicts:
	code/sdl/sdl_input.c
This commit is contained in:
Tim Angus 2013-08-16 23:34:08 +01:00
commit bde7665462
97 changed files with 6333 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/renderergl1/tr_local.h
View file

@ -1327,7 +1327,7 @@ SKIES
void R_BuildCloudData( shaderCommands_t *shader );
void R_InitSkyTexCoords( float cloudLayerHeight );
void R_DrawSkyBox( shaderCommands_t *shader );
void RB_DrawSun( void );
void RB_DrawSun( float scale, shader_t *shader );
void RB_ClipSkyPolygons( shaderCommands_t *shader );
/*
@ -1594,8 +1594,6 @@ extern int max_polyverts;
extern backEndData_t *backEndData; // the second one may not be allocated
extern volatile renderCommandList_t *renderCommandList;
void *R_GetCommandBuffer( int bytes );
void RB_ExecuteRenderCommands( const void *data );