Ryan C. Gordon
70f3f7fe35
Turned off an assert that reads past the start of an array.
...
It'll crash here anyway if that assertion would have triggered, I think.
2016-04-06 23:20:29 -04:00
ptitSeb
7590c3ca04
GLES hardware doen't read depth, so I assume ARM based machine can'tt either
2016-04-06 16:30:39 +02:00
ptitSeb
af9d472619
Unstubbed the Dithered Portable C functions (ordered one unstested)
2016-04-06 13:46:26 +02:00
ptitSeb
73aab13a79
Try to fix the Portable C UploadTexture_OGL function
2016-04-06 13:44:36 +02:00
ptitSeb
8c03fccd64
Fixed the bsr Portable C function, the game start correctly now
2016-04-06 13:41:32 +02:00
ptitSeb
8c49b5f7a0
Unstubbed the Fog Portable C function
2016-04-06 13:40:56 +02:00
ptitSeb
2406f62c4b
Unstubbed the Color Portable C functions
2016-04-06 13:40:02 +02: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
Salamanderrake
2be26952c7
Case Issue with #include statement.
...
* Gfx_wrapper.cpp: two #include statemenst with incorrect case.
* Fixed an empty line issue
2016-04-02 01:12:25 -04:00
Salamanderrake
4ce00bca08
Statistics_internal.h: Incorrect case as its Statistics_Internal.h on disk.
2016-04-02 01:11:53 -04:00
Ryan C. Gordon
0d426d5998
Fixed up some StdH includes.
2016-04-01 14:04:24 -04:00
Ryan C. Gordon
5aea1f7c4d
Untangle the symbols in the engine's parser and the Ska parser.
2016-04-01 01:49:13 -04:00
Ryan C. Gordon
7c9d29ad1a
Naturally, there are two files with inline asm with an "mmShift" symbol. :)
2016-03-31 15:48:48 -04:00
Ryan C. Gordon
ee754e7edf
Made static variables that inline asm needs to touch non-static.
...
I dislike having to do this, but Clang sees them as unused and removes them
from the object file, causing linking to fail.
The real solution here is to remove all the assembly code because it's 2016
and this game doesn't have to run on 133MHz Pentium now. :)
2016-03-31 13:04:57 -04:00
Ryan C. Gordon
2668cdc44f
Fix up some mismerges and get the OpenGL code to compile again.
2016-03-31 12:26:43 -04:00
Ryan C. Gordon
8ea00b12d2
More work on getting this to compile.
2016-03-30 11:00:01 -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
