nashmuhandes e5e7e85b81 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/CMakeLists.txt # src/basicinlines.h # src/m_fixed.h # src/r_3dfloors.h # src/r_bsp.cpp # src/r_bsp.h # src/r_draw.cpp # src/r_draw.h # src/r_main.cpp # src/r_main.h # src/r_plane.h # src/r_segs.h # src/r_swrenderer.cpp # src/r_things.cpp # src/r_things.h # src/win32/fb_d3d9.cpp # src/win32/fb_ddraw.cpp # wadsrc_lights/static/doomdefs.txt # wadsrc_lights/static/hticdefs.txt		2016-12-23 00:51:30 +08:00
..
doom.doom1	- sanitized the old sprite offset adjustment feature and used it to redefine offsets for some sprites that have really bad ones.	2016-12-03 19:49:32 +01:00
doom.doom2	- sanitized the old sprite offset adjustment feature and used it to redefine offsets for some sprites that have really bad ones.	2016-12-03 19:49:32 +01:00
doom.freedoom	Merge branch conflicts fix	2016-01-21 10:49:57 +13:00
game-doom/graphics	Replaced copyrighted assets contained inside the engine PK3.	2016-04-27 22:35:28 +08:00
game-doomchex	Split ANIMATED into three parts, filtered by game that uses them	2016-10-15 21:40:24 -05:00
game-heretic	Split ANIMATED into three parts, filtered by game that uses them	2016-10-15 21:40:24 -05:00
game-hexen	Externalized default key bindings	2015-04-05 21:40:53 -05:00
game-raven/graphics	Replaced copyrighted assets contained inside the engine PK3.	2016-04-27 22:35:28 +08:00
game-strife	Split ANIMATED into three parts, filtered by game that uses them	2016-10-15 21:40:24 -05:00
heretic	- sanitized the old sprite offset adjustment feature and used it to redefine offsets for some sprites that have really bad ones.	2016-12-03 19:49:32 +01:00
hexen	Fixed loading of Hexen and Strife	2016-12-08 12:07:12 +02:00
strife	Fixed loading of Hexen and Strife	2016-12-08 12:07:12 +02:00
strifeteaser1/mapinfo	Normalize line endings	2016-03-01 09:47:10 -06:00
strifeteaser2/mapinfo	Normalize line endings	2016-03-01 09:47:10 -06:00