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
0f6b9ca1c1
We actually get NULL here, so these stay for now, Clang warnings be damned.
2016-03-31 21:54:25 -04:00
Ryan C. Gordon
2e7af8cf00
More mismerge corrections and other fixes to get this closer to compiling.
2016-03-30 02:01:02 -04:00
Ryan C. Gordon
2f10f864d8
Silence a whole bunch of warnings about string literals vs non-const char *.
2016-03-29 12:51:34 -04:00
Ryan C. Gordon
a4000c69a8
Clean out a bunch of compiler warnings.
2016-03-29 12:51:33 -04:00
Ryan C. Gordon
24cb244d43
First attempt to hand-merge Ryan's Linux and Mac OS X port.
...
This was a _ton_ of changes, made 15 years ago, so there are probably some
problems to work out still.
Among others: Engine/Base/Stream.* was mostly abandoned and will need to be
re-ported.
Still, this is a pretty good start, and probably holds a world record for
lines of changes or something. :)
2016-03-28 23:46:13 -04:00
zcaliptium
ef0b970490
Fixes
2016-03-22 21:03:12 +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
