Mitchell Richters
|
88502f9962
|
Manually merge missed aliasing from EDuke32 SVN commit 8555.
|
2020-03-20 17:04:34 +01:00 |
|
Mitchell Richters
|
8bef451ed9
|
Manually merge EDuke32 SVN commit 8619.
|
2020-03-20 17:04:33 +01:00 |
|
Mitchell Richters
|
029b0bbb45
|
Manually merge EDuke32 SVN commit 8617.
|
2020-03-20 17:04:33 +01:00 |
|
Mitchell Richters
|
15a362f9ac
|
Manually merge EDuke32 SVN commit 8605.
|
2020-03-20 17:04:33 +01:00 |
|
Mitchell Richters
|
a5612b1a02
|
Manually merge EDuke32 SVN commit 8565.
|
2020-03-20 17:04:33 +01:00 |
|
Mitchell Richters
|
1222a3a56a
|
Manually merge parts of EDuke32 SVN commit 8559.
|
2020-03-20 17:04:33 +01:00 |
|
Mitchell Richters
|
062850c30a
|
Manually merge parts of EDuke32 SVN commit 8243.
|
2020-03-20 17:04:32 +01:00 |
|
Mitchell Richters
|
53c9d8425c
|
Manually merge EDuke32 SVN commit 8555.
|
2020-03-20 17:04:32 +01:00 |
|
Mitchell Richters
|
2124862a9a
|
Manually merge EDuke32 SVN commit 8554.
|
2020-03-20 17:04:32 +01:00 |
|
Mitchell Richters
|
e964837219
|
Manually merge EDuke32 SVN commit 8552.
|
2020-03-20 17:04:32 +01:00 |
|
Mitchell Richters
|
84c518a067
|
Manually merge EDuke32 SVN commit 8551.
|
2020-03-20 17:04:31 +01:00 |
|
Mitchell Richters
|
61135e2635
|
Manually merge EDuke32 SVN commit 8541.
|
2020-03-20 17:04:31 +01:00 |
|
Mitchell Richters
|
71ada1d674
|
Manually merge EDuke32 SVN commit 8539.
|
2020-03-20 17:04:31 +01:00 |
|
Mitchell Richters
|
63edfcf7c7
|
Manually merge EDuke32 SVN commit 7775.
|
2020-03-20 17:04:31 +01:00 |
|
Christoph Oelckers
|
de2c07aa6a
|
- revert all consolidation efforts between Duke and RR frontends.
Too many problems with different code.
|
2020-03-18 08:24:31 +01:00 |
|
Christoph Oelckers
|
ef63e47cbf
|
- fixed per-level music in RR.
|
2020-03-14 18:14:50 +01:00 |
|
Christoph Oelckers
|
80cc12001f
|
- a bit of cleanup.
|
2020-03-08 13:54:00 +01:00 |
|
Christoph Oelckers
|
73a4e0d1fe
|
- made Blood's FullMap flag global and removed the hacks to show the full automap.
Also refactor show2dsector into a bit array to get rid of the bit shifting code at play here.
|
2020-03-07 19:30:18 +01:00 |
|
Christoph Oelckers
|
2c203fbf80
|
- more consolidation between RR and Duke.
|
2020-03-06 19:29:13 +01:00 |
|
Christoph Oelckers
|
6095808503
|
- consolidation of dynamic sound remapping
|
2020-03-06 17:23:30 +01:00 |
|
Christoph Oelckers
|
a5c2152530
|
- consolidated the dynamic tile handling for Duke and RR frontends
|
2020-03-06 17:12:38 +01:00 |
|
Christoph Oelckers
|
4a76674f4b
|
- deleted a few unused files
|
2020-03-05 01:20:58 +01:00 |
|
Christoph Oelckers
|
4788dc42fb
|
- cleanup of the screentext consolidation
Since SetIfGreater is only used by the text code, the redundant copies could be removed.
|
2020-03-05 01:17:31 +01:00 |
|
Christoph Oelckers
|
822079abe0
|
fixed some compiler warnings listed by XCode
|
2020-03-05 01:01:05 +01:00 |
|
Christoph Oelckers
|
a00bb4cbea
|
- started consolidation of EDuke/RedNukem code by moving the identical parts of actor.h to a shared namespace.
|
2020-03-05 01:01:05 +01:00 |
|
Christoph Oelckers
|
f59bfa1224
|
- consolidation of screentext code
|
2020-03-05 00:58:38 +01:00 |
|
Christoph Oelckers
|
6656547908
|
- fixed some warnings in Deer Huntin' code
|
2020-03-02 15:41:30 +01:00 |
|
Christoph Oelckers
|
4bc0531bf7
|
- disabled help screen in Exhumed and save menus in Deer Huntin'.
|
2020-02-29 12:55:12 +01:00 |
|
Christoph Oelckers
|
b68cbddb7d
|
- fixed missing crosshair in RR after merging the Deer Huntin' code.
|
2020-02-29 08:58:30 +01:00 |
|
Christoph Oelckers
|
9d934d22b2
|
- silence MSVC warnings.
|
2020-02-27 19:50:29 +01:00 |
|
nukeykt
|
bb3009c8a7
|
Rednukem: dh wip
# Conflicts:
# source/rr/src/rrdh.h
|
2020-02-27 19:44:24 +01:00 |
|
nukeykt
|
882b061ee1
|
Rednukem: add dh specific code
# Conflicts:
# source/rr/src/rrdh.cpp
# source/rr/src/rrdh.h
|
2020-02-27 19:44:00 +01:00 |
|
nukeykt
|
8c37e94061
|
Rednukem: dh player code
# Conflicts:
# source/rr/src/rrdh.h
|
2020-02-27 19:36:15 +01:00 |
|
Christoph Oelckers
|
dbf446ee6c
|
- ported the menu changes of the last commit.
|
2020-02-27 19:26:30 +01:00 |
|
nukeykt
|
95cc4a8aab
|
Rednukem: dh menu
# Conflicts:
# source/rr/src/menus.cpp
# source/rr/src/rrdh.h
|
2020-02-27 18:28:14 +01:00 |
|
Christoph Oelckers
|
80768e2fa8
|
- register the correct menu classes.
|
2020-02-26 20:31:49 +01:00 |
|
Christoph Oelckers
|
1eb00949e3
|
- manually added the RRDH menu stuff.
|
2020-02-26 20:31:49 +01:00 |
|
nukeykt
|
16052577a4
|
Rednukem: dh wip
# Conflicts:
# source/rr/src/game.cpp
# source/rr/src/menus.cpp
|
2020-02-26 20:31:49 +01:00 |
|
nukeykt
|
ac2a17f5ea
|
Rednukem: dh wip
# Conflicts:
# GNUmakefile
# platform/Windows/rednukem.vcxproj
# platform/Windows/rednukem.vcxproj.filters
# source/rr/src/common_game.h
# source/rr/src/screens.cpp
|
2020-02-26 20:31:48 +01:00 |
|
Christoph Oelckers
|
9945131d3a
|
- RR: Do not start the "8-track player" when a map got a dedicated music track defined.
Otherwise it may become a bit annoying.
|
2020-02-25 21:11:19 +01:00 |
|
Christoph Oelckers
|
3aea6d1fad
|
- refactored sound user data to be easier to serialize.
|
2020-02-23 18:30:48 +01:00 |
|
Christoph Oelckers
|
9fab46b7d7
|
- initialize the secret hint system for each level.
|
2020-02-22 08:57:18 +01:00 |
|
Christoph Oelckers
|
7dc26a3162
|
- stop all playing sound when starting a new game.
- give all bonus screen sounds in Duke the CHANF_UI flag.
|
2020-02-17 19:43:58 +01:00 |
|
Christoph Oelckers
|
57a3f89105
|
- workaround for cl_autoaim not being set anymore.
Only for singleplayer for now, the network implementation for this flag leaves a lot to be desired.
|
2020-02-16 21:31:29 +01:00 |
|
nukeykt
|
a604152e39
|
Rednukem: fix kill counter
# Conflicts:
# source/rr/src/gameexec.cpp
|
2020-02-12 23:14:53 +01:00 |
|
Christoph Oelckers
|
1e8e5d3732
|
- fixed: CON_ADDKILLS in RedNukem code was performing RR-only checks even when playing Duke.
Original code looks like this:
case 88:
insptr++;
ps[g_p].actors_killed += *insptr;
hittype[g_i].actorstayput = -1;
insptr++;
break;
|
2020-02-12 23:14:42 +01:00 |
|
nukeykt
|
f2b98f9abc
|
Rednukem: WW2GI weapon code fixes
|
2020-02-12 20:28:15 +01:00 |
|
nukeykt
|
88eacbcc1b
|
Rednukem: fix ifvare instruction
|
2020-02-12 20:28:14 +01:00 |
|
Christoph Oelckers
|
f3d953513b
|
- make things compile again.
|
2020-02-12 20:27:43 +01:00 |
|
nukeykt
|
b9e9b25cc6
|
Rednukem: fix WW2GI events
|
2020-02-12 20:27:43 +01:00 |
|