ptitSeb
cd2a586a9e
Better #if condition, and add a warning to be better checked latter
2016-04-13 08:21:50 +02:00
ptitSeb
9678ec3e58
Enabled Multi-Threading (as an option) + OpenPandora specific changes (for Shoulder As Mouse Buttons)
2016-04-12 22:29:39 +02:00
Ryan C. Gordon
c752e7cace
Fixed a mismerge.
...
(But I still need to figure out what I'm doing between SetAbsolutePath() and
whatever I had before...)
2016-04-04 22:40:30 -04:00
Ryan C. Gordon
a7e4f8237e
Patched to compile on Linux, and cleaned out almost all compiler warnings.
2016-04-04 02:34:07 -04: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
88c41117f5
Fill in some stuff that is needed to compile.
...
I had better versions of this stuff, which I still need to re-merge.
2016-03-31 21:53:54 -04:00
Ryan C. Gordon
c2be372822
Some work to get Stream.cpp compiling.
2016-03-31 12:25:53 -04:00
Ryan C. Gordon
fbfef87ce0
Fixed a mismerge.
2016-03-31 12:25:40 -04:00
Ryan C. Gordon
75b824ddf8
Removed the exception handling code from CTStream.
...
I think this is a leftover from the mmap()-like code that used to be
in the engine, but now it's a lot of complexity to basically test this:
- Was this a memory access violation?
- If no, crash.
- If yes:
- Was it part of a CTStream?
- If no, crash.
- If yes, crash.
Instead, let's just crash. :)
(If I'm misunderstanding this, just roll back from revision control.)
2016-03-31 12:22:55 -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
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
