Commit Graph

4664 Commits

Author SHA1 Message Date
MajorCooke cf5d608eb5 Merge pull request #1 from rheit/master
- Added Blue Shadow's DropInventory ACS function.
2014-09-20 17:26:45 -05:00
Christoph Oelckers 835dbe5bd0 - removed the 'layout' qualifier from the uniform buffer declaration. It's not really needed because the layout of a single vec4 array cannot possibly change, and Intel drivers are complaining for unknown reasons. 2014-09-20 09:10:01 +02:00
Christoph Oelckers 43e2d704a3 - always use glPolygonOffset to render translucent geometry. 2014-09-20 09:04:36 +02:00
MajorCooke 16a380f82a - Added Blue Shadow's DropInventory ACS function. 2014-09-19 17:27:18 -05:00
MajorCooke 33f83cc7f9 Added Blue Shadow's A_SpawnItemEx changes: (2/2)
SXF_TRANSFERALPHA and SXF_TRANSFERRENDERSTYLE
2014-09-19 14:17:24 -05:00
MajorCooke 5c4ad9be68 Added Blue Shadow's A_SpawnItemEx changes: (1/2)
SXF_TRANSFERALPHA and SXF_TRANSFERRENDERSTYLE
2014-09-19 14:15:31 -05:00
Christoph Oelckers c2377ff8e1 Merge branch 'setmasterfix' of https://github.com/MajorCooke/zdoom 2014-09-19 09:15:33 +02:00
Christoph Oelckers 0787f73cd4 Merge branch 'clang_3_5_crash' of https://github.com/edward-san/zdoom 2014-09-19 09:14:44 +02:00
MajorCooke 7a62459c00 Allow SXF_SETMASTER to work on non-monsters. 2014-09-18 17:58:06 -05:00
Christoph Oelckers 92dcf2e5ef - fixed some of those supremely annoying and supremely pointless GCC/Clang compiler warnings. 2014-09-17 11:03:05 +02:00
Christoph Oelckers c5e00dbc53 fixed: The sampler object for camera textures was never initialized. 2014-09-17 10:52:34 +02:00
Christoph Oelckers c773a500f2 - only activate shader storage buffers on modern drivers also supporting GL_ARB_buffer storage. Early adopters of this extension (i.e. older AMD drivers mainly) tend to implement this badly. 2014-09-17 09:01:16 +02:00
Christoph Oelckers df1364e2d7 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-16 08:46:12 +02:00
Christoph Oelckers 134c9ade21 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-16 08:44:37 +02:00
Christoph Oelckers 8ef16b72ee Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-16 08:43:03 +02:00
Christoph Oelckers 864adde92e - typo for savegame versioning of AActor::weaponspecial: it was introduced in savegame version 4512, not 4511. 2014-09-16 08:42:27 +02:00
Edoardo Prezioso 1c96039d7a - Fixed miscompilation with Clang 3.5.0.
The optimizer miscompiles the function FBehavior::LoadScriptsDirectory and causes random crashes when zdoom is run with wads containing scripts.
As said in the comment, I just hope that the Clang devs fix it for the next patching release, ie 3.5.1.
2014-09-15 19:46:43 +02:00
Braden Obrzut 94123d5ef4 - Applied anonymous patch to fix uncapped stuttering in SDL backend. 2014-09-15 12:59:07 -04:00
Christoph Oelckers a25ed3c807 - fixed: inverted rendering for fuzzy things with light powerup was switched off due to change of render style. 2014-09-15 12:15:19 +02:00
Christoph Oelckers 77c4533e4b Merge branch 'v2.x' 2014-09-15 11:51:59 +02:00
Christoph Oelckers 2ed287428c Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-15 11:36:51 +02:00
Christoph Oelckers 4be9a71636 - fixed: The VOC reader didn't advance the read index correctly. 2014-09-15 11:32:40 +02:00
Christoph Oelckers 1b13e6be98 -. fixed:S_LoadSound passed the wrong value for the lump size parameter to LoadSoundVoc. 2014-09-15 11:24:48 +02:00
Christoph Oelckers 8e7e16f73a - fixed: The light uniform buffer may not be mapped with GL_MAP_INVALIDATE_BUFFER_BIT, because it needs to be mapped for each portal in a scene but it must preserve the existing data for the remaining translucent objects. 2014-09-15 10:27:09 +02:00
Christoph Oelckers 07ef7d3d59 Merge branch 'master' into v2.x 2014-09-14 23:07:30 +02:00
Christoph Oelckers 60ff6c5f07 Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-14 23:06:57 +02:00
Christoph Oelckers 32f08adaf3 - moved some code to better places.
- allow GL version 3.0 in Windows, too.
2014-09-14 23:01:57 +02:00
Ralgor 5cc43137a1 Only require OpenGL 3.0 compatibility profile. 2014-09-14 14:43:42 -05:00
Ralgor cfc8f3dbbf Global GL render context shouldn't be initialized inside of gl_PrintStartupLog, since it's not compiled in non MSC builds. 2014-09-14 14:42:14 -05:00
Ralgor 1a70a6aabc The light buffer should check for shader_storage_buffer_object rather than buffer_storage. 2014-09-14 14:29:13 -05:00
Ralgor ddf58b43c9 Fix compile errors on linux. 2014-09-14 14:28:05 -05: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
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
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
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
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
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
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