raa-eruanna
cfb985ceb3
Merge http://github.com/rheit/zdoom
2016-10-15 07:58:16 -04:00
Christoph Oelckers
162da2fcaf
- allow to specify "none" to set an actor's translation to the identity table.
2016-10-15 10:51:48 +02:00
raa-eruanna
267b131c03
Merge http://github.com/rheit/zdoom
2016-10-02 23:10:28 -04:00
Christoph Oelckers
a505e91032
- added TRNSLATE lump for defining global translations which are accessible by name.
...
This is only the definition part, manipulation functions for ACS and DECORATE still to do.
2016-10-02 13:35:25 +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
970c168b13
- re-added serialization of treanslations.
...
- removed more dead code.
2016-09-20 19:45:32 +02:00
Christoph Oelckers
42e38f6cc1
- more cleanup to reduce references to FArchive.
2016-09-20 10:59:48 +02:00
Christoph Oelckers
f568a35756
Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt
...
# Conflicts:
# src/win32/fb_d3d9.cpp
2016-03-24 16:38:09 +01:00
Christoph Oelckers
86d1b2955a
- floatified most of r_data (The interpolations cannot be done yet.)
2016-03-24 14:11:41 +01:00
Christoph Oelckers
a96d6ab072
Merge remote-tracking branch 'remotes/zdoom/master'
...
# Conflicts:
# src/g_level.cpp
# src/p_3dfloors.cpp
# src/p_lnspec.cpp
# src/p_saveg.cpp
# src/p_spec.cpp
# src/r_bsp.cpp
# src/r_data/r_interpolate.cpp
# src/r_data/r_translate.cpp
# src/r_data/sprites.cpp
# src/r_defs.h
# src/r_sky.h
# src/stats.h
# src/textures/texturemanager.cpp
# src/textures/textures.h
# src/version.h
# src/win32/fb_d3d9.cpp
# src/win32/hardware.cpp
# src/win32/i_system.cpp
# wadsrc/static/actors/doom/doomarmor.txt
# wadsrc/static/compatibility.txt
# wadsrc/static/language.enu
# wadsrc/static/mapinfo/common.txt
# wadsrc/static/menudef.txt
# wadsrc/static/xlat/eternity.txt
2016-03-01 18:50:45 +01:00
Randy Heit
55142078d8
Normalize line endings
2016-03-01 09:47:10 -06:00
Christoph Oelckers
5dba3b7017
Merge branch 'master' of https://github.com/rheit/zdoom
2016-02-01 18:14:39 +01:00
Christoph Oelckers
e0608f50d1
- create a separate translation table for Heretic's rain pillar.
...
These objects are supposed to be bright, but the standard translations for player do not take this into account, creating dark and/or invisible projectiles depending on the color being used.
The new translation uses hue and saturation from the player color, but combines brightness from the original color with the one for the player in an 8:2 ratio, so that no matter for the player color, these always remain bright and visible.
2016-02-01 10:45:33 +01:00
Christoph Oelckers
acf6c259d8
- changed the handling of alpha textures. The only special case they need is with palette-less textures and this can be handled far more easily and robustly with a predefined translation instead of passing another parameter through all the layers of the texture management code. This also fixes problems with paletted PNGs that get used as an alpha texture because the old method clobbered the image's palette.
2014-09-09 13:21:36 +02:00
Randy Heit
2668988870
- Switched to a genericly extensible representation for userinfo.
...
- Fixed: The playerinfo CCMD did not range check the player number.
SVN r4253 (trunk)
2013-05-12 18:27:03 +00:00
Randy Heit
d28ebe543b
- Changed FRemapTable::AddDesaturation() to take doubles as parameters, since the C ABI always
...
passes doubles to functions anyway.
- Fixed: FRemapTable::AddDesaturation() excluded the final entry from the loop. Also, it was
less forgiving than AddColorRange, in that it did not support ranges in descending order.
SVN r3875 (trunk)
2012-09-19 01:45:00 +00:00
Randy Heit
71e02e2d9e
- Fixed: When the player setup menu cycles the random players, it needs to rebuild the translation for each one.
...
SVN r3657 (trunk)
2012-05-15 22:52:24 +00:00
Randy Heit
c676f97fd8
- Fixed: r_translate.cpp:SetRange() did not set the true color palette entry for single-entry ranges.
...
SVN r3608 (trunk)
2012-05-01 01:47:31 +00:00
Randy Heit
73a78caa5c
- Added support for a few extra color ranges to Player.Colorset so that the Strife player's
...
predefined colors can properly define the standard Strife translation ranges.
SVN r3446 (trunk)
2012-03-16 02:23:31 +00:00
Randy Heit
2f3ea885c5
- Fixed: The identity translation for players should not be remapped through GPalette.Remap[].
...
The graphics are already mapped through this, so we don't need to do it again when translating.
Moreover, if there was no duplicate of color 0, but there was a different color with a
duplicate, this means we end up drawing players with the duplicated color wherever it should
be color 0. (Standard translations already had this right.)
SVN r3417 (trunk)
2012-03-10 00:26:42 +00:00
Christoph Oelckers
463c276014
- removed more r_ header dependencies from the rest of the code.
...
SVN r3260 (trunk)
2011-07-06 15:31:05 +00:00
Christoph Oelckers
163301dcd5
- took all includes of farchive.h out of headers. This file will have to be included explicitly in each source file that needs it.
...
SVN r3259 (trunk)
2011-07-06 14:20:54 +00:00
Christoph Oelckers
03177090c0
- removed some unnecessary r_ header #includes.
...
SVN r3257 (trunk)
2011-07-06 10:55:04 +00:00
Christoph Oelckers
fbff5ca932
- moved r_interpolate.cpp and r_translate.cpp to r_data.
...
- merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used.
SVN r3255 (trunk)
2011-07-06 08:50:15 +00:00
