ptitSeb
d3c7ea2e53
Lower Epsilonon Pandora
2016-04-16 11:33:08 +02:00
ptitSeb
f37df71029
Float fest\!
2016-04-07 18:13:50 +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
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
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
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
