q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 18:30:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
1a2ccb8f50
Serious-Engine/Sources/Engine/Graphics
History
Ryan C. Gordon 1a2ccb8f50 Merge github.com:Croteam-Official/Serious-Engine 
Conflicts:
	Sources/Ecc/Parser.cpp
	Sources/Ecc/Scanner.cpp
	Sources/Engine/Base/Scanner.cpp
	Sources/Engine/GameAgent/GameAgent.cpp
	Sources/Engine/Graphics/Gfx_wrapper.h
	Sources/Engine/Network/Network.cpp
	Sources/Engine/Sound/SoundDecoder.h
	Sources/Engine/Templates/HashTableTemplate.cpp
	Sources/Engine/Terrain/Terrain.h
	Sources/EntitiesMP/ParticleCloudsHolder.es
	Sources/EntitiesMP/ParticleCloudsMarker.es
	Sources/SeriousSam/CDCheck.h
	Sources/SeriousSam/Menu.cpp
	Sources/SeriousSam/MenuGadgets.cpp
	Sources/SeriousSam/SeriousSam.cpp
	Sources/SeriousSam/SplashScreen.cpp
	Sources/SeriousSam/StdH.cpp
	Sources/SeriousSam/StdH.h
	Sources/Shaders/StdH.cpp
2016-04-02 23:56:12 -04:00
..
SDL Fix up some mismerges and get the OpenGL code to compile again. 2016-03-31 12:26:43 -04:00
Win32 Fix up some mismerges and get the OpenGL code to compile again. 2016-03-31 12:26:43 -04:00
Adapter.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Adapter.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Benchmark.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Color.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Color.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DepthCheck.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DisplayMode.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DisplayMode.h Add GPL header to files 2016-03-11 18:20:51 -06:00
DrawPort_Particles.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DrawPort_RenderScene.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DrawPort.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DrawPort.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Fog_internal.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Fog.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Fog.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Font.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Font.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Gfx_Direct3D_Colors.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Gfx_Direct3D_Textures.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Gfx_Direct3D.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Gfx_OpenGL_Textures.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Gfx_OpenGL.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Gfx_wrapper_Direct3D.cpp Add GPL header to files 2016-03-11 18:20:51 -06:00
Gfx_wrapper_OpenGL.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Gfx_wrapper.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Gfx_wrapper.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
GfxLibrary.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
GfxLibrary.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
GfxProfile.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
GfxProfile.h Add GPL header to files 2016-03-11 18:20:51 -06:00
gl_functions.h Add GPL header to files 2016-03-11 18:20:51 -06:00
gl_types.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Graphics.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ImageInfo.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ImageInfo.h Add GPL header to files 2016-03-11 18:20:51 -06:00
MultiMonitor.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
MultiMonitor.h Add GPL header to files 2016-03-11 18:20:51 -06:00
OpenGL.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Raster.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Raster.h Add GPL header to files 2016-03-11 18:20:51 -06:00
RenderPoly.h Add GPL header to files 2016-03-11 18:20:51 -06:00
RenderScene.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Shader.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Shader.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ShadowMap.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ShadowMap.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stereo.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stereo.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Texture.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Texture.h Add GPL header to files 2016-03-11 18:20:51 -06:00
TextureEffects.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
TextureEffects.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
TextureRender.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Vertex.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ViewPort.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ViewPort.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00