Shawn Walker
01e909070a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-23 19:08:56 -07:00
Christoph Oelckers
12c038a234
Merge branch 'master' into Glew_Version_For_Real
2014-05-21 15:26:22 +02:00
Christoph Oelckers
360e7d17f2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-21 15:25:56 +02:00
Christoph Oelckers
39775cc904
- mystery of desaturation shader solved: The old code passed '1-desaturation' to the shader, the new code 'desaturation', so for the 'mix' function to work its arguments must be swapped.
2014-05-21 15:25:25 +02:00
Christoph Oelckers
54425ee2ef
- fixed: Desaturation factor was applied incorrectly.
...
- Also fixed some very strange thing in the shader's desaturate function. For unknown reasons using the 'mix' function there did not work.
- fixed: The fog boundary special shader could not be used.
2014-05-21 13:40:46 +02:00
Christoph Oelckers
0cf37f2e51
- fixed problem with selecting special shaders.
2014-05-21 12:36:29 +02:00
Christoph Oelckers
f5ea31b518
- use vertex buffer for all the common 2D rendering functions.
2014-05-21 00:36:04 +02:00
Christoph Oelckers
09ba62fbef
- put all the common part of buffer based drawing into a separate method of the vertex buffer.
2014-05-20 22:37:38 +02:00
Christoph Oelckers
23fbd69963
- 4 more places where immediate mode drawing has been substituted with a buffer-based alternative.
2014-05-20 22:20:15 +02:00
Christoph Oelckers
261bc77846
- fixed: when bringing up a new weapon the current flash state needs to be removed.
...
Especially when dropping the current weapon it can still be active, this is most easily observed with Strife's crossbow which loops the flash state, but it also can happen with other weapons, right after shooting.
2014-05-20 10:29:27 +02:00
Christoph Oelckers
8ec95dc58e
- fixed a few places in the savegame code where map names were still truncated to 8 characters.
2014-05-20 10:14:44 +02:00
Shawn Walker
582b1990b7
- restore original line endings
2014-05-18 16:00:31 -07:00
Shawn Walker
d2b0596cd4
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-18 15:39:41 -07:00
Shawn Walker
59885b856d
- remove texture name length limits for udmf maps
2014-05-18 15:38:46 -07:00
Christoph Oelckers
6e6be8ed5b
Merge branch 'master' into Glew_Version_For_Real
2014-05-18 12:47:48 +02:00
Christoph Oelckers
e84dc99475
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-18 12:46:28 +02:00
Christoph Oelckers
4acc04ce68
- don't truncate map names stored in demos.
2014-05-18 10:05:35 +02:00
Christoph Oelckers
cfef894867
This can be done better...
2014-05-18 09:41:13 +02:00
Edward Richardson
26b1abe3da
Fix netgame arbitration with long map lump names
2014-05-18 18:38:54 +12:00
Christoph Oelckers
ff7913ace8
- fixed: When a level gets loaded the renderer's sky variables need to be set.
2014-05-17 09:46:58 +02:00
Shawn Walker
ae8995e65b
Merge branch 'master' of https://github.com/rheit/zdoom
...
# By Christoph Oelckers (2) and Edward Richardson (1)
# Via Christoph Oelckers
* 'master' of https://github.com/rheit/zdoom :
- fixed: The map setup code was still truncating texture names in several places.
Fix nettic run-out at end of demo playback
- fixed: ACS's check...Texture functions must use the same search flags as the texture initialization code in p_setup.cpp and p_udmf.cpp. It also should not create textures that don't exist yet. We are only doing a comparison so it's not relevant if the texture exists or not.
2014-05-16 20:27:57 -07:00
Christoph Oelckers
8443de3f33
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-16 22:50:12 +02:00
Christoph Oelckers
e92032e8ff
- fixed: The map setup code was still truncating texture names in several places.
2014-05-16 22:48:37 +02:00
Christoph Oelckers
76b4ff143f
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-05-16 15:56:32 +02:00
Edward Richardson
d3dcc04666
Fix nettic run-out at end of demo playback
2014-05-17 00:36:43 +12:00
Christoph Oelckers
25f4af734f
- fixed: ACS's check...Texture functions must use the same search flags as the texture initialization code in p_setup.cpp and p_udmf.cpp. It also should not create textures that don't exist yet. We are only doing a comparison so it's not relevant if the texture exists or not.
2014-05-16 10:56:23 +02:00
Shawn Walker
49e0eb03cc
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 22:55:35 -07:00
Christoph Oelckers
bf6a193e5b
- fixed: The episode parser was still truncating its map names to 8 characters.
2014-05-15 20:29:36 +02:00
Christoph Oelckers
03d4f23a6e
- made adjustments to the texture loading code to account for the recent changes to handle long texture names.
2014-05-15 19:27:22 +02:00
Christoph Oelckers
4e64ad847b
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 09:46:47 +02:00
Shawn Walker
bfb5944517
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-15 00:11:52 -07:00
Christoph Oelckers
e3cd144af9
- one last GCC compile problem.
2014-05-14 17:27:22 +02:00
Christoph Oelckers
adcdc11360
- GCC compile fix.
2014-05-14 15:44:05 +02:00
Christoph Oelckers
2944e4f6ae
- fixed some Linux issues with recent changes.
2014-05-14 14:08:14 +02:00
Christoph Oelckers
802a478766
- Heretic doesn't really need dontcrunchcorpses because there was already some alternative handling for that situation.
2014-05-14 14:03:15 +02:00
Christoph Oelckers
85fb8c4326
- fixed: _M_X64 macro was misnamed _M_IX64.
2014-05-14 13:04:47 +02:00
Christoph Oelckers
51ed68dc72
- forgot to save this...
2014-05-14 13:02:04 +02:00
Christoph Oelckers
388f09f786
- fixed: In Heretic corpses do not get crunched to gibs, they just get their size reduced to 0. Handled by a new gameinfo flag. This also gets set for Chex quest which has the gib sprite replaced by something different. Using a Crush state will override this global flag.
2014-05-14 12:54:03 +02:00
Christoph Oelckers
47a9dab56d
- allow setting sector planes' plane equations directly from UDMF.
2014-05-14 12:16:33 +02:00
Christoph Oelckers
8c052818b7
- fixed: long texture name lookup did not work with TEXMAN_TryAny.
2014-05-14 10:27:40 +02:00
Shawn Walker
fdfcb728a9
- make it easier to spot patch definition errors in console log
2014-05-13 22:50:39 -07:00
Christoph Oelckers
a375454474
- removed 8 character limit for map names.
2014-05-14 00:52:16 +02:00
Christoph Oelckers
24886b6734
- removed the last static character arrays from FLevelLocals.
2014-05-13 23:16:13 +02:00
Christoph Oelckers
e49e926bd9
- added option to ASectorAction to remove itself upon triggering by setting the STANDSTILL flag on the map thing.
2014-05-13 21:26:51 +02:00
Christoph Oelckers
30f57c0b8e
- added new renderstyles AddStencil and AddShaded.
2014-05-13 21:16:06 +02:00
Christoph Oelckers
ca4179caa3
- allow texture lookup by full path names. Due to technical limitations this may result in double textures if the same graphics lump is also referenced by its short texture name.
2014-05-13 20:51:16 +02:00
Christoph Oelckers
ebd6c18bef
- missed one texture name field in level_info_t.
2014-05-13 15:32:54 +02:00
Christoph Oelckers
a22670626c
- expanded names for view border elements. Also fixed the horribly bad implementation of custom borders which modified the DoomBorder elements without ever checking the game being used.
2014-05-13 13:40:02 +02:00
Christoph Oelckers
a05e62f3f7
- changed storage of lump and texture names in gameinfo to allow long names (with the exception of view border elements.)
2014-05-13 12:44:17 +02:00
Christoph Oelckers
a05e584b81
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-13 12:00:37 +02:00