raa-eruanna
a4393d352f
Merge http://github.com/rheit/zdoom
2016-10-20 03:30:51 -04:00
Christoph Oelckers
19d070c9bd
- fixed: averageColor swapped red and blue.
...
- renamed some stuff
2016-10-20 09:08:07 +02:00
Magnus Norddahl
aa199a91c5
Merge remote-tracking branch 'origin/capsky' into qzdoom
...
# Conflicts:
# src/r_plane.cpp
# src/r_sky.cpp
# wadsrc/static/language.enu
# wadsrc/static/menudef.txt
2016-10-20 01:05:05 +02:00
Magnus Norddahl
2fe545a4fd
Merge r_stretchsky and r_capsky into r_skymode
2016-10-20 00:59:51 +02:00
Magnus Norddahl
0888fc0cde
Merge remote-tracking branch 'origin/capsky' into qzdoom
2016-10-20 00:13:58 +02:00
Magnus Norddahl
5de8112578
Add support for capping sky with a solid color
2016-10-19 23:52:09 +02:00
Magnus Norddahl
4ccb69fa61
Palette version of sky drawers
2016-10-19 23:21:09 +02:00
Magnus Norddahl
d5865a46a0
Move triangle drawer into a command and change the sky code to use it if r_cubesky is enabled
2016-10-19 17:44:50 +02:00
Magnus Norddahl
ea72152c31
Add doom style column clipping to triangle drawer
2016-10-19 15:43:10 +02:00
Magnus Norddahl
6a7bb43ce1
Fix clipping bug
2016-10-19 14:32:28 +02:00
Magnus Norddahl
ef70ba0985
More triangle rendering
2016-10-19 03:49:42 +02:00
raa-eruanna
68efdf5cef
- Fixed: Added linker flags for Linux to prevent crashes using LLVM. Using fix found by dpJudas.
2016-10-18 18:21:22 -04:00
raa-eruanna
226287875b
Creating 0.2pre tag
2016-10-18 14:07:44 -04:00
Magnus Norddahl
694cae054c
Add some experimental draw triangle code
2016-10-18 18:23:56 +02:00
raa-eruanna
79b14bbc08
- Updated version.h for beta tag
2016-10-18 11:38:35 -04:00
raa-eruanna
7df28f14a3
Merge http://github.com/rheit/zdoom
2016-10-18 11:34:12 -04:00
Marisa Heit
d2a9f7ac6f
Fix Raise definition for DoomImp
2016-10-17 21:45:06 -05:00
Magnus Norddahl
49b4860426
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
2016-10-18 01:16:45 +02:00
Magnus Norddahl
df3f5ae882
Use OpenGL to allocate the canvas buffer to avoid a costly memcpy
2016-10-18 01:16:36 +02:00
raa-eruanna
f32a2547bc
- Fixed LLVM compile for LLVM 3.8 (Ubuntu)
2016-10-17 16:05:14 -04:00
raa-eruanna
cd21d017fb
Merge remote-tracking branch 'remotes/origin/decorate-viewbob'
2016-10-17 09:04:37 -04:00
Magnus Norddahl
af937366d1
Added DetectRangeError function
2016-10-17 12:36:01 +02:00
Magnus Norddahl
c9a9e93c66
Fix warning C4805: '!=': unsafe mix of type 'bool' and type 'int' in operation
2016-10-17 11:54:03 +02:00
raa-eruanna
931d241056
- Change "vid_used3d" to true by default, in Windows.
2016-10-17 01:13:58 -04:00
raa-eruanna
4ec2db43a4
Merge http://github.com/rheit/zdoom
2016-10-17 01:13:16 -04:00
Braden Obrzut
b4bdb8fa7d
- Fixed: Assertion failure if a save was loaded without starting a new game (due to uninitialized RNG).
2016-10-17 00:22:06 -04:00
Braden Obrzut
741c9edf42
- Clear out GCC 6.2 warnings (interestingly they now check for misleading indentation which found a good case in fragglescript/t_func.cpp even though I believe it was harmless)
2016-10-17 00:19:08 -04:00
Magnus Norddahl
f8f710d9e2
Fix linker errors on Windows
2016-10-17 01:17:48 +02:00
Magnus Norddahl
c706d5465a
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
2016-10-17 00:20:31 +02:00
Magnus Norddahl
d654301bc2
macOS compile fixes and support for slightly older versions of LLVM (to allow Mac users to brew install llvm)
2016-10-17 00:19:07 +02:00
raa-eruanna
963e33b49b
Merge http://github.com/rheit/zdoom
2016-10-16 18:02:20 -04:00
Magnus Norddahl
dfed525e18
macOS warnings and build fix
2016-10-16 23:18:56 +02:00
Magnus Norddahl
8b297221fe
Merge branch 'gl_swframebuffer' into qzdoom
2016-10-16 23:18:16 +02:00
Magnus Norddahl
f81d0d3964
macOS support and Intel driver bug fixes
2016-10-16 22:40:08 +02:00
Braden Obrzut
9dd42be15f
- Fixed: Demo playback on Windows XP since we don't patch fstat for v140_xp bug.
2016-10-16 16:22:21 -04:00
Magnus Norddahl
2534e80a19
Fix vid_hw2d 0 rendering glitch
2016-10-16 16:14:54 +02:00
Magnus Norddahl
49e890f212
Fix hexen sky cap offset
2016-10-16 15:48:34 +02:00
Magnus Norddahl
204c037017
Fix blending modes
2016-10-16 15:41:47 +02:00
Magnus Norddahl
42138a6ab9
Fix hexen sky stretching
2016-10-16 13:08:52 +02:00
Magnus Norddahl
73f3ff9cd4
Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom
2016-10-16 13:08:14 +02:00
Magnus Norddahl
1711f13eeb
Fix off-by-one bug
2016-10-16 13:08:06 +02:00
raa-eruanna
135c861247
Merge http://github.com/coelckers/gzdoom
2016-10-16 04:02:34 -04:00
Christoph Oelckers
6a6263a614
Merge branch 'master' of https://github.com/coelckers/gzdoom
2016-10-16 09:13:19 +02:00
Christoph Oelckers
59576e6d23
- use the newly added OF_Transient flag to avoid writing out the owned dynamic lights to savegames instead of destroying and recreating them each time.
2016-10-16 09:12:43 +02:00
Christoph Oelckers
b03489a43c
Merge branch 'master' of https://github.com/rheit/zdoom
2016-10-16 08:51:13 +02:00
Marisa Heit
e4281454ce
Split ANIMATED into three parts, filtered by game that uses them
...
- ANIMATED contained definitions for Doom, Heretic, and Strife, all
crammed into a single file. This meant that animations from one game
could erroneously make their way into maps for another game that
provided custom textures with names that matched textures that animated
in the other game. There are now three separate ANIMATED lumps with only
the animations defined for the original game and no others. The one
that gets loaded depends on the game being played.
- Added documentation for the ANIMATED file format to the comment for
FTextureManager::InitAnimated(), since I had to figure it out from the
code.
2016-10-15 21:40:24 -05:00
Marisa Heit
ae14993ba4
Fixed: Possible invalid processing for Crash states that immediately destroy the actor
...
- Setting an actor's Crash state has the potential to destroy the actor if
the Crash state has one or more 0-tic states that end with Stop. This
was not taken into account when the object's Z velocity was 0, but it
was under the floor anyway.
2016-10-15 21:14:34 -05:00
Marisa Heit
58ec0e4594
Add OF_Transient flag for objects that shouldn't be written to disk
2016-10-15 20:57:56 -05:00
Magnus Norddahl
b3e4ba13ba
Use GetSkyCapColor to pick the sky solid color
2016-10-15 21:53:45 +02:00
Magnus Norddahl
491a4e28c0
Move true color sky drawing to its own drawers and chamge r_stretchsky to false as the new drawers can fade to a solid color
2016-10-15 15:04:14 +02:00