zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 16:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
10531 commits 86 branches 139 tags 124 MiB
Commit graph

10531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Oelckers
48d17f8fcb Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/r_data/sprites.cpp
 2016-12-08 21:06:35 +01:00
Christoph Oelckers
8a6d3b8e7b - sprites.cpp 2016-12-08 21:05:53 +01:00
Christoph Oelckers
3fbe41957d - removed GZDoom call. 2016-12-08 21:05:31 +01:00
Christoph Oelckers
6c628c9584 - changed sprite setup to work without global work variables. 2016-12-08 19:27:49 +01:00
Christoph Oelckers
ee09219c08 Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-08 19:08:25 +01:00
Christoph Oelckers
d46ceafd35 - fixed: A_Face* had the sign for the pitch inverted (In Doom, negative pitch is upward, this had positive pitch upward.) 2016-12-08 19:07:50 +01:00
Christoph Oelckers
14400c41b6 Merge branch 'zmaster' 2016-12-08 17:53:41 +01:00
Christoph Oelckers
a4d2468d34 - disable weapon interpolation for offset changes. 
This has been causing far too many problems so now it will only be done if a A_Weaponoffset is either used with WOF_ADD or WOF_INTERPOLATE.
 2016-12-08 17:52:59 +01:00
Christoph Oelckers
8f45664089 - fixed: Fog boundaries were not drawn on line portals. 
There's two restrictions, though:

* on one-sided-line portals fog boundaries will not be drawn.
* the filler sector behind the portal may not have a sky ceiling texture. This is because the drawing code contains several sky checks which get in the way here.
 2016-12-08 17:00:15 +01:00
Magnus Norddahl
fb4e34d178 Fix crash reporter for 64 bit 2016-12-08 14:36:17 +01:00
Rachael Alexanderson
dc07c2075f Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-12-08 07:47:33 -05:00
Magnus Norddahl
2854e1fe03 Fix crash reporter for 64 bit 
(cherry picked from commit 3a0de8b0c714507823edaa24875bc97b39c76ab6)
 2016-12-08 07:47:31 -05:00
Christoph Oelckers
715bdd69af Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-08 12:50:57 +01:00
Christoph Oelckers
3558b2234c - fixed: The dynamic light setup for walls did not portal-translate the light's coordinate. 
- changed ADynamicLight::CollectWithinRadius to work iteratively to avoid the high stack overhead of 64 bit code.
 2016-12-08 12:50:45 +01:00
Christoph Oelckers
d741e0eb26 - fixed: P_CheckSight returned incorrect results when having to traverse the collected lines just for adding more portals to the list. 2016-12-08 11:23:08 +01:00
alexey.lysiuk
3aac058022 Fixed loading of Hexen and Strife 
Names in sprite offsets files for these IWADs contain '[' and '\' characters and such names need to be quoted
 2016-12-08 12:07:12 +02:00
Magnus Norddahl
dc82c19901 Fix sprites/translucent stuff being occluded by portal walls 2016-12-08 10:35:51 +01:00
Magnus Norddahl
a1bb6e6b23 Only render line portals once 2016-12-08 10:29:52 +01:00
Christoph Oelckers
0720dd9816 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/p_map.cpp
 2016-12-08 10:17:12 +01:00
Christoph Oelckers
66d287ea81 - fixed: Stepping through a ceiling portal on a two-sided line did not work. 
- fixed: Stepping up an actor checked against the sector's own ceiling, even if it was a crossable portal.
 2016-12-08 10:16:22 +01:00
Rachael Alexanderson
40b68bfea0 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
 2016-12-07 23:12:42 -05:00
Christoph Oelckers
12f0b56036 - fixed: Stepping up through a portal did not work when the step line was two-sided. This special case was only implemented for one-sided lines 
- fixed: The portal collector set bad flags for collected lower portals.
 2016-12-08 00:59:04 +01:00
Christoph Oelckers
1e950d75bd - made dynamic light attenuation completely opt-in. This can be done either by setting a MAPINFO option for lights that do not automatically specify it and with a light property. The light property will always take precedence, if set. 2016-12-07 23:17:18 +01:00
Christoph Oelckers
aa939ef17a Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-12-07 22:53:06 +01:00
Christoph Oelckers
f547daccc8 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
 2016-12-07 22:51:05 +01:00
