Christoph Oelckers 42d02834b1 Merge branch 'master' into newrenderer2 ... # Conflicts: # source/build/include/build.h # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp # source/core/gamecontrol.cpp # source/core/gamestruct.h # source/games/blood/src/animatesprite.cpp # source/games/blood/src/misc.h # source/games/blood/src/view.cpp # source/games/duke/src/render.cpp # source/games/sw/src/draw.cpp # source/games/sw/src/game.h # source/games/sw/src/jsector.cpp # source/glbackend/glbackend.cpp		2021-04-11 14:38:56 +02:00
..
scene	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
hw_entrypoint.cpp	- enable palette emulation for the new renderer.	2021-04-05 13:05:31 +02:00
hw_models.cpp	- voxel rendering.	2021-04-02 18:20:07 +02:00
hw_models.h	- voxel rendering.	2021-04-02 18:20:07 +02:00
hw_palmanager.cpp	- moved palette manager for indexed textures out of glbackend	2021-04-05 20:00:21 +02:00
hw_palmanager.h	- moved palette manager for indexed textures out of glbackend	2021-04-05 20:00:21 +02:00
hw_voxels.cpp	- Cleanup of the voxel code.	2021-04-05 18:05:43 +02:00
hw_voxels.h	- Cleanup of the voxel code.	2021-04-05 18:05:43 +02:00
render.h	- fixed camera texture setup.	2021-03-28 19:22:51 +02:00