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
7778fdcaae
Add missing ; to Sources/Ecc/Parser.y
2016-04-01 23:38:29 -04:00
Ryan C. Gordon
49b5163cc9
Regenerated parsers and scanners.
2016-04-01 15:17:48 -04:00
Ryan C. Gordon
4f061d916c
Adding regenerated parsers so they'll stop spamming my diffs.
2016-03-30 10:59:17 -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
SLAwww
3ef31a97aa
ECC now works properly with long paths
2016-03-18 03:15:05 +02:00
Aron Visontai
344c836cd9
Fix compilation when build path is long
...
Also remove generated file Parser.cpp
2016-03-16 21:56:08 -07:00
SLAwww
6e9fbef44a
Fixed error in Bison code
2016-03-13 18:56:18 +02:00
SLAwww
fe24f3a2a4
Updated .gitignore and removed automatically generated files
2016-03-13 01:52:16 +02:00
Robert MacGregor
1a50ba665a
Check for NULL return from malloc in es vertification code and print error if es verification fails
2016-03-12 17:36:50 -05:00
Robert MacGregor
9766df5f5b
Forgot to close dangling file handles
2016-03-12 17:31:51 -05:00
Robert MacGregor
d69cb55c21
Add explicit 0-length check out of paranoia
2016-03-12 17:27:34 -05:00
Robert MacGregor
609d71437f
Remove close/reopen logic for file handle and fix Ecc crash on empty
2016-03-12 17:20:41 -05:00
Robert MacGregor
9f50d3ef84
Performance fix Ecc
2016-03-12 16:45:43 -05:00
Robert MacGregor
cfefaf581a
Fix for Ecc failing on empty files
2016-03-12 15:41:56 -05: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
