Details for commit 14971f956

21-Apr-2021 (Wednesday) at 18:10:37 EDT by Christoph Oelckers

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

65 files changed, 2615 insertions, 2932 deletions

Modified

source/CMakeLists.txt (Diff)
 
source/common/engine/serializer.h (Diff)
 
source/common/utility/tarray.h (Diff)
 
source/core/defparser.cpp (Diff)
 
source/core/gamestruct.h (Diff)
 
source/core/savegamehelp.cpp (Diff)
 
 
source/core/savegamehelp.h (Diff)
 
 
source/games/sw/src/actor.cpp (Diff)
 
 
source/games/sw/src/ai.cpp (Diff)
 
 
source/games/sw/src/break.cpp (Diff)
 
 
source/games/sw/src/bunny.cpp (Diff)
 
 
source/games/sw/src/cache.cpp (Diff)
 
 
source/games/sw/src/cheats.cpp (Diff)
 
 
source/games/sw/src/coolg.cpp (Diff)
 
 
source/games/sw/src/coolie.cpp (Diff)
 
 
source/games/sw/src/copysect.cpp (Diff)
 
 
source/games/sw/src/draw.cpp (Diff)
 
 
source/games/sw/src/eel.cpp (Diff)
 
 
source/games/sw/src/game.cpp (Diff)
 
 
source/games/sw/src/game.h (Diff)
 
 
source/games/sw/src/girlninj.cpp (Diff)
 
 
source/games/sw/src/goro.cpp (Diff)
 
 
source/games/sw/src/hornet.cpp (Diff)
 
 
source/games/sw/src/input.cpp (Diff)
 
 
source/games/sw/src/interpso.cpp (Diff)
 
 
source/games/sw/src/interpso.h (Diff)
 
 
source/games/sw/src/inv.cpp (Diff)
 
 
source/games/sw/src/jsector.cpp (Diff)
 
source/games/sw/src/jsector.h (Diff)
 
 
source/games/sw/src/jweapon.cpp (Diff)
 
 
source/games/sw/src/lava.cpp (Diff)
 
 
source/games/sw/src/light.cpp (Diff)
 
 
source/games/sw/src/miscactr.cpp (Diff)
 
 
source/games/sw/src/morph.cpp (Diff)
 
 
source/games/sw/src/ninja.cpp (Diff)
 
 
source/games/sw/src/panel.cpp (Diff)
 
 
source/games/sw/src/parent.h (Diff)
 
source/games/sw/src/player.cpp (Diff)
 
 
source/games/sw/src/ripper.cpp (Diff)
 
 
source/games/sw/src/ripper2.cpp (Diff)
 
 
source/games/sw/src/rooms.cpp (Diff)
 
 
source/games/sw/src/rotator.cpp (Diff)
 
 
source/games/sw/src/save.cpp (Diff)
 
 
source/games/sw/src/sbar.cpp (Diff)
 
 
source/games/sw/src/scrip2.cpp (Diff)
 
source/games/sw/src/sector.cpp (Diff)
 
 
source/games/sw/src/serp.cpp (Diff)
 
 
source/games/sw/src/skel.cpp (Diff)
 
 
source/games/sw/src/skull.cpp (Diff)
 
 
source/games/sw/src/slidor.cpp (Diff)
 
 
source/games/sw/src/sounds.cpp (Diff)
 
 
source/games/sw/src/spike.cpp (Diff)
 
 
source/games/sw/src/sprite.cpp (Diff)
 
 
source/games/sw/src/sumo.cpp (Diff)
 
 
source/games/sw/src/track.cpp (Diff)
 
 
source/games/sw/src/vator.cpp (Diff)
 
 
source/games/sw/src/vis.cpp (Diff)
 
 
source/games/sw/src/wallmove.cpp (Diff)
 
 
source/games/sw/src/weapon.cpp (Diff)
 
 
source/games/sw/src/zilla.cpp (Diff)
 
 
source/games/sw/src/zombie.cpp (Diff)
 
 

Added

l

Deleted

source/core/compositesaveame.h
source/core/compositesavegame.cpp
source/games/sw/src/mfile.h