Ryan C. Gordon 6ac856824f Fixed mismerge.

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

..

res

Uploading full engine sources

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

CDCheck.h

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

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

CmdLine.cpp

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

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

CmdLine.h

Uploading full engine sources

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

Credits.cpp

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

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

Credits.h

Uploading full engine sources

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

GLSettings.cpp

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

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

GLSettings.h

Uploading full engine sources

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

LCDDrawing.cpp

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

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

LCDDrawing.h

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

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

LevelInfo.cpp

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

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

LevelInfo.h

Uploading full engine sources

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

MainWindow.cpp

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

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

MainWindow.h

Uploading full engine sources

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

Menu.cpp

Fixed mismerge.

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

Menu.h

Uploading full engine sources

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

MenuGadgets.cpp

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

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

MenuGadgets.h

Uploading full engine sources

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

MenuPrinting.cpp

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

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

MenuPrinting.h

Uploading full engine sources

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

nocursor.cur

Uploading full engine sources

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

resource.h

Uploading full engine sources

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

SeriousSam.aps

Uploading full engine sources

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

SeriousSam.cpp

fixed a variable initialized and also marked 'extern'.

2016-03-30 01:31:46 -04:00

SeriousSam.h

Uploading full engine sources

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

SeriousSam.rc

Uploading full engine sources

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

SeriousSam.vcxproj

Uploading full engine sources

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

SeriousSam.vcxproj.filters

Uploading full engine sources

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

SeriousSam.vcxproj.user

Uploading full engine sources

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

Splash.bmp

Uploading full engine sources

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

SplashMask.bmp

Uploading full engine sources

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

SplashScreen.cpp

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

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

SplashScreen.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

VarList.cpp

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

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

VarList.h

Uploading full engine sources

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