Christoph Oelckers
5947584bff
Merge branch 'master' into Glew_Version_For_Real
2014-05-11 13:29:37 +02:00
Christoph Oelckers
cd6d653b59
- fixed: the delayed state changer for the alpha function called glBlendFunc instead of glAlphaFunc.
2014-05-11 13:29:06 +02:00
Christoph Oelckers
09f4071436
Ok, it had to be done: Removed shader support for pre GLSL 1.3/GL 3.0 hardware. The compromises needed to accomodate these are just too bad and would block any attempt at streamlining the code.
2014-05-11 13:27:51 +02:00
Christoph Oelckers
92b9814460
Merge branch 'master' into Glew_Version_For_Real
2014-05-11 09:17:46 +02:00
Christoph Oelckers
a42cde0837
- removed #include of glxew.h because it's not used.
...
- removed some unused functions from gl_interface.cpp which were causing problems when compiling on Linux.
2014-05-11 09:17:18 +02:00
Christoph Oelckers
f7404d20fb
- add vertex buffer based drawing for all walls and flats.
2014-05-11 01:23:27 +02:00
Christoph Oelckers
7d3beb665b
- rewrote vertex buffer code to require GL_ARB_BUFFER_STORAGE extension.
...
This means it won't work anymore on anything that doesn't support OpenGL 4.0, but I don't think this is a problem. On older NVidia cards performance gains could not be seen and on older AMDs using the vertex buffer was even worse as long as it got mixed with immediate mode rendering.
2014-05-10 21:47:07 +02:00
Christoph Oelckers
b09405a8bd
- changed rendering of glowing walls so that it doesn't require an additional vertex attribute, just pass the floor and ceiling planes as uniforms.
2014-05-10 17:09:43 +02:00
Christoph Oelckers
64d991b9b3
Merge branch 'master' into Glew_Version_For_Real
2014-05-10 15:29:06 +02:00
Christoph Oelckers
7c180e5094
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-08 11:30:12 +02:00
Christoph Oelckers
458e1b1be2
- changed sound lookup for ZSDF dialogues so that it first checks the svox/ namespace before using the global one.
2014-05-08 11:29:45 +02:00
Christoph Oelckers
a7f8f7c18b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-08 10:35:10 +02:00
Christoph Oelckers
ea7fb936a8
- fixed: memory allocation for file names in 7z archives was broken. Changing it to use TArray instead of alloca makes it work.
2014-05-08 10:33:32 +02:00
Christoph Oelckers
6988156d0f
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-08 09:49:00 +02:00
Christoph Oelckers
1d4ea9f162
- removed the __asm nop breakpoints for debugging. They not only do not work on non-MSVC but also not on 64 bit.
2014-05-08 09:48:39 +02:00
Christoph Oelckers
2223c12938
- added new ChangeActorAngle/ChangeActorPitch ACS functions because the new required 'interpolate' parameter cannot be added to the existing SetActorAngle/SetActorPitch functions without breaking old scripts.
2014-05-08 09:43:58 +02:00
Christoph Oelckers
63a0e01c6a
Merge branch 'interpview_optin'
2014-05-08 09:17:00 +02:00
Christoph Oelckers
67ebbe3ed4
made some changes to turn the CF_INTERPVIEW flag when changing angles into an op-in feature instead of making it automatic.
2014-05-08 09:15:56 +02:00
Christoph Oelckers
890e9ecddd
- typo in resurrection code.
2014-05-07 17:18:44 +02:00
Christoph Oelckers
fcbb72a4d4
- removed redundant variable.
2014-05-06 09:59:56 +02:00
Edward Richardson
90e9937b71
Stop NetUpdate from corrupting demo playback
2014-05-05 22:47:48 +12:00
Christoph Oelckers
93aa1ea2c4
fixed some issues with reviving monsters
...
- fixed: Thing_Raise didn't properly set the spawn health.
- fixed: Thing_Raise did not the CanRaise state flag.
- fixed: Reviving a monster must also reset the damage type.
- fixed: Thing_Raise reset the actor after calling the raise state, but it should be before, just as the Archvile code is doing.
- consolidated some common code of Thing_Raise and Archvile resurrection into AActor methods.
2014-05-05 11:24:20 +02:00
Christoph Oelckers
a4076ffe38
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-03 12:29:18 +02:00
Christoph Oelckers
a9f1b54d2d
- fixed: since A_LightGoesOut alters a sector's floor plane it must also alter the TexZ for that sector's floor.
2014-05-03 10:12:25 +02:00
Christoph Oelckers
34360e7975
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-05-02 17:31:02 +02:00
Edward Richardson
104a07d461
Make sure use_staticrng is false if not needed
2014-05-03 03:27:14 +12:00
Edward Richardson
6183f8125f
Don't change RNG in demos incase they are static
2014-05-03 03:01:49 +12:00
Edward Richardson
d6af8dc352
Added static RNGseed control
2014-05-03 03:01:40 +12:00
Christoph Oelckers
314225f1b0
- don't depend on stdint.h because older MSVC versions do not have it.
2014-05-01 12:30:56 +02:00
Christoph Oelckers
cc4305e86c
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-30 01:29:26 +02:00
alexey.lysiuk
04c5a38ac6
Merge branch 'master' of https://github.com/rheit/zdoom into lzma2
2014-04-28 13:06:56 +03:00
alexey.lysiuk
76fdb4905f
Fixed compilation with updated LZMA library using Visual Studio
2014-04-28 13:06:36 +03:00
alexey.lysiuk
64d4ddf559
Fixed file list in VS2005 project of LZMA library
2014-04-28 11:42:47 +03:00
Christoph Oelckers
94c4f38c58
- added constants for sound channels 5-7.
2014-04-28 01:26:30 +02:00
alexey.lysiuk
3af7d8a245
Added support for LZMA2 compression method in .7z archives
...
Updated LZMA SDK to version 9.20
http://www.7-zip.org/sdk.html
http://downloads.sourceforge.net/sevenzip/lzma920.tar.bz2
2014-04-27 13:05:40 +03:00
alexey.lysiuk
6b26b710b8
Added simple check for unsupported compression method in .7z files
2014-04-27 10:23:20 +03:00
alexey.lysiuk
3fa89b4e9f
Fixed crash on attempt to load corrupted data file
...
Instance of FileReader is no longer destructed when header of data file is valid but complete loading of file fails
Loading of truncated .zip file is the simplest test case
2014-04-27 10:18:50 +03:00
Gaerzi
a0d4bc0a89
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-25 01:30:03 +02:00
Christoph Oelckers
3f8c7239af
Merge branch 'master' of https://github.com/Gaerzi/zdoom
2014-04-24 09:41:54 +02:00
Gaerzi
7c3660087e
Restore shadow renderstyle.
...
It was accidentally lost in r3085.
2014-04-22 13:32:33 +02:00
Gaerzi
265917c923
Add shadow and subtract styles to ACS.
...
There is a matching pull request for rheit/acs.
2014-04-22 13:31:55 +02:00
alexey.lysiuk
1c50b5dd6f
Fixed initialization of Hexen-style things
...
Recently added pitch and roll members were not initialized with zeroes when loading Hexen-style maps
At least, hitscan attack can be fired in random direction because of this
2014-04-20 13:37:59 +03:00
Christoph Oelckers
c7354c571f
Merge branch 'master' into GLEW_VERSION
2014-04-18 12:16:12 +02:00
Christoph Oelckers
4517079e82
Merge branch 'master' of https://github.com/coelckers/gzdoom
2014-04-18 12:14:17 +02:00
Christoph Oelckers
97c7f2c5ce
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-18 12:13:29 +02:00
Christoph Oelckers
7cb828d763
Merge branch 'slowstate' of https://github.com/Gaerzi/zdoom
2014-04-18 09:46:23 +02:00
Gaerzi
60fe07df74
Added slow states to relevant Strife monsters
...
Namely, acolyte, shadow acolyte, reaver, stalker, and turret. Info on
which states needed the slow flag was obtained with Quasar's permission
by looking at G_InitNew() in g_game.c and the info.c state tables from
Chocolate Strife.
Also added fast flag to acolyte states that needed it, based on the same
source.
2014-04-17 17:42:16 +02:00
Christoph Oelckers
584dd78ba9
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-04-16 16:42:43 +02:00
Edward Richardson
897d87a6a3
Invisibility would could P_LookForPlayers early
2014-04-17 01:13:18 +12:00
Edward Richardson
d855bd66b3
Fixed P_LookForPlayers scanning redundancies
...
- Players could be scanned multiple times, repeating expensive tests
- Players could be skipped completely and become invisible as a result
2014-04-17 00:46:33 +12:00