Rachael Alexanderson
d12b92e926 Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-07 16:49:44 -05:00
Rachael Alexanderson
b77927fa6d Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-12-07 16:49:42 -05:00
Magnus Norddahl
066158be69 Fix mirror 2016-12-07 22:26:18 +01:00
Magnus Norddahl
480b22c50e Add more checks for FTexture::TEX_Null 2016-12-07 18:59:48 +01:00
Christoph Oelckers
6adcba3c4b - fixed linkage for fuzzviewheight 
- fixed naming conflict with GCC's virtual table.
 2016-12-07 18:39:09 +01:00
Magnus Norddahl
9ed02a6aec Merge remote-tracking branch 'zdoom/master' into qzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/doomtype.h
#	src/r_drawt.cpp
 2016-12-07 18:35:27 +01:00
Magnus Norddahl
e3e90e1a08 Merge TC handling back into r_draw 2016-12-07 18:28:06 +01:00
Magnus Norddahl
beb70d7dfa Merge remote-tracking branch 'origin/zdoom_multithreaded' into qzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/r_3dfloors.cpp
#	src/r_bsp.cpp
#	src/r_bsp.h
#	src/r_draw.h
#	src/r_main.cpp
#	src/r_main.h
#	src/r_plane.cpp
#	src/r_plane.h
#	src/r_segs.cpp
#	src/r_segs.h
#	src/r_swrenderer.cpp
#	src/r_things.cpp
#	src/r_things.h
#	src/r_thread.cpp
#	src/r_thread.h
#	src/v_draw.cpp
#	src/win32/fb_d3d9.cpp
 2016-12-07 18:22:02 +01:00
Edoardo Prezioso
e4c208602d - Fixed GCC/Clang warning/error. 2016-12-07 16:07:25 +01:00
Christoph Oelckers
2677976cae - r_drawt.cpp is no longer needed. 2016-12-07 15:44:25 +01:00
Christoph Oelckers
a118903e3e - complete removal of assembly stuff. Nothing of this gets used anymore. 2016-12-07 14:41:21 +01:00
Christoph Oelckers
ed141943e1 - removed use of BestColor_MMX because there is no measurable improvement at all on a modern system. On top of that this function does not get called nearly often enough to justify the hassle. Like DoBlending this would require hundreds of calls per frame to make any impact that would be measurable. 2016-12-07 14:40:19 +01:00
Christoph Oelckers
5910067c44 - discontinue using the MMX assembly version of DoBlending. 
Some benchmarking shows that on SSE systems it only harms performance and compared to the intrinsics version the gains are too marginal for something this infrequently called.
Doing 100000 calls of DoBlending results in a 5 ms decrease of using assembly vs intrinsics on a 3.4 GHz Core i7, meaning that even on a computer that is 10x slower you can still do 1000 or so blends per frame without a speed hit.
 2016-12-07 14:40:18 +01:00
Rachael Alexanderson
2200f6eda3 - fixed: compile error with SDLGLVideo class macro 2016-12-07 13:21:28 +01:00
Christoph Oelckers
42346c58d3 - disabled assembly entirely to make the MT drawer submission compile. 
This still requires a review of the two non-drawer functions that get 'lost'.
 2016-12-07 12:31:43 +01:00
Christoph Oelckers
1e42c6f227 - added copyright headers to two files missing them. 2016-12-07 11:40:59 +01:00
Magnus Norddahl
3ff91807b8 Move swrenderer into a namespace, add multithreading framework, and move drawers to commands 2016-12-07 09:34:49 +01:00
Rachael Alexanderson
a544648957 Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/posix/sdl/sdlglvideo.cpp
 2016-12-06 19:56:06 -05:00
Christoph Oelckers
56f67726f0 - seems a Linux file was missed when refactoring the IMPLEMENT_CLASS macros. 2016-12-07 00:54:40 +01:00
Rachael Alexanderson
c04e0d0df3 - fixed: Whoops. One of those danged macros got away. ;) 2016-12-06 18:44:59 -05:00
Rachael Alexanderson
8a23befd4d - Fixed abstract class macro in SDLGLFB class. 2016-12-06 18:22:36 -05:00
Rachael Alexanderson
a78b713f4b Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/v_video.cpp
 2016-12-06 18:19:08 -05:00
Rachael Alexanderson
3fd4d00a77 - 1.2pre tag 2016-12-06 18:13:41 -05:00
Christoph Oelckers
6271ecf2af Merge remote-tracking branch 'remotes/zdoom/master' 2016-12-06 22:47:53 +01:00
Christoph Oelckers
c3fb43db3a Merge branch 'gz-zscript' 2016-12-06 22:47:37 +01:00