zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,754 Commits 86 Branches 139 Tags 124 MiB
Commit Graph

10754 Commits

Author SHA1 Message Date
Edoardo Prezioso 287fc513a2 - Game-Music-Emu: Merge and change commits 9bb5ad7, bc0a473 and 2018c1b. 
Commit titles:
9bb5ad7 - 'Add filename param to demo app.'
bc0a473 - 'Allow building a static library (-DLIBTYPE=STATIC)'
2018c1b - 'Merged in lachs0r/game-music-emu (pull request #1)'

Change: ZDoom doesn't need the shared library, so disable it always.
 2016-12-18 11:52:24 +01:00
Edoardo Prezioso 05e77303bf - Game-Music-Emu: Merge commit 12b50ee. 
Commit title: Honor LIB_SUFFIX with pkg-config metadata.
 2016-12-18 11:52:24 +01:00
Edoardo Prezioso f239c0ea05 - Game-Music-Emu: Merge commit 6e1544d. 
Commit title: 'Fix undefined left-shift of signed int.'
 2016-12-18 11:52:23 +01:00
Edoardo Prezioso 8895716e27 - Game-Music-Emu: Merge commit cf7bfd2. 
Commit title: 'added gme_tell_samples() and gme_seek_samples()'
 2016-12-18 11:52:23 +01:00
Edoardo Prezioso e1af7e3f8c - Game-Music-Emu: reduce code delta with original source. 
This will help with the next Game-Music-Emu upgrades.
 2016-12-18 11:52:22 +01:00
Rachael Alexanderson 9fbd9985c8 - more work on rgb666 2016-12-18 05:33:39 -05:00
Rachael Alexanderson 6235b12cfc - No matter how many drawers you have, you have more drawers to do. 2016-12-17 21:26:08 -05:00
Magnus Norddahl fc54f6746a Merge remote-tracking branch 'origin/setcolormaplight' into qzdoom 
# Conflicts:
#	src/r_draw.cpp
#	src/r_draw.h
#	src/r_main.h
#	src/r_plane.cpp
#	src/r_things.cpp
#	src/v_draw.cpp
 2016-12-17 23:10:32 +01:00
Magnus Norddahl bb3fa15bed Removed leftovers from QZDoom 2016-12-17 22:57:57 +01:00
Magnus Norddahl 1ec06463d9 - Set colormap light info using R_SetColorMapLight and R_SetDSColorMapLight rather than manually calculating it 
- Move texture and span management into R_DrawMaskedColumn
 2016-12-17 22:34:36 +01:00
Christoph Oelckers 98e549246d Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-17 17:39:57 +01:00
Rachael Alexanderson 179c7dba83 - Yeah, it's time to take a break. Have fun with this! :D 2016-12-17 10:25:35 -05:00
Rachael Alexanderson 2ba402dc74 - Implementing RGB666 colormatching to replace less precise RGB555 in some parts of the code. 2016-12-17 04:31:47 -05:00
Magnus Norddahl d5d6bcc0fa Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-12-17 04:24:39 +01:00
Magnus Norddahl afe5d0fcdc Simplify light calculation slightly 2016-12-17 04:24:28 +01:00
Rachael Alexanderson 4e86af5428 Merge https://github.com/rheit/zdoom 2016-12-16 22:00:42 -05:00
Magnus Norddahl ddb18d8e32 Add dynamic colormaps support 2016-12-17 02:10:52 +01:00
Magnus Norddahl 6e8174d9b4 More psprite stuff 2016-12-16 23:02:34 +01:00
Edoardo Prezioso 14c282da30 - Upgrade bzip2 to version 1.0.6. 
Includes a fix for CVE-2010-0405.
 2016-12-16 22:58:25 +01:00
