Christoph Oelckers
e14756e810
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-21 09:18:23 +02:00
Christoph Oelckers
f92cdb0ce7
- fixed: When the SectorAction's TriggerAction method was renamed, the inherited one in the MusicChanger was overlooked. (Bit thanks to the C++ specs for allowing to override a non-virtual method with a virtual one without even showing a warning...)
2014-09-21 09:11:33 +02:00
Christoph Oelckers
cbf72fe992
- fixed: Since the serializing code cannot distinguish between user variables of the same name coming from different actors in an inheritance chain, this kind of name duplication must be prohibited.
2014-09-21 08:32:39 +02:00
Christoph Oelckers
cbf353ca52
Merge branch 'master' of https://github.com/rheit/zdoom
2014-09-21 08:12:32 +02:00
MajorCooke
44683657f2
- Added jpalomo's A_SetSpeed patch.
2014-09-20 17:34:57 -05:00
MajorCooke
cf5d608eb5
Merge pull request #1 from rheit/master
...
- Added Blue Shadow's DropInventory ACS function.
2014-09-20 17:26:45 -05:00
alexey.lysiuk
49dca4d9cb
Native Cocoa back-end is enabled by default
2014-09-20 11:56:15 +03:00
alexey.lysiuk
e8ca4fa94e
Applied fixes for timer to its thread-based implementation
2014-09-20 11:55:49 +03:00
alexey.lysiuk
0f602fb1ce
Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_clean
2014-09-20 11:54:21 +03: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
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