Details for commit 8003ab6fa

02-May-2021 (Sunday) at 16:37:46 EDT by Christoph Oelckers

On branches: 1.1, master, newrenderer
Merge branch 'scriptable_cutscenes' into newrenderer

141 files changed, 10227 insertions, 5230 deletions

Modified

source/CMakeLists.txt (Diff)
 
 
source/common/2d/v_draw.cpp (Diff)
 
source/common/audio/music/music.cpp (Diff)
 
source/common/engine/namedef.h (Diff)
 
 
source/common/platform/win32/base_sysfb.cpp (Diff)
 
source/common/scripting/backend/codegen.cpp (Diff)
 
 
source/common/scripting/core/dynarrays.cpp (Diff)
 
source/common/scripting/interface/stringformat.cpp (Diff)
 
 
source/common/scripting/interface/vmnatives.cpp (Diff)
 
 
source/core/binaryangle.h (Diff)
 
 
source/core/cheats.cpp (Diff)
 
 
source/core/gamecontrol.cpp (Diff)
 
 
source/core/gamecontrol.h (Diff)
 
 
source/core/gamestate.h (Diff)
 
source/core/gamestruct.h (Diff)
 
 
source/core/mainloop.cpp (Diff)
 
 
source/core/mapinfo.cpp (Diff)
 
 
source/core/mapinfo.h (Diff)
 
 
source/core/menu/razemenu.cpp (Diff)
 
 
source/core/movie/movieplayer.cpp (Diff)
 
 
source/core/precache.cpp (Diff)
 
source/core/precache.h (Diff)
 
source/core/screenjob.cpp (Diff)
 
 
source/core/screenjob.h (Diff)
 
 
source/core/searchpaths.cpp (Diff)
 
source/core/statusbar2.cpp (Diff)
 
 
source/games/blood/all.cpp (Diff)
 
source/games/blood/src/blood.cpp (Diff)
 
 
source/games/blood/src/blood.h (Diff)
 
source/games/blood/src/d_menu.cpp (Diff)
 
source/games/blood/src/endgame.cpp (Diff)
 
 
source/games/blood/src/levels.cpp (Diff)
 
 
source/games/blood/src/levels.h (Diff)
 
 
source/games/blood/src/loadsave.cpp (Diff)
 
source/games/blood/src/messages.cpp (Diff)
 
 
source/games/blood/src/namelist.h (Diff)
 
source/games/blood/src/nnexts.cpp (Diff)
 
 
source/games/blood/src/player.cpp (Diff)
 
source/games/blood/src/player.h (Diff)
 
source/games/blood/src/sbar.cpp (Diff)
 
 
source/games/duke/src/2d_d.cpp (Diff)
 
source/games/duke/src/2d_r.cpp (Diff)
 
source/games/duke/src/actors_d.cpp (Diff)
 
 
source/games/duke/src/cheats.cpp (Diff)
 
 
source/games/duke/src/d_menu.cpp (Diff)
 
 
source/games/duke/src/dispatch.cpp (Diff)
 
source/games/duke/src/duke3d.h (Diff)
 
source/games/duke/src/flags_d.cpp (Diff)
 
source/games/duke/src/flags_r.cpp (Diff)
 
source/games/duke/src/funct.h (Diff)
 
source/games/duke/src/game_misc.cpp (Diff)
 
 
source/games/duke/src/gamedef.cpp (Diff)
 
 
source/games/duke/src/gameexec.cpp (Diff)
 
 
source/games/duke/src/gameloop.cpp (Diff)
 
 
source/games/duke/src/gamevar.cpp (Diff)
 
 
source/games/duke/src/inlines.h (Diff)
 
 
source/games/duke/src/namelist_d.h (Diff)
 
source/games/duke/src/namelist_r.h (Diff)
 
source/games/duke/src/names.h (Diff)
 
source/games/duke/src/player_d.cpp (Diff)
 
 
source/games/duke/src/player_r.cpp (Diff)
 
 
source/games/duke/src/premap.cpp (Diff)
 
 
source/games/duke/src/premap_d.cpp (Diff)
 
source/games/duke/src/premap_r.cpp (Diff)
 
 
source/games/duke/src/sounds.cpp (Diff)
 
source/games/duke/src/sounds.h (Diff)
 
source/games/duke/src/types.h (Diff)
 
source/games/exhumed/src/2d.cpp (Diff)
 
 
source/games/exhumed/src/bubbles.cpp (Diff)
 
 
source/games/exhumed/src/d_menu.cpp (Diff)
 
