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/Templates
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
..
AllocationArray.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
AllocationArray.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
BSP_internal.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
BSP.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
BSP.h Add GPL header to files 2016-03-11 18:20:51 -06:00
DynamicArray.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DynamicArray.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DynamicContainer.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DynamicContainer.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DynamicStackArray.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DynamicStackArray.h Add GPL header to files 2016-03-11 18:20:51 -06:00
HashTableTemplate.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
HashTableTemplate.h Add GPL header to files 2016-03-11 18:20:51 -06:00
LinearAllocator.cpp Add GPL header to files 2016-03-11 18:20:51 -06:00
LinearAllocator.h Add GPL header to files 2016-03-11 18:20:51 -06:00
NameTable_CTFileName.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
NameTable_CTFileName.h Add GPL header to files 2016-03-11 18:20:51 -06:00
NameTable_CTranslationPair.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
NameTable_CTranslationPair.h Add GPL header to files 2016-03-11 18:20:51 -06:00
NameTable.cpp Add GPL header to files 2016-03-11 18:20:51 -06:00
NameTable.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Selection.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Selection.h Add GPL header to files 2016-03-11 18:20:51 -06:00
StaticArray.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
StaticArray.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
StaticStackArray.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
StaticStackArray.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CAnimData.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CAnimData.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CAnimSet.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CAnimSet.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CEntityClass.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CEntityClass.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CMesh.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CMesh.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CModelData.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CModelData.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CShader.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CShader.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CSkeleton.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CSkeleton.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CSoundData.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CSoundData.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock_CTextureData.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock_CTextureData.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stock.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stock.h Add GPL header to files 2016-03-11 18:20:51 -06:00