Daniel Gibson
|
1bfc6d5d81
|
Fix "unused but set variable" warnings from GCC
|
2016-05-09 18:51:03 +02:00 |
|
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 |
|
Ryan C. Gordon
|
0d426d5998
|
Fixed up some StdH includes.
|
2016-04-01 14:04:24 -04: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 |
|