q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-12-25 07:14:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
1a2ccb8f50
Serious-Engine/Sources
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
..
DecodeReport Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DedicatedServer Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Depend Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Ecc Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Engine Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
EngineGui Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
EntitiesMP Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
External/SDL12 First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
GameGUIMP Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
GameMP Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
LWSkaExporter Fixes II 2016-03-23 20:42:20 +03:00
MakeFONT Add GPL header to files 2016-03-11 18:20:51 -06:00
Modeler Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Models Add GPL header to files 2016-03-11 18:20:51 -06:00
ModelsMP Add GPL header to files 2016-03-11 18:20:51 -06:00
RCon Add GPL header to files 2016-03-11 18:20:51 -06:00
SeriousSam Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
SeriousSkaStudio Remove generated files 2016-03-14 02:55:58 +03:00
Shaders Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
WorldEditor Resolve conflicts 2016-04-01 01:00:14 +03:00
All.sln Uploading full engine sources 2016-03-11 15:57:17 +02:00
bison.simple Uploading full engine sources 2016-03-11 15:57:17 +02:00
build-mac.sh Added CMake and a simple Mac build script, and nuked the awful old Makefile. 2016-04-01 15:17:23 -04:00
CMakeLists.txt Fix missing endif() 2016-04-02 22:55:53 -04:00