Magnus Norddahl
5ef46d1730
Merge remote-tracking branch 'gzdoom/master' into qzdoom
2016-09-24 09:37:18 +02:00
Christoph Oelckers
6bfbe30b99
Merge branch 'master' of https://github.com/rheit/zdoom
...
# Conflicts:
# src/CMakeLists.txt
# src/g_level.cpp
# src/p_saveg.cpp
# src/r_defs.h
# src/version.h
(note that this commit will not compile!)
2016-09-24 00:40:15 +02:00
Christoph Oelckers
f93e4813d1
- removed farchive.cpp and .h
2016-09-22 00:48:22 +02:00
Christoph Oelckers
88c27e2cc0
- allow the compact and pretty writers for JSON to coexist by wrapping the whole stuff into another class that calls the proper one as needed. Due to the implementation it is not possible to decide at run time how this should behave so there have to be two different objects for either mode.
...
- savegame code handles new format.
2016-09-21 21:57:24 +02:00
Christoph Oelckers
810ef8f775
- save global savegame data to JSON as well.
...
This is incomplete and untested, just a safety commit before going on.
2016-09-21 12:19:13 +02:00
Christoph Oelckers
970c168b13
- re-added serialization of treanslations.
...
- removed more dead code.
2016-09-20 19:45:32 +02:00
Christoph Oelckers
cf1e6d5275
- converted FBehavior::StaticSerializeModuleStates.
...
- removed some code which is no longer needed.
2016-09-20 11:35:25 +02:00
Christoph Oelckers
ab43e0c8cb
- all thinker serializers done.
2016-09-20 00:41:22 +02:00
Christoph Oelckers
e89d072abc
- most thinkers are done. Some stuff about polyobject pointers is temporarily disabled right now because some of the required functions have already been pulled out.
2016-09-19 19:14:30 +02:00
raa-eruanna
b0e104d566
Merge http://github.com/coelckers/gzdoom
2016-09-09 11:31:31 -04:00
Christoph Oelckers
b9ca3c85f8
- fixed: translucency detection in multipatch textures did not work.
...
- fixed: The flat drawer never checked if a texture had translucent parts.
2016-09-08 12:18:09 +02:00
raa-eruanna
dede94b7e2
Merge branch 'master' of https://github.com/coelckers/gzdoom
...
# Conflicts:
# src/posix/cocoa/i_video.mm
# src/win32/hardware.cpp
# wadsrc/static/menudef.txt
2016-09-08 03:26:11 -04:00
Magnus Norddahl
f56250b910
Remove premultiplied alpha
2016-08-14 05:10:34 +02:00
Magnus Norddahl
3c8719f945
Fix buffer overflow in FTexture::GenerateBgraMipmaps
2016-08-08 22:35:26 +02:00
Magnus Norddahl
2f512e54cd
Remove unused code
2016-08-06 23:12:34 +02:00
Magnus Norddahl
7000d0ccf9
Change GetPixelsBgra to use CopyTrueColorPixels
2016-08-06 22:59:16 +02:00
Magnus Norddahl
d1617fcdf0
GCC compile fixes
2016-06-30 13:45:06 +02:00
Magnus Norddahl
8f38d3af99
Replaced the bicubic interpolation filter with a simple sharpening filter
2016-06-27 10:49:15 +02:00
Magnus Norddahl
3b6d177787
Added bicubic interpolation when generating mipmaps
2016-06-25 12:14:15 +02:00
Magnus Norddahl
7705463966
Improved linear filtering of walls
...
Fixed some crash bugs
Added mipmap and filtering options to the display menu
2016-06-25 10:33:35 +02:00
Magnus Norddahl
c235de5c22
Native mipmap support to FTexture
2016-06-21 21:55:08 +02:00
Magnus Norddahl
6daeb5a158
Blend mode fixes
2016-06-20 02:36:54 +02:00
Magnus Norddahl
e72a032a11
Fixed alpha channel issue with textures
2016-06-19 23:12:10 +02:00
Magnus Norddahl
12a50c140c
Fix animated textures not updating in swtruecolor mode
2016-06-17 10:47:30 +02:00
Magnus Norddahl
8ba6a4f175
Precache, Unload and FillSimplePoly bug fix
2016-06-13 21:39:55 +02:00
Magnus Norddahl
cc10c2a970
Fix cameras and kdizd intro for true color mode
2016-06-13 03:16:48 +02:00
Magnus Norddahl
ffcfe0b54f
Fix warning
2016-06-10 17:08:45 +02:00
Magnus Norddahl
6c70eaea2f
Add jpeg bgra support
2016-06-10 15:56:50 +02:00
Magnus Norddahl
05b6fe6174
Added true color texture support for walls and floors
2016-06-10 13:50:34 +02:00
Magnus Norddahl
05220a7133
Added IsBgra() to DCanvas
...
Changed SWRender output format to be decided by IsBgra()
2016-05-31 09:36:18 +02:00
Magnus Norddahl
20b7743ec3
Added R_SetColorMapLight and R_SetDSColorMapLight
2016-05-31 01:49:39 +02:00
Magnus Norddahl
6e53c1bd12
Change render target output from PAL8 to BGRA8
2016-05-28 20:40:33 +02:00
Christoph Oelckers
bb378f2d94
Merge branch 'master' of https://github.com/rheit/zdoom
2016-05-04 14:38:57 +02:00
Christoph Oelckers
2c88816577
- fixed parameters for warp type 2.
2016-05-04 13:25:26 +02:00
Christoph Oelckers
6f2b0a6293
- rewrote texture caching so that not the base texture but the actually used translations for sprites get precached.
2016-05-03 01:00:52 +02:00
Christoph Oelckers
b2e67c2c7e
Merge branch 'master' of https://github.com/rheit/zdoom
...
# Conflicts:
# src/textures/texturemanager.cpp
2016-05-01 23:46:05 +02:00
Christoph Oelckers
65e1589543
- allow specifying actor classes whose graphics to precache through MAPINFO.
...
- some reorganization of texture precaching so that the renderer can decide what to do with actors.
Just marking the sprite textures loses too much info if more is needed than just loading the images into memory.
2016-05-01 22:47:36 +02:00
Christoph Oelckers
737646b45d
Merge branch 'master' of https://github.com/rheit/zdoom
2016-05-01 10:50:56 +02:00
Christoph Oelckers
c3759646e7
- merged FWarpTexture and FWarp2Texture, making the choice of effect a parameter of the WarpBuffer function.
...
Ideally the warping shouldn't be a property of the texture class itself but an effect processor that can get added to a texture. Unfortunately the current setup will not allow this, requiring some significant refactoring of texture access first.
2016-04-30 12:36:55 +02:00
Christoph Oelckers
e3fad118d2
- use the templated warp functions instead of the limited GZDoom 1.x version. gl_WarpBuffer has been removed.
2016-04-28 19:04:01 +02:00
Christoph Oelckers
27a3b6aafd
Merge branch 'master' of https://github.com/rheit/zdoom
2016-04-28 18:46:30 +02:00
Christoph Oelckers
3bbb5c7237
- moved the texture warping into templated subfunctions, so that the same code can be used for true color buffers as well.
2016-04-28 18:17:18 +02:00
Christoph Oelckers
60a78a0d9b
Merge branch 'master' of https://github.com/rheit/zdoom
2016-04-28 17:35:52 +02:00
Christoph Oelckers
ef98757c7c
- replaced finesine for texture warping with a smaller custom table, based on the old 2005 FP code, but fixes the generation of the sine table.
...
- removed all remnants of finesine and deleted tables.c and tables.h.
2016-04-28 15:59:37 +02:00
Christoph Oelckers
dce9bf2760
Merge branch 'master' of https://github.com/rheit/zdoom
2016-04-15 19:46:41 +02:00
Christoph Oelckers
94cec02acc
- fixed: FPNGTexture must readjust the file pointer after deciding to skip the tRNS chunk.
2016-04-15 15:15:34 +02:00
Christoph Oelckers
f0c2cd2d50
- fixed: 24 bit PNGs with transparent color need to set transpal to true in FPNGTexture::CopyTrueColorPixels.
2016-04-15 10:45:31 +02:00
Christoph Oelckers
7a2e957225
Merge branch 'master' of https://github.com/rheit/zdoom
2016-04-11 23:14:53 +02:00
Christoph Oelckers
aec1c85c08
- fixed: alpha for patches needs to be multiplied by 65536, not divided by.
2016-04-11 22:21:17 +02:00
Christoph Oelckers
7ce670951b
Merge branch 'master' of https://github.com/rheit/zdoom
...
# Conflicts:
# src/CMakeLists.txt
2016-04-11 10:49:11 +02:00