Christoph Oelckers
|
1a8f11e01d
|
Merge branch 'master' into powerslave
# Conflicts:
# source/build/src/sdlayer.cpp
# source/common/menu/menu.cpp
# source/sw/src/config.cpp
# source/sw/src/game.cpp
|
2019-12-26 00:21:04 +01:00 |
|
Christoph Oelckers
|
c0d5ca8ab8
|
- Config work almost done.
The only thing still referencing the old config file is Shadow Warrior's config read function.
|
2019-10-27 13:40:24 +01:00 |
|
Christoph Oelckers
|
249f6e9d62
|
- consolidated the joystick and mouse setup code.
|
2019-10-26 23:45:55 +02:00 |
|
Christoph Oelckers
|
b2d7179dbe
|
- consolidated the 4 sets of mouse and joystick configuration variables.
|
2019-10-26 21:50:49 +02:00 |
|
Christoph Oelckers
|
cfaafcede7
|
- everything compiles again (not tested yet.)
|
2019-10-26 00:32:49 +02:00 |
|
Christoph Oelckers
|
2dc051f7cf
|
- put RedNukem game frontend into a namespace.
|
2019-09-22 00:10:48 +02:00 |
|
nukeykt
|
bdd7bb72d8
|
NRedneck compiles with MSVC now
# Conflicts:
# platform/Windows/eduke32.sln
# source/build/src/tilepacker.cpp
# source/rr/src/common.cpp
# source/rr/src/duke3d.h
# source/rr/src/game.cpp
# source/rr/src/menus.cpp
# source/rr/src/osdcmds.cpp
# source/rr/src/screens.cpp
|
2019-09-21 09:25:29 +02:00 |
|
Christoph Oelckers
|
588fbc26f9
|
- added RedNukem project.
|
2019-09-19 00:27:46 +02:00 |
|