zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-21 09:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
8090 commits 6 branches 6 tags 107 MiB
Commit graph

293 commits

Author SHA1 Message Date
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
Christoph Oelckers
db86385cf6 - removed STACK_ARGS. 
The only reason this even existed was that ZDoom's original VC projects used __fastcall. The CMake generated project do not, they stick to __cdecl.
Since no performance gain can be seen by using __fastcall the best course of action is to just remove all traces of it from the source and forget that it ever existed.
 2016-04-11 10:46:30 +02:00
Christoph Oelckers
251172c7f0 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_data/r_interpolate.cpp
 2016-03-30 18:24:22 +02:00
Christoph Oelckers
66929cbaff - floatified p_trace, p_slopes and p_udmf.cpp. 
- major cleanup of unused code.
 2016-03-30 16:30:22 +02:00
Christoph Oelckers
ae14268989 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_utility.cpp
 2016-03-29 10:09:03 +02:00
Christoph Oelckers
0c39bdd04c - floatified texture scale values. 2016-03-26 13:37:44 +01:00
Christoph Oelckers
dabed04d2a - floatification of p_3dfloors, p_3dmidtex and p_acs.cpp plus some leftovers. 
- removed all references to Doom specific headers from xs_Float.h and cmath.h.
 2016-03-26 12:36:15 +01:00
Christoph Oelckers
ad74493d5e Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 2016-03-25 14:56:40 +01:00
Christoph Oelckers
e077510773 - floatified MaxTargetRange and MeleeThreshold. 2016-03-24 20:56:59 +01: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
5bf806e478 - renamed some fixed point stuff in the texture composition code. 2016-03-24 16:16:45 +01:00
Christoph Oelckers
19b85f806e Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/actor.h
 2016-03-22 12:44:40 +01:00
Christoph Oelckers
4e60ea0252 - made AActor::alpha a floating point value 
- replaced some uses of FRACUNIT with OPAQUE when it was about translucency.
- simplified some overly complicated translucency multiplications in the SBARINFO code.
 2016-03-21 12:18:46 +01:00
Christoph Oelckers
904a027bd2 Merge branch 'master' of https://github.com/rheit/zdoom 2016-03-21 01:31:32 +01:00
Christoph Oelckers
9b134a78e3 - fixed: The TEXTURES parser wanted a redundant comma after parsing a color. 2016-03-16 22:42:41 +01:00
Christoph Oelckers
f4f489b33d Merge branch 'master' of https://github.com/rheit/zdoom 2016-03-14 22:02:58 +01:00
Braden Obrzut
93be5aca05 - Fixed: Modern versions of GCC on PowerPC inserted padding to the end of pragma packed structures. 
- Worked aorund modern GCC bug where C++ exceptions in Objective-C++ code would result in an ICE (bug is already on their tracker, but I doubt it will be fixed unless I decide to dig into the issue myself).
- Turn off fused floating point instructions since these can cause slight deviations in floating point code.
- Use -static-libgcc when compiling on the Mac with GCC since we need to use a custom version of GCC to do so now.
- Note: ZDoom will currently still crash on exit on PowerPC since it seems to be deciding that NameManager needs to be destructed before the console commands.
 2016-03-13 01:14:08 -05:00
Christoph Oelckers
8b4f4d06ad Merge branch 'zmaster' 2016-03-13 02:32:41 +01:00
Randy Heit
8a03b99b9c Use ScriptMessage to warn about missing patches in a TEXTURES texture 2016-03-12 19:23:49 -06: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
dfd7e08307 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/menudef.txt
 2016-02-21 01:55:15 +01:00
m-x-d
d2630dee8c Fixed: warp and warp2 texture effects now work for NPo2 textures. 2016-02-20 21:45:09 +01:00
Christoph Oelckers
56202c49f1 Merge branch 'master' of c:\programming\doom-dev\zdoom 
# Conflicts:
#	.gitignore
 2016-02-16 21:02:13 +01:00
Christoph Oelckers
6adb069506 - rewrote p_local.h so that it doesn't pull in the entire bunch of headers. 
This was to resolve some circular dependencies with the portal code.
The most notable changees:

 * FTextureID was moved from textures.h to doomtype.h because it is frequently needed in files that don't want to do anything with actual textures.
 * split off the parts from p_maputl into a separate header.
 * consolidated all blockmap related data into p_blockmap.h
 * split off the polyobject parts into po_man.h
 2016-02-15 02:14:34 +01:00
Christoph Oelckers
dda73b531c Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/p_setup.cpp
#	src/r_defs.h
#	src/version.h

This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.
 2016-02-05 12:31:41 +01:00
Randy Heit
b3b0886b64 Merge branch 'scripting' 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-02-04 15:17:22 -06:00
Christoph Oelckers
046541c7ef Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-02 10:46:50 +01:00
Christoph Oelckers
6b75f14c0f - fixed some Linux/GCC warnings. 2016-02-02 01:04:59 +01:00
Christoph Oelckers
371225858d Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-26 11:40:32 +01:00
Randy Heit
9f8dee45c4 Fixed: 0 was accidentally not allowed as transparent for grayscale 
- I don't know what I was thinking when I wrote that.
 2016-01-25 21:44:08 -06:00
Randy Heit
450b6de384 cRGBT::A should return 255, not 1. Whoops. 2016-01-25 21:31:21 -06:00
Randy Heit
0fc40cff0a Fix some rare PNG tRNS chunk cases 
- For grayscale images drawn with the paletted renderer, the value here
  was treated as always full range [0,65535]. The max value is actually
  determined by the bit depth.
- For RGB images drawn with the paletted renderer, the tRNS chunk was
  ignored.
- For grayscale images drawn with the RGB renderer, having a tRNS chunk
  present resulted in undefined behavior.
- For RGB images drawn with the RGB renderer, the tRNS chunk was ignored.
 2016-01-25 21:23:53 -06:00
Christoph Oelckers
cfcd2668cc Merge commit '772a5724313f2ad0bd6828fcc28545a9ee5e6068' into scripting 
Conflicts:
	src/p_pspr.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:00:45 +01:00
alexey.lysiuk
571f7a4eb6 - fixed: debug assertion failure in texture precaching 
loading of level from command line attempted to use uninitialized time value
 2015-12-25 09:48:22 +02:00
Christoph Oelckers
455d8d9730 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-02 22:33:10 +01:00
Christoph Oelckers
81f521fe56 - fixed: Texture precaching from MAPINFO was broken 
The code assumed that it had access to the texture manager but that gets initialized after MAPINFO, which means that MAPINFO can only store the texture names and let the precaching code resolve the actual textures.
 2015-12-02 22:31:27 +01:00
Christoph Oelckers
d8ea128f38 Merge branch 'master' into scripting 
Conflicts:
	src/p_effect.cpp
	src/p_effect.h
	src/p_local.h
	src/p_map.cpp
	src/thingdef/thingdef_codeptr.cpp
 2015-07-16 20:37:17 +02:00
Christoph Oelckers
d58d38a1d3 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_3dfloors.cpp
 2015-07-13 21:36:19 +02:00
Christoph Oelckers
fe2e293d02 - added some error checks for trying to create unsupported animations for textures with full path names. 2015-07-13 09:08:08 +02:00