zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-26 05:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
10818 commits 86 branches 139 tags 124 MiB
Commit graph

10818 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Christoph Oelckers
52645afb4b - for the time being, make ZScript command line switch locked so that everybody understands that it's not ready for use in released mods yet. 2016-12-06 22:42:10 +01:00
Magnus Norddahl
0083c3c5f0 Fix some typos 2016-12-06 21:41:41 +01:00
Rachael Alexanderson
af330e1c41 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-12-06 13:55:46 -05:00
Magnus Norddahl
7441521a96 Remove comment about Build code as it is no longer correct (there's no build code left in that file) 2016-12-06 19:44:56 +01:00
Magnus Norddahl
30ddcfbc8f Add tilted plane drawer 2016-12-06 19:44:28 +01:00
Christoph Oelckers
a3ae05299b - fixed: glPolygonOffset was not called for flat sprites. 2016-12-06 19:17:02 +01:00
Magnus Norddahl
bec5d39ca8 ColoredSpan and FogBoundary drawers 2016-12-06 18:58:39 +01:00
Christoph Oelckers
c115c0a5b2 - fixed: Random flicker lights must set up their size on the first tic they are run. If not they will keep the radius of the previous effect which may be too large. 2016-12-06 18:35:34 +01:00
Magnus Norddahl
d8f805ddc9 Added DrawSlabPalCommand and rewrote the actual for loop so nobody can say it came from build.. 2016-12-06 18:31:26 +01:00
Magnus Norddahl
6054db0d86 Make puzzy pinky fuzzywuzzy about threads 2016-12-06 15:29:04 +01:00
Magnus Norddahl
c16506bf59 Add thread awareness to the rt family of drawers 2016-12-06 15:13:43 +01:00
Christoph Oelckers
d04c37101e Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-12-06 12:59:03 +01:00
Christoph Oelckers
17698467d7 - made application of dynamic lights to additively blended surfaces a MAPINFO option. In most cases this is not wanted but sometimes this can be used to good effect so it should be there as an option. 2016-12-06 12:58:45 +01:00
Christoph Oelckers
fb7b49bba1 Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-06 12:35:22 +01:00
Christoph Oelckers
e41e404143 Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript 2016-12-06 12:33:52 +01:00
Christoph Oelckers
b2d1b0d7a6 - fixed: FTranslatedLineTarget::angleFromSource returned the attack angle, not the angle between actors when returned from P_LineAttack. 
For most attack functions this is wrong, it's only the Hexen fighter attack needing this particular value, so it has been split up into two return values now.
 2016-12-06 11:04:54 +01:00
Magnus Norddahl
6a3ae2ce45 Add Rt drawers 2016-12-06 07:23:55 +01:00
Magnus Norddahl
f4172782ed Fix compile error in debug builds 2016-12-06 06:22:58 +01:00