zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-16 07:32:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
9440 commits 132 branches 149 tags 204 MiB
Commit graph

8550 commits

Author SHA1 Message Date
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
raa-eruanna
cfb985ceb3 Merge http://github.com/rheit/zdoom 2016-10-15 07:58:16 -04:00
Christoph Oelckers
162da2fcaf - allow to specify "none" to set an actor's translation to the identity table. 2016-10-15 10:51:48 +02:00
raa-eruanna
a61f76dc89 Merge http://github.com/rheit/zdoom 2016-10-14 18:16:55 -04:00
raa-eruanna
6608678ad8 - Fullbright sprites and decals now defy sector colormaps as they do in GZDoom. This is controlled by the setting "r_fullbrightignoresectorcolor". 2016-10-14 18:11:49 -04:00
Christoph Oelckers
2e882a41a3 - removed some redundancy. 2016-10-14 23:13:08 +02:00
FishyClockwork
08504dcbe2 Added a small check just in case... 2016-10-14 23:11:58 +02:00
FishyClockwork
ecffd0bea6 Done the code changes. 
This time only nulls I've added are nullptrs
 2016-10-14 23:11:57 +02:00
alexey.lysiuk
0370592422 Fixed serialization of DSeqPolyNode class objects 
Polyobject pointer was not serialized at all
 2016-10-14 23:05:02 +02:00
Magnus Norddahl
36aff68501 Fix divide by zero if yscale is too small a number 2016-10-14 23:02:16 +02:00
Magnus Norddahl
657abb374b Fix SkyViewpoint skyboxes not being rendered 2016-10-14 23:01:10 +02:00
raa-eruanna
00b9528e5f Merge branch 'yscale_dividebyzero_fix' of http://github.com/dpjudas/dpdoom 2016-10-14 11:52:25 -04:00
raa-eruanna
b54b4f2786 Merge http://github.com/coelckers/gzdoom 2016-10-14 11:50:06 -04:00
alexey.lysiuk
c3ced5842a Added multithreaded upscaling with xBRZ (macOS only) 2016-10-14 17:14:49 +03:00
alexey.lysiuk
58d44e89c9 Use single helper for xBRZ scalers 2016-10-14 17:03:26 +03:00
Magnus Norddahl
2a4a61d4d0 Fix divide by zero if yscale is too small a number 2016-10-14 15:23:23 +02:00
raa-eruanna
71e5ccc4da Merge branch 'skyviewportfix' of http://github.com/dpjudas/dpdoom 2016-10-14 07:37:22 -04:00
raa-eruanna
b236dd9dc1 Merge http://github.com/rheit/zdoom 2016-10-14 07:34:30 -04:00
alexey.lysiuk
d6b3cbe0c9 Fixed serialization of MovePoly class objects 
See http://forum.zdoom.org/viewtopic.php?t=53787
Removed "speed" field which is serialized in the parent class
 2016-10-14 14:33:13 +03:00
