63 Commits

Author	SHA1	Message	Date
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	2e7af8cf00	More mismerge corrections and other fixes to get this closer to compiling.	2016-03-30 02:01:02 -04: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	18b339a2b6	Uncommented to include Terrain.h. Let's see what happens.	2016-03-30 01:25:58 -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
SLAwww	b2745c617f	Removed more generated files	2016-03-13 02:05:30 +02:00
Matt Lee	a4af93fa31	Add GPL header to files	2016-03-11 18:20:51 -06:00
SLAwww	a7af6eb20b	Removing generated files	2016-03-11 16:47:14 +02:00
SLAwww	9d8b787be2	Uploading full engine sources	2016-03-11 15:57:17 +02:00