ptitSeb
ead5da376d
Cannot cast a Float to Unsigned integer directly on ARM, of sign will be lost, so double cast
2016-04-06 22:45:01 +02:00
Steven Chamberlain
26f1a33749
Building on GNU/kFreeBSD and possibly Hurd
...
* Only use ENOSR and ENOPKG if defined
ENOSR and ENOPKG are part of the POSIX optional STREAMS extension, and
are not available on most other platforms than GNU/Linux.
* Support building on other GNU platforms than Linux
Build for other GNU platforms the same way as Linux: this includes
CMAKE_SYSTEM_NAME "GNU" (GNU/Hurd) and "GNU/kFreeBSD" (GNU/kFreeBSD).
2016-04-04 20:34:34 -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
0d426d5998
Fixed up some StdH includes.
2016-04-01 14:04:24 -04:00
RocketersAlex
c5f5d72e3f
Update MSLegacy.h Network.cpp GameAgent.cpp
2016-03-31 05:43:38 +03:00
Ryan C. Gordon
8ea00b12d2
More work on getting this to compile.
2016-03-30 11:00:01 -04:00
Ryan C. Gordon
888b35dbca
Mismerge fix.
2016-03-30 10:56:56 -04:00
RocketersAlex
0d8f7da318
Fixed SeriousSam and GameAgent bugs
2016-03-30 16:54:30 +03:00
Ryan C. Gordon
28a8b5cb2e
Various patches to get this closer to compiling again.
2016-03-30 01:51:52 -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
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