Magnus Norddahl
f82195bc49 Switch to true color for translated sprites 2016-10-14 12:10:11 +02:00
Magnus Norddahl
f05e2337c2 Fix SkyViewpoint skyboxes not being rendered 2016-10-14 11:24:03 +02:00
Magnus Norddahl
366d494b18 Merged R_DrawMaskedColumnHoriz into R_DrawMaskedColumn 2016-10-14 08:33:59 +02:00
Marisa Heit
97107b6b6d Update lempar.c to 2016-10-04 version 
- Every update rolled into one, because I'm pretty sure I missed some while
updating lemon.c (not counting today's commits), since it wasn't always
updated at the same time as lemon.c.
- In particular, I think this check-in from 2016-06-06 was very important to
  us after commit 3d5867d29e (For the
  Lemon-generated parser, add a new action type SHIFTREDUCE and use it to
  further compress the parser tables and improve parser performance.):
  * Fix lempar.c so that the shift-reduce optimization works for error
    processing.
 2016-10-13 22:30:12 -05:00
Magnus Norddahl
2a0ab96341 Merge remote-tracking branch 'origin/ssao' into qzdoom 2016-10-13 18:12:56 +02:00
Magnus Norddahl
660a45a0e0 Add normals to decals 2016-10-13 18:04:00 +02:00
Magnus Norddahl
6caa53529f Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-10-13 11:17:00 +02:00
Magnus Norddahl
d1d443497f Fix weird access violation in some of the drawers 2016-10-13 11:16:51 +02:00
raa-eruanna
3a13394661 - Changed max sky buffer to 3072 from 2048 2016-10-13 02:47:07 -04:00
raa-eruanna
5d08a81240 - fixed: compiler warning with bad copy-paste 
- fixed: speed up sky compositing in truecolor mode with large buffers - only the last 4 buffers used are checked.
 2016-10-13 02:37:38 -04:00
raa-eruanna
d96ec6c311 - Expand truecolor sky buffer from 4 columns to 2048 columns. 2048 is probably the max we'll ever need, even with 4k, 8k, or higher resolutions, since the algorithm checks for repeat columns. 2016-10-13 02:12:48 -04:00
raa-eruanna
e01cdf6946 Merge http://github.com/rheit/zdoom 2016-10-12 18:20:44 -04:00
raa-eruanna
fbbdd403f1 - Implemented r_linearsky for dual-layer skies 2016-10-12 14:37:57 -04:00
Magnus Norddahl
b5b96ee222 Add a little bit more debug information 2016-10-12 13:49:12 +02:00
Magnus Norddahl
27b432a930 Improve crash handling in drawers 2016-10-12 13:25:05 +02:00
Christoph Oelckers
6f92efc72c - renamed thingdef_codeptr.cpp and moved it out of thingdef/. 
Ultimately, thingdef should only contain code that is directly related to the DECORATE parser, but that's not the case with this file. It's only function definitions which get used during gameplay and will also be accessed by ZScript.
The change is intentionally on master so that pull requests can adjust to it now instead of creating conflicts later.
 2016-10-12 12:43:26 +02:00
raa-eruanna
15c08f73d5 Merge http://github.com/coelckers/gzdoom 2016-10-12 03:15:03 -04:00
Christoph Oelckers
a4a00435e2 Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-12 08:42:37 +02:00
Magnus Norddahl
3146f75ae0 Merge remote-tracking branch 'origin/gl_swframebuffer' into qzdoom 2016-10-12 08:05:39 +02:00
Magnus Norddahl
c5ebfd9e65 Add vid_max_width and vid_max_height 2016-10-12 08:05:31 +02:00
Magnus Norddahl
052f7900c2 Fix swapped x and y in DrawLetterbox 2016-10-12 08:04:42 +02:00
Magnus Norddahl
403b3e2319 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-10-12 07:39:20 +02:00
Magnus Norddahl
77a566a57e Merge remote-tracking branch 'origin/gl_swframebuffer' into qzdoom 2016-10-12 07:38:56 +02:00
Magnus Norddahl
698b05ee69 Fix pixel center and letter box issues 2016-10-12 07:34:07 +02:00
Major Cooke
41bf9def80 GZDoom compatibility for PSPF_FLIP. 2016-10-11 20:18:06 -05:00
Major Cooke
3de83b8943 Added PSPF_FLIP. 
Flips the overlay on the X axis.
 2016-10-11 17:20:58 -05:00
raa-eruanna
49745e133d Merge http://github.com/rheit/zdoom 2016-10-11 17:43:27 -04:00
raa-eruanna
5e458866bc - Added CVAR handling for vid_used3d - allows to switch software mode canvas between OpenGL and Direct3D upon restart. 2016-10-11 17:10:54 -04:00
Major Cooke
5dc94a10c3 Added A_SetInventory. 
- Sets the absolute amount of an inventory actor.
- Limits itself to the range [0, MaxAmount]. Setting beyondMax to true disregards the MaxAmount. Default is false.
 2016-10-11 14:44:31 -05:00
raa-eruanna
289e76cce7 Merge http://github.com/rheit/zdoom 2016-10-11 10:38:05 -04:00
raa-eruanna
b724de6ee3 Merge http://github.com/coelckers/gzdoom 2016-10-11 10:38:02 -04:00
Magnus Norddahl
f37ee3a024 Add bgra support to OpenGLSWFrameBuffer 2016-10-11 15:43:12 +02:00
Magnus Norddahl
f5c069c759 Merge remote-tracking branch 'origin/gl_swframebuffer' into qzdoom 2016-10-11 14:54:18 +02:00
Christoph Oelckers
bdbc7c3fb7 - removed CreateDamageFunction, because it's no longer needed for defining a 'damage' constant. 2016-10-11 14:43:17 +02:00
Magnus Norddahl
3c7d6234cb Add wipes 2016-10-11 14:37:57 +02:00
alexey.lysiuk
7510ad1635 Fixed missing fake floors in deferred buffer mode 
wow.wad is now genuine and authentic...
 2016-10-11 14:56:22 +03:00
Magnus Norddahl
7911302ad8 Hook in gamma shader 2016-10-11 13:09:32 +02:00
Magnus Norddahl
01dc9de8d1 Misc bug fixes and performance improvements 2016-10-11 10:27:18 +02:00
Christoph Oelckers
dde25820e2 - fixed winding of voxel polygons. 2016-10-11 09:08:31 +02:00
raa-eruanna
1ea533add5 Merge http://github.com/rheit/zdoom 2016-10-11 02:27:55 -04:00
Christoph Oelckers
084bf8c576 - fixed: VisibleAngle and VisiblePitch actor properties require both parameters to be present, but the second one was set to optional. 2016-10-11 00:23:50 +02:00
Magnus Norddahl
682b040b97 OpenGL based software renderer hardware accel now works for most things 2016-10-11 00:03:46 +02:00
Magnus Norddahl
f4308b3184 Add glsl shader version of the d3d9 shaders and get enough of it working for it to boot without errors 2016-10-10 21:03:55 +02:00
raa-eruanna
2a7b902a0a Merge http://github.com/coelckers/gzdoom 
# Conflicts:
#	src/gl/renderer/gl_renderer.cpp
 2016-10-10 10:39:07 -04:00
Christoph Oelckers
14a6e7989b Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/menudef.txt
 2016-10-10 11:38:08 +02:00
Major Cooke
31ca5a1900 Added OverlayX/Y(int layer) 
- Retrieves the X/Y positions of an overlay.
- A_OverlayFlags and A_OverlayOffset now interpret a layer of 0 to mean 'use this calling layer'.
 2016-10-10 10:48:50 +02:00
alexey.lysiuk
a771a3edd4 Fixed potential crash caused by A_Warp() 
ACSF_Warp case was refactored to express its intention clearly
http://forum.zdoom.org/viewtopic.php?f=2&t=53734
 2016-10-10 10:47:43 +02:00
Magnus Norddahl
40df46f94e Implement OpenGL versions of GPU objects 2016-10-10 07:39:02 +02:00
raa-eruanna
1fab0cc514 - Added: PlayerPawn property "Player.ViewBob" which acts as a MoveBob/StillBob multiplier. 2016-10-10 01:35:47 -04:00
Christopher Bruns
779e6acb7b Create "final" two non-VR 3D modes: Column-interleaved and checkerboard. 2016-10-09 13:05:50 -04:00
Magnus Norddahl
5f0088ab8b Created new OpenGL framebuffer using the software renderer's hardware acceleration 2016-10-09 12:50:57 +02:00
Magnus Norddahl
94d8e10f96 Merge branch 'ssao' into qzdoom 2016-10-09 06:27:42 +02:00
Magnus Norddahl
1b7c42f45f Multisampling ssao bug fixes and split linear depth to its own buffer 2016-10-09 06:17:48 +02:00
alexey.lysiuk
9a72ef1bf1 Added detection of current macOS version 2016-10-08 15:47:16 +03:00
Magnus Norddahl
fc07a25306 Add aliasing meta data to loads and stores 2016-10-08 09:29:26 +02:00
Magnus Norddahl
0b0ee2e3c2 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-10-08 06:50:42 +02:00
Magnus Norddahl
b3be0d22cc Unroll loops by 8 and enable some additional passes 2016-10-08 06:50:33 +02:00
raa-eruanna
f5681cf42f Merge http://github.com/rheit/zdoom 2016-10-08 00:31:54 -04:00
Magnus Norddahl
606b7f5a00 Run module level LLVM optimization passes before calling finalizeObject 2016-10-08 04:59:24 +02:00
Christoph Oelckers
d819aafcf3 - changed handling of duplicate classes in DECORATE. 
Instead of replacing the original, the second class will get renamed now, using the originating file as an identifier. In the vast majority of cases this should do exactly what is needed: Create an unconflicting second class that can coexist with the original. Unless the class is used by name this should eliminate all problems with this, but so far I haven't seen anything that used them by name.

This is choosing the lesser of two evils. While some mod out there may get broken, the old setup meant that the first class of a given name could not be written out to a savegame because it was not retrievable when loading it back.
 2016-10-07 15:28:25 +02:00