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/SeriousSam
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
..
GUI Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
res Uploading full engine sources 2016-03-11 15:57:17 +02:00
ArrowDir.h Fix the License. 2016-04-01 01:12:10 +03:00
CmdLine.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
CmdLine.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03:00
Credits.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Credits.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03:00
FileInfo.h Fix the License. 2016-04-01 01:12:10 +03:00
GLSettings.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
GLSettings.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03:00
LCDDrawing.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
LCDDrawing.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
LevelInfo.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
LevelInfo.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03:00
MainWindow.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
MainWindow.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03:00
nocursor.cur Uploading full engine sources 2016-03-11 15:57:17 +02:00
resource.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03:00
SeriousSam.aps Uploading full engine sources 2016-03-11 15:57:17 +02:00
SeriousSam.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
SeriousSam.h Resolve conflicts 2016-04-01 01:00:14 +03:00
SeriousSam.rc Uploading full engine sources 2016-03-11 15:57:17 +02:00
SeriousSam.vcxproj GameExecutable: Fix spaces for headers. 2016-03-31 22:43:28 +03:00
SeriousSam.vcxproj.filters GameExecutable: Fix spaces for headers. 2016-03-31 22:43:28 +03:00
SeriousSam.vcxproj.user Uploading full engine sources 2016-03-11 15:57:17 +02:00
Splash.bmp Uploading full engine sources 2016-03-11 15:57:17 +02:00
SplashMask.bmp Uploading full engine sources 2016-03-11 15:57:17 +02:00
SplashScreen.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
SplashScreen.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03: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
VarList.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
VarList.h GameExecutable: Add License into sources. 2016-03-31 03:38:57 +03:00