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
6205 commits 6 branches 6 tags 107 MiB
Commit graph

6205 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ralgor
ddf58b43c9 Fix compile errors on linux. 2014-09-14 14:28:05 -05:00
Chris Robinson
4b68891de7 Rename 'near', because microsoft 2014-09-14 11:15:32 -07:00
alexey.lysiuk
1529ff7730 Fixed compilation warning in HID name formatting 2014-09-14 09:51:55 +03:00
Chris Robinson
cd46f95902 Merge remote-tracking branch 'zdoom/master' into openal 2014-09-13 11:52:47 -07:00
Chris Robinson
ce678caab6 Include algorithm for std::min/max 2014-09-13 11:51:53 -07:00
alexey.lysiuk
c7fc44062e Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean 2014-09-13 16:12:14 +03:00
alexey.lysiuk
1e3e94f8ad Fixed crash Apple's HID Utilities in x86_64 build 
Only a small part of HID Utilities version 5.3, 2014-02-28 was merged in because of various issues it has
https://developer.apple.com/library/mac/samplecode/HID_Config_Save/
 2014-09-13 15:46:32 +03:00
Christoph Oelckers
ee6e87d94b - use a separate counter from AActor::special1 to count weapon use with some Hexen weapons. special1 is used for some other purposes as well, and when using a separate counter it can be reset to 0 when changing weapons, preventing counting errors. 2014-09-13 12:38:16 +02:00
Christoph Oelckers
f9741f1047 - added a compatibility option for Hexen's MAP04 to change the z-position of 4 quartz flasks that get lowered into a pool of lava but were incorrectly positioned 48 map units above the floor. 2014-09-13 12:20:06 +02:00
Christoph Oelckers
de68361f27 - fixed: When a sprite is being renamed by Dehacked it also needs to be changed in the list of original sprite names, otherwise any subsequent attempt to use the altered sprite in a frame definition will fail. 2014-09-13 11:54:19 +02:00
Christoph Oelckers
2ada3fe00e - remove debug stuff. 2014-09-13 11:40:06 +02:00
Christoph Oelckers
50a8297201 - fixed: G_ChangeLevel must resolve warptrans map links before getting the next level's levelinfo. 2014-09-13 11:00:25 +02:00
alexey.lysiuk
87472bf002 Use the same binary architecture to restart from IWAD picker 2014-09-13 11:44:24 +03:00
Christoph Oelckers
f0e9fde336 - fixed: In Raven games, don't chase after monsters in the titlemap or when actor has a goal. 2014-09-13 10:40:56 +02:00
alexey.lysiuk
7286ee9626 Renamed application delegate to controller 2014-09-13 11:23:38 +03:00
alexey.lysiuk
b6f829979a Cleaned up software rendering internals in Cocoa back-end 2014-09-13 11:16:23 +03:00
Christoph Oelckers
2be3b776d8 - fixed: A_CustomMissile should not jump to the See state for dead monsters when using CMF_CHECKTARGETDEAD. 2014-09-13 10:15:09 +02:00
Christoph Oelckers
46ec364443 - fixed: When validating the crouch sprite it was assumed that both the regular and the crouch sprite were having full rotations. 2014-09-13 10:08:22 +02:00
Christoph Oelckers
1e82d72349 - fixed: G_FinishTravel must clear the MF2_BLASTED flag off the player pawn because this flag will result in damage from contact with other objects in the map. 2014-09-13 09:56:21 +02:00
Christoph Oelckers
a0f507d18f - fixed: The crosshair setting code checked for existence of lumps, not textures and missed anything defined in a TEXTURES lump. 2014-09-13 09:51:49 +02:00
Chris Robinson
1baf355ecd Use the properly-sized type for ssize_t 2014-09-12 19:36:13 -07:00
Christoph Oelckers
3c2f1952fd Merge branch 'master' into v2.x 2014-09-12 21:01:55 +02:00
Christoph Oelckers
5a1ad75402 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-12 21:01:27 +02:00
Christoph Oelckers
109da206a6 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-12 20:59:41 +02:00
Christoph Oelckers
a2c81f1ca9 -fixed the file validity checks in MapData::GetChecksum. 
They need to be done per lump, because MapData::Seek can alter the FileReader being used for a specific lump. Even worse, the FileReader will be NULL when the function as it was is called for a map inside a Zip-file.
 2014-09-12 20:59:23 +02:00
