Rachael Alexanderson
8e7e1b48e9
Merge branch 'master' of https://github.com/rheit/zdoom
2016-11-06 19:54:08 -05:00
Braden Obrzut
640bf2a6d4
- Fixed: SBarInfo didn't support animated images in some places.
2016-11-06 17:07:44 -05:00
Rachael Alexanderson
9f9e4ea19d
- Added randi's "bottomclip" parameter to dpJudas's OpenGLSWFrameBuffer::FillSimplePoly implementation. The code refused to compile because of the new changes. Note that this is not tested on Linux or Mac, and will likely need changes there as well.
2016-11-06 08:58:06 -05:00
Rachael Alexanderson
901727a7f8
Merge branch 'master' of https://github.com/rheit/zdoom
2016-11-06 08:11:04 -05:00
Magnus Norddahl
3a7532fd9b
Improve flat mipmap selection
2016-11-06 11:39:28 +01:00
Magnus Norddahl
aad2cde332
Oops, forced all sandy bridge CPUs to westmere instead of just Pentium G840
2016-11-06 07:37:18 +01:00
Magnus Norddahl
70d4097b34
Fix clamping bug when r_mipmap is off
2016-11-06 07:33:17 +01:00
Marisa Heit
55ee78fc0b
Add bottomclip parameter to FillSimplePoly() for the software implementation
...
- Polygons will be clipped to bottomclip. If this is zero or below, they
will be clipped to the bottom of the screen instead. This keeps the
polygons from overwriting the status bar border for sofware 2D. The
hardware version ignores it, since it always draws the status bar border
every frame.
2016-11-05 22:49:33 -05:00
Rachael Alexanderson
5e547e9455
Merge branch 'master' of https://github.com/rheit/zdoom
...
# Conflicts:
# src/r_segs.cpp
# src/v_draw.cpp
2016-11-05 23:38:50 -04:00
Marisa Heit
dbc54fbca0
Fix FillSimplePoly() for 1-pixel tall or wide textures
2016-11-05 22:30:16 -05:00
Marisa Heit
ae28c9b29c
Fix divide by 0 in new wallscan functions with 1-pixel tall textures
2016-11-05 22:09:38 -05:00
Magnus Norddahl
d084f77546
Fix mipmap generation bug
...
Fix crash due to dc_source2 not always being set
Add r_lod_bias to control mipmap selection
Improve LOD calculations to take the U texture coordinate into account
2016-11-05 16:12:59 +01:00
Rachael Alexanderson
d4aed28260
Merge branch 'master' of https://github.com/rheit/zdoom
2016-11-05 08:18:53 -04:00
Magnus Norddahl
4b18530047
Add linear filtering to column drawers and fix offsetting bug with wall/span linear filters
2016-11-05 11:29:50 +01:00
Christoph Oelckers
9ab779fd61
Merge commit '60ae4a8568d9fc929c803036fa16fa0f9bfb68a2'
2016-11-05 10:39:13 +01:00
Rachael Alexanderson
2fe5cb4f77
Merge branch 'master' of https://github.com/rheit/zdoom
2016-11-04 23:53:05 -04:00
Magnus Norddahl
f9fa33c32e
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
2016-11-05 04:50:30 +01:00
Magnus Norddahl
484e1b56be
Merge remote-tracking branch 'origin/new_wallscan' into qzdoom
2016-11-05 04:49:54 +01:00
Braden Obrzut
dd1f72bbf9
- Check the version of FMOD in CMake to produce an error on the condition that OpenAL is also enabled and the FMOD version is low enough to also export Xiph symbols.
2016-11-04 23:27:04 -04:00
Magnus Norddahl
60ae4a8568
Replace build wallscan with a rewritten version that tile and scale correctly
2016-11-05 04:02:30 +01:00
Rachael Alexanderson
a957f72875
Merge branch 'master' of https://github.com/rheit/zdoom
2016-11-04 09:42:25 -04:00
Christoph Oelckers
faea61cf01
- fixed: Turbo messages were printed, even when no turbo mode was active.
2016-11-04 12:43:23 +01:00
Christoph Oelckers
540f20882e
- fixed: Degeneration should use the same base health value as all the rest of the engine.
...
- also replaced deh.MaxHealth in the bot code which was the only other remaining case where this was used as health limiter.
2016-11-04 11:32:57 +01:00
Christoph Oelckers
7755a3525a
- do not allow menu slider values very close to zero. They not only can produce a glitched number display but also some weird inconsistencies when operating a slider.
2016-11-04 11:17:22 +01:00
Magnus Norddahl
4b4d7a0768
Add texturefrac bounds clamping to R_DrawMaskedColumn to avoid buffer overruns
2016-11-04 10:16:44 +01:00
Magnus Norddahl
b04118032e
Fix wrapping and scaling issue for the U texture coordinate for sprites
2016-11-04 10:15:57 +01:00
Magnus Norddahl
90ea379bac
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
2016-11-04 01:40:04 +01:00
Magnus Norddahl
12a1755edf
Move texture info to R_DrawMaskedColumn and add bounds checking
2016-11-04 01:39:53 +01:00
Rachael Alexanderson
e44f931a7e
Merge branch 'master' of https://github.com/coelckers/gzdoom
2016-11-03 20:31:07 -04:00
Christoph Oelckers
747b612860
Merge branch 'master' of https://github.com/rheit/zdoom
2016-11-03 19:42:03 +01:00
Christoph Oelckers
6ef5cdebb2
- slider fixes.
2016-11-03 19:41:51 +01:00
Magnus Norddahl
90c8b3370a
Fix mipmap sampling bug
2016-11-03 12:51:07 +01:00
Magnus Norddahl
356830a8c8
Add CPU misdetection workaround for the Pentium G840 and a llvm_cpu CVAR that can force codegen to a specific CPU architecture
2016-11-03 12:02:07 +01:00
Rachael Alexanderson
7cba67ad45
Merge branch 'master' of http://github.com/rheit/zdoom
2016-11-02 03:12:21 -04:00
Marisa Heit
f8641c0ffb
Fixed: MaxVisForFloor was broken by the switch to floats
...
- TODO: See if these visibility limits are even needed anymore.
2016-11-02 00:07:57 -05:00
Marisa Heit
3f32ccada6
Zero In2D before calling Flip()
...
- Fixes an assert when resizing the window in windowed mode. Flip() can call
V_OutputResized() in windowed mode.
2016-11-01 22:54:27 -05:00
Magnus Norddahl
1b7d21790d
Merge branch 'sprite_texcoord_fix' into qzdoom
2016-11-01 23:14:46 +01:00
Magnus Norddahl
5814270980
Fix wrapping and scaling issue for the U texture coordinate for sprites
2016-11-01 22:58:53 +01:00
Magnus Norddahl
477fb6d676
Added missing copyrights
2016-11-01 21:44:33 +01:00
Magnus Norddahl
1ccf190c4f
Merge remote-tracking branch 'zdoom/master' into qzdoom
2016-11-01 19:51:17 +01:00
nashmuhandes
578bf9b09c
Added "local" parameters to A_PlaySound and ACS PlaySound
2016-11-01 13:21:32 -04:00
Christoph Oelckers
f619e8ece1
- fixed numeric output precision for a few sliders.
2016-11-01 13:20:59 -04:00
Christoph Oelckers
48229837ed
- fixed: ACSStringPool::AddString did not check for NULL pointers as input. Let's just map them to the empty string, that's a lot better than crashing.
2016-11-01 13:20:58 -04:00
Christoph Oelckers
bfb8886e93
- fixed: RapidJSON in ASCII mode cannot handle extended 8 bit character sets and will produce broken data if the input contains some. This means we need to perform the conversion to UTF-8 on ZDoom's side and run RapidJSON in UTF-8 mode.
...
Daedalus triggers this with a 0x85 character which in Windows CP 1252 is the ellipsis (...) The converter will assume ISO-8859-1, though, but cannot do anything with these characters because they map to the font being used here.
2016-11-01 13:20:58 -04:00
nashmuhandes
b420347bab
Added "local" parameters to A_PlaySound and ACS PlaySound
2016-11-01 15:14:06 +01:00
Rachael Alexanderson
6755373f46
- fixed: map commands will now take capslock DM/COOP as arguments
2016-11-01 15:09:09 +01:00
Rachael Alexanderson
f72ebe6768
- Extended map, recordmap, and open commands to accept "dm/coop" as an extra parameter - to open maps in multiplayer mode with the requested ruleset.
2016-11-01 15:09:08 +01:00
Rachael Alexanderson
33637dda23
- fixed: map commands will now take capslock DM/COOP as arguments
2016-11-01 09:47:01 -04:00
Christoph Oelckers
6e0defdc69
- fixed numeric output precision for a few sliders.
2016-11-01 13:48:56 +01:00
Christoph Oelckers
3f57269a8b
- fixed: ACSStringPool::AddString did not check for NULL pointers as input. Let's just map them to the empty string, that's a lot better than crashing.
2016-11-01 13:36:33 +01:00