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
9c5fa5f0fc
Fixed some things GCC complained about on this Linux box.
2016-04-02 02:03:41 -04:00
Ryan C. Gordon
ed527eb29e
A little tapdancing to fix a missing symbol at link time.
2016-03-31 12:40:11 -04:00
Ryan C. Gordon
146da64d86
Fixed filename case on an include statement.
2016-03-30 04:00:23 -04:00
Ryan C. Gordon
735b1cb66b
Fixed mismerge.
2016-03-30 01:29:43 -04:00
Ryan C. Gordon
43e4866df4
Fixed a mismerge.
2016-03-30 01:27:59 -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
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
1c5556dbd9
Fixes II
2016-03-23 20:42:20 +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
