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
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