source/games/exhumed/src/enginesubs.cpp (Diff)
 
source/games/exhumed/src/exhumed.cpp (Diff)
 
 
source/games/exhumed/src/exhumed.h (Diff)
 
 
source/games/exhumed/src/gameloop.cpp (Diff)
 
 
source/games/exhumed/src/init.cpp (Diff)
 
 
source/games/exhumed/src/items.cpp (Diff)
 
 
source/games/exhumed/src/menu.cpp (Diff)
 
source/games/exhumed/src/move.cpp (Diff)
 
 
source/games/exhumed/src/movie.cpp (Diff)
 
 
source/games/exhumed/src/namelist.h (Diff)
 
source/games/exhumed/src/names.h (Diff)
 
 
source/games/exhumed/src/object.cpp (Diff)
 
 
source/games/exhumed/src/player.cpp (Diff)
 
 
source/games/exhumed/src/queen.cpp (Diff)
 
 
source/games/exhumed/src/ramses.cpp (Diff)
 
 
source/games/exhumed/src/save.cpp (Diff)
 
 
source/games/exhumed/src/sound.cpp (Diff)
 
 
source/games/exhumed/src/view.cpp (Diff)
 
 
source/games/sw/all.cpp (Diff)
 
source/games/sw/src/cheats.cpp (Diff)
 
 
source/games/sw/src/d_menu.cpp (Diff)
 
 
source/games/sw/src/draw.cpp (Diff)
 
 
source/games/sw/src/game.cpp (Diff)
 
 
source/games/sw/src/game.h (Diff)
 
 
source/games/sw/src/menus.cpp (Diff)
 
source/games/sw/src/menus.h (Diff)
 
source/games/sw/src/namelist.h (Diff)
 
source/games/sw/src/player.cpp (Diff)
 
 
source/games/sw/src/save.cpp (Diff)
 
 
source/games/sw/src/scrip2.cpp (Diff)
 
 
source/games/sw/src/sector.cpp (Diff)
 
 
source/games/sw/src/sounds.cpp (Diff)
 
source/games/sw/src/sprite.cpp (Diff)
 
 
source/games/sw/src/sumo.cpp (Diff)
 
 
source/games/sw/src/text.cpp (Diff)
 
source/games/sw/src/weapon.cpp (Diff)
 
 
source/glbackend/glbackend.cpp (Diff)
 
wadsrc/static/engine/grpinfo.txt (Diff)
 
 
wadsrc/static/menudef.txt (Diff)
 
 
wadsrc/static/zscript.txt (Diff)
 
wadsrc/static/zscript/engine/base.zs (Diff)
 
 
wadsrc/static/zscript/engine/dynarrays.zs (Diff)
 
wadsrc/static/zscript/engine/inputevents.zs (Diff)
 
wadsrc/static/zscript/engine/ui/menu/menu.zs (Diff)
 
wadsrc/static/zscript/games/blood/ui/menu.zs (Diff)
 
 
wadsrc/static/zscript/games/duke/ui/menu.zs (Diff)
 
 
wadsrc/static/zscript/games/exhumed/ui/menu.zs (Diff)
 
 
wadsrc/static/zscript/razebase.zs (Diff)
 
 

Added

source/core/g_mapinfo.cpp
source/core/g_mapinfo.h
wadsrc/static/filter/blood/engine/rmapinfo.txt
wadsrc/static/filter/duke/engine/rmapinfo.txt
wadsrc/static/filter/exhumed/engine/rmapinfo.txt
wadsrc/static/filter/redneck.redneck/engine/engine.con
wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt
wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt
wadsrc/static/filter/redneck.route66/engine/rmapinfo.txt
wadsrc/static/filter/shadowwarrior.twindragon/rmapinfo.txt
wadsrc/static/filter/shadowwarrior/engine/rmapinfo.txt
wadsrc/static/zscript/games/blood/bloodgame.zs
wadsrc/static/zscript/games/blood/ui/screens.zs
wadsrc/static/zscript/games/duke/dukegame.zs
wadsrc/static/zscript/games/duke/ui/cutscenes.zs
wadsrc/static/zscript/games/duke/ui/screens.zs
wadsrc/static/zscript/games/exhumed/exhumedgame.zs
wadsrc/static/zscript/games/exhumed/ui/screens.zs
wadsrc/static/zscript/games/sw/swgame.zs
wadsrc/static/zscript/games/sw/ui/screens.zs
wadsrc/static/zscript/screenjob.zs

Deleted

source/games/blood/src/credits.cpp
source/games/sw/src/2d.cpp