Christoph Oelckers dc8b72b2ce Merge branch 'master' into newrenderer2 ... # Conflicts: # source/games/duke/src/actors.cpp # source/games/duke/src/hudweapon_d.cpp # source/games/duke/src/hudweapon_r.cpp # source/games/duke/src/render.cpp		2021-04-15 19:34:03 +02:00
..
2d_d.cpp	- moved shadeToLight out of build.h.	2021-03-25 09:13:59 +01:00
2d_r.cpp	- moved shadeToLight out of build.h.	2021-03-25 09:13:59 +01:00
_polymost.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
actors.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
actors_d.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
actors_lava.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
actors_r.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
animatesprites_d.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
animatesprites_r.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
bowling.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
ccmds.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
cheats.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
concmd.h	- tabification of new sources and replacement of the CON instruction symbols.	2020-06-21 22:55:09 +02:00
condef.h	- added the remaining CON features from EDuke 2.x	2020-09-17 23:06:54 +02:00
conlabel.h	- Duke: added missing include guard to conlabel.h.	2020-10-11 14:30:42 +02:00
conlabeldef.h	- Blood/Duke/RR/SW: Unify the player's horizon function.	2020-09-20 20:01:36 +10:00
constants.h	- Duke/RR: Don't delete master switch sprites.	2021-04-04 13:01:32 +02:00
d_menu.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
dispatch.cpp	- Duke: Clean up some duplicated code in hudweapon_*.cpp files.	2021-04-15 15:49:36 +10:00
duke3d.h	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
dukeactor.h	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
flags_d.cpp	- grouped all of Duke's constant per-session state in a single struct.	2020-11-29 13:54:58 +01:00
flags_r.cpp	- grouped all of Duke's constant per-session state in a single struct.	2020-11-29 13:54:58 +01:00
funct.h	- RRRA: Sector effector type 156 is not supposed to scroll the floor texture.	2021-04-07 18:12:25 +02:00
game.cpp	Merge branch 'master' into newrenderer2	2021-04-12 20:03:50 +02:00
game_misc.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
gamedef.cpp	- do not statically initialize DukeGameInfo.	2020-11-29 22:31:02 +01:00
gameexec.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
gameloop.cpp	- Exhumed: Change map command to start the level directly without going through the scrolling map.	2021-04-15 18:55:54 +02:00
gamevar.cpp	- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.	2020-11-03 19:21:43 +01:00
gamevar.h	- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.	2020-11-03 19:21:43 +01:00
global.cpp	- Blood, Duke & SW: Create new backend chasecam function and replace game-specific versions with it.	2021-02-18 21:47:37 +11:00
global.h	- Blood, Duke & SW: Create new backend chasecam function and replace game-specific versions with it.	2021-02-18 21:47:37 +11:00
hudweapon_d.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
hudweapon_r.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
inlines.h	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
input.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
namelist_d.h	- ImageScroller WIP commit.	2020-10-08 22:20:41 +02:00
namelist_r.h	- moveexplosions.	2020-11-01 17:07:45 +01:00
names.h	- Most of Duke's menus work again.	2020-10-07 20:32:43 +02:00
names_d.h	- added texture aliases so that tiles can given real names in the texture manager.	2020-10-06 19:26:22 +02:00
names_r.h	- added texture aliases so that tiles can given real names in the texture manager.	2020-10-06 19:26:22 +02:00
noise.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
player.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
player_d.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
player_r.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
player_w.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
prediction.cpp	- Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h.	2021-01-05 07:31:37 +11:00
prediction.h	- gamecontrol: Initial setup of PlayerAngle struct and deployment within Duke.	2020-10-07 23:13:29 +11:00
premap.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
premap_d.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
premap_r.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
render.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
savegame.cpp	- Duke: Add resurrected flag to handle resurrection via cheating or when pissing in RR.	2021-04-15 18:00:58 +10:00
sbar.cpp	- fix inventory selector positioning in WW2GI.	2021-01-30 23:51:50 +01:00
sbar.h	- Duke: use original colors for inventory status display.	2020-11-11 11:49:05 +01:00
sbar_d.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
sbar_r.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
sectors.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
sectors_d.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
sectors_r.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
soundefs.h	- constant cleanup.	2020-07-06 13:26:26 +02:00
sounds.cpp	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00
sounds.h	- fixed .def 'music' parsing.	2021-04-08 16:35:26 +02:00
spawn.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
spawn_d.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
spawn_r.cpp	Merge branch 'master' into newrenderer2	2021-04-15 19:34:03 +02:00
types.h	- made DukeActor::s a pointer.	2021-04-15 19:21:43 +02:00