alexey.lysiuk
1dab120e15 Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean 2014-09-12 18:37:43 +03:00
alexey.lysiuk
0fd84bc853 Added ability to turn off hi-res backing surface rendering on Retina displays 
High resolution backing surface is enabled by default and controlled via vid_hidpi CVAR
When it is set to false one pixel per point scale is used
 2014-09-12 18:35:45 +03:00
Chris Robinson
628f2cd474 Merge remote-tracking branch 'zdoom/master' into openal 2014-09-12 05:02:05 -07:00
Chris Robinson
713846f27a Fix use of ssize_t with MSVC 2014-09-12 04:26:54 -07:00
Braden Obrzut
27ebfa783e - Added IfHealth based on Blue Shadow's patch. 2014-09-12 00:49:09 -04:00
Braden Obrzut
0223b7f460 - Fixed: InInventory didn't work quite right with multiple items. 2014-09-12 00:39:36 -04:00
Chris Robinson
ca22f2dd3f Fix a PrintMidiDevice call 2014-09-11 14:16:56 -07:00
Christoph Oelckers
25951362fc - fixed: When applying Boom's Transfer_Heights effect to a sector, gl_FakeFlat needs to remove all portals from the original sector planes that are being replaced in the sector copy. 2014-09-11 13:02:39 +02:00
Chris Robinson
77cce303ef Fix merge conflict properly 2014-09-09 15:11:26 -07:00
Chris Robinson
ff6eb6df5c Merge remote-tracking branch 'zdoom/master' into openal 
Conflicts:
	src/s_sound.cpp
 2014-09-09 14:45:53 -07: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
Christoph Oelckers
4bb320a27c - route texture binding through the renderstate class for better control. Currently it's just a direct passthrough but this will change. 2014-09-09 12:00:42 +02:00
Christoph Oelckers
d5633701b4 - swapped order of textures in burn shader to avoid some problems with the texture samplers. 
- fixed: texture sampler state for the burn texture was never set.
 2014-09-09 10:17:44 +02:00
Christoph Oelckers
c6f4c0b6f0 - fixed: FMaterial's tex pointer could be accessed before it was set. 
- allow more than two texture units in shaders.
 2014-09-09 10:03:34 +02:00
Christoph Oelckers
62880f113b - fix a render glitch with Back to Saturn X MAP06: Do not flood missing upper and lower textures with the backsector's flat if that backsector is malformed (i.e. has no area.) 2014-09-09 08:47:39 +02:00
Christoph Oelckers
9b8869e78d Merge branch 'master' into v2.x 
Conflicts:
	src/gl/textures/gl_material.cpp
 2014-09-09 01:30:11 +02:00
Christoph Oelckers
86d9c7ec8e - add some compatibility settings to fix rendering glitches in BTSX_E1 MAP12. 2014-09-09 01:27:41 +02:00
Christoph Oelckers
e2c2f635ac Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-08 23:26:17 +02:00
Christoph Oelckers
5e34b78451 - missed a line. 2014-09-08 23:25:27 +02:00
Christoph Oelckers
0ff061b928 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-08 22:55:37 +02:00
Christoph Oelckers
580e580c42 - added option to set a sector's tag via compatibility.txt (needed by GZDoom) 2014-09-08 22:54:56 +02:00
Christoph Oelckers
3d2646cbae Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-08 13:02:39 +02:00
Christoph Oelckers
cfd24f438f - jpalomo's A_Saw flags submission. 2014-09-08 13:02:05 +02:00
Gaerzi
4659a87292 Merge pull request #15 from alexey-lysiuk/fix_upscale_transparency 
Fixed missing transparency on upscaled textures
 2014-09-07 16:15:44 +02:00
alexey.lysiuk
e29fce6951 Fixed missing transparency on upscaled textures 
Textures with diagonal patterns were treated as opaque after resizing
Images upscaled by hqNx were affected mostly by this issue

http://forum.drdteam.org/viewtopic.php?f=24&t=5370
http://zandronum.com/tracker/view.php?id=269
http://zandronum.com/tracker/view.php?id=315
 2014-09-07 11:52:51 +03:00