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 |
|
RocketersAlex
|
c5f5d72e3f
|
Update MSLegacy.h Network.cpp GameAgent.cpp
|
2016-03-31 05:43:38 +03:00 |
|
Ryan C. Gordon
|
105bc12d64
|
Bunch more work on getting this to compile. Down to Stream and Gfx_OpenGL now.
|
2016-03-30 13:41:30 -04:00 |
|
Ryan C. Gordon
|
7d118bd249
|
First attempt at porting GameAgent code.
|
2016-03-30 11:00:29 -04:00 |
|
RocketersAlex
|
0d8f7da318
|
Fixed SeriousSam and GameAgent bugs
|
2016-03-30 16:54:30 +03:00 |
|
Matt Lee
|
a4af93fa31
|
Add GPL header to files
|
2016-03-11 18:20:51 -06:00 |
|
SLAwww
|
9d8b787be2
|
Uploading full engine sources
|
2016-03-11 15:57:17 +02:00 |
|