q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-12-25 15:14:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
1a2ccb8f50
Serious-Engine/Sources/Engine
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
..
Base Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Brushes Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Classes Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Entities Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
GameAgent Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Graphics Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Light Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Math Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Models Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Network Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Rendering Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Ska Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Sound Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Templates Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Terrain Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
World Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
zlib First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Build.h Add GPL header to files 2016-03-11 18:20:51 -06:00
ChangeLog.txt Uploading full engine sources 2016-03-11 15:57:17 +02:00
CurrentVersion.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Engine.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Engine.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Engine.vcxproj Update MSLegacy.h Network.cpp GameAgent.cpp 2016-03-31 05:43:38 +03:00
Engine.vcxproj.filters Update MSLegacy.h Network.cpp GameAgent.cpp 2016-03-31 05:43:38 +03:00
Engine.vcxproj.user Uploading full engine sources 2016-03-11 15:57:17 +02:00
GameShell.h Add GPL header to files 2016-03-11 18:20:51 -06:00
StdH.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
StdH.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
temp.h Add GPL header to files 2016-03-11 18:20:51 -06:00