Magnus Norddahl ecebeed296 Fix player sprites disappearing when a texture camera is visible 2016-12-16 22:16:24 +01:00
Magnus Norddahl d5a4d50970 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-12-16 20:53:04 +01:00
Magnus Norddahl b5f3f63b93 Minor bug fixes 2016-12-16 20:52:56 +01:00
Rachael Alexanderson 7c1744a565 Merge https://github.com/rheit/zdoom 2016-12-16 14:39:07 -05:00
Magnus Norddahl e1a8749586 Wrong type 2016-12-16 19:28:25 +01:00
Magnus Norddahl 9302b3b8bf Fix 64 bit building 2016-12-16 19:09:17 +01:00
Edoardo Prezioso 7aaa03d3e0 - Import GME fix to critical security bug. 
Details at the following link: https://scarybeastsecurity.blogspot.com/2016/12/redux-compromising-linux-using-snes.html .
 2016-12-16 17:00:36 +01:00
Magnus Norddahl a360a1963f Move setup triangle stuff to its own file 2016-12-16 15:25:03 +01:00
Rachael Alexanderson ace380d5fc Merge https://github.com/rheit/zdoom 2016-12-16 06:39:16 -05:00
Christoph Oelckers 7ca5851f78 - fixed a second spot in RapidJSON where a bad NaN check was done. 2016-12-16 08:05:29 +01:00
Magnus Norddahl 6d295a25c2 Minor tweaking 2016-12-16 06:21:17 +01:00
Magnus Norddahl 9b98c4d512 Fix out of bounds bug 2016-12-16 05:01:49 +01:00
Rachael Alexanderson 0b4fd6c766 Merge https://github.com/rheit/zdoom 2016-12-15 20:07:10 -05:00
Magnus Norddahl adb65ce72a Remove TriDrawVariant 2016-12-16 00:35:45 +01:00
Christoph Oelckers 9ef551b84a - fixed: Start items for players were never actually checked for their type and could cause crashes if non-inventories were given. 2016-12-16 00:28:16 +01:00
Magnus Norddahl 99435f5018 Remove TriDrawVariant from LLVM codegen 2016-12-15 23:29:31 +01:00
Rachael Alexanderson 8fede44c3d - fixed: Some RenderStyles would crash ZDoom. 2016-12-15 18:55:20 +01:00
Rachael Alexanderson e556fb16bd Merge https://github.com/rheit/zdoom 2016-12-15 03:42:58 -05:00
Magnus Norddahl c3cb9d20fb Fix uncleared buffer when upscaling the cursor 2016-12-15 09:30:45 +01:00
Magnus Norddahl 823dc6ea00 Clamp RGB values in pal mode 2016-12-15 02:39:55 +01:00
Magnus Norddahl c643238b86 Rewrote the LLVM triangle drawer to use the data from the triangle setup function 2016-12-15 01:33:26 +01:00
Magnus Norddahl 145c0a6d9e Prepare triangle setup to be used by LLVM drawers 2016-12-13 19:26:13 +01:00
Magnus Norddahl be357e1c98 Triangle setup function for subsector based drawing 2016-12-13 12:57:04 +01:00
Rachael Alexanderson dfc43bcb83 Merge https://github.com/rheit/zdoom 2016-12-12 20:22:55 -05:00
Magnus Norddahl c1e2c25907 Stencil close 2016-12-13 02:13:48 +01:00
Magnus Norddahl 022368d349 Stencil write 2016-12-13 00:55:29 +01:00
Magnus Norddahl 5277d4ae28 Diminishing light test 2016-12-12 22:42:42 +01:00
Magnus Norddahl 9cfee05102 Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom 2016-12-12 21:34:29 +01:00
Magnus Norddahl afb946d586 Added texturing 2016-12-12 21:34:22 +01:00
Rachael Alexanderson 5e171824ac - "myinfo" - executes info on oneself 
- "targetinv" - executes "printinv" at current crosshair target
 2016-12-12 15:22:56 +01:00
Rachael Alexanderson b50ff986a6 Merge https://github.com/rheit/zdoom 2016-12-12 08:26:19 -05:00