Ryan C. Gordon 888b35dbca Mismerge fix.

2016-03-30 10:56:56 -04:00

..

Base

Various patches to get this closer to compiling again.

2016-03-30 01:51:52 -04:00

Brushes

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Classes

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Entities

More mismerge corrections and other fixes to get this closer to compiling.

2016-03-30 02:01:02 -04:00

GameAgent

Uploading full engine sources

2016-03-11 15:57:17 +02:00

Graphics

More mismerge corrections and other fixes to get this closer to compiling.

2016-03-30 02:01:02 -04:00

Light

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Math

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Models

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Network

Mismerge fix.

2016-03-30 10:56:56 -04:00

Rendering

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Ska

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Sound

Silence a whole bunch of warnings about string literals vs non-const char *.

2016-03-29 12:51:34 -04:00

Templates

More mismerge corrections and other fixes to get this closer to compiling.

2016-03-30 02:01:02 -04:00

Terrain

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

World

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

zlib

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

Build.h

Uploading full engine sources

2016-03-11 15:57:17 +02:00

ChangeLog.txt

Uploading full engine sources

2016-03-11 15:57:17 +02:00

CurrentVersion.h

Uploading full engine sources

2016-03-11 15:57:17 +02:00

Engine.cpp

Various patches to get this closer to compiling again.

2016-03-30 01:51:52 -04:00

Engine.h

Uncommented to include Terrain.h. Let's see what happens.

2016-03-30 01:25:58 -04:00

Engine.vcxproj

Uploading full engine sources

2016-03-11 15:57:17 +02:00

Engine.vcxproj.filters

Uploading full engine sources

2016-03-11 15:57:17 +02:00

Engine.vcxproj.user

Uploading full engine sources

2016-03-11 15:57:17 +02:00

GameShell.h

Uploading full engine sources

2016-03-11 15:57:17 +02:00

StdH.cpp

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

StdH.h

First attempt to hand-merge Ryan's Linux and Mac OS X port.

2016-03-28 23:46:13 -04:00

temp.h

Uploading full engine sources

2016-03-11 15:57:17 +02:00