zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-29 23:23:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
10569 commits 2 branches 66 tags 53 MiB
Commit graph

10569 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rachael Alexanderson
8a1ac909b4 Merge https://github.com/rheit/zdoom 2016-12-20 06:57:53 -05:00
alexey.lysiuk
9f6d8d2ba7 Set goal values in decal stretcher to zeros even if they are not used 
See https://forum.zdoom.org/viewtopic.php?t=54592
 2016-12-20 12:19:12 +01:00
alexey.lysiuk
a0595f17e8 Serializer now writes floating point zero if special value is encountered 
See https://forum.zdoom.org/viewtopic.php?t=54592
 2016-12-20 12:19:12 +01:00
Magnus Norddahl
452e0dcfc9 Merge remote-tracking branch 'zdoom/master' into qzdoom 
# Conflicts:
#	src/r_draw.cpp
#	src/r_draw.h
#	src/r_plane.cpp
 2016-12-20 02:10:10 +01:00
Magnus Norddahl
2676ca1284 Rename wall drawer args and functions to closer match the general naming convention 2016-12-19 21:39:16 +01:00
Rachael Alexanderson
5ffee5231f - Hooking the new RGB256k drawer to triangle drawer in place of RGB32k. 2016-12-19 11:35:43 -05:00
Rachael Alexanderson
978152f483 Merge https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/compatibility.txt
 2016-12-19 08:16:41 -05:00
Rachael Alexanderson
5d85990d5f - Implementing RGB666-to-Palette colormatching for textures. 2016-12-19 13:46:08 +01:00
alexey.lysiuk
f6b0f2648c Cleared staircase to secret area in Ultimate Doom E4M3 
Only the final room with goodies is marked as secret
 2016-12-19 12:18:43 +01:00
alexey.lysiuk
28a23d4ff3 Removed unreachable secrets from Doom IWADs 
See https://forum.zdoom.org/viewtopic.php?t=54632
 2016-12-19 12:18:43 +01:00
alexey.lysiuk
94f7bef2ff Added compatibility parameter to set sector special 2016-12-19 12:18:43 +01:00
Rachael Alexanderson
a4944067e8 - fixed: whoops, fixed quite a merge faux pas there. 2016-12-18 20:57:27 -05:00
Rachael Alexanderson
bedf4bccea Merge commit '1fa37aaeb79d3ab1e5d4aa2b4376130e9f4826fb' 2016-12-18 20:55:45 -05:00
Rachael Alexanderson
134825a8c8 Merge commit '2fea46a719b2084bde7d9e9e37f9a26a5a59c1ab' 2016-12-18 20:55:00 -05:00
Rachael Alexanderson
d2bd65981d Merge commit '9ac7a07be68419c20cfb8e97d50c253aa7a1bb6e' 
# 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-18 20:51:34 -05:00
Rachael Alexanderson
8253e5d393 Merge commit '88942dcc688f8da616279d0516b0e8c24e9cfc4b' 2016-12-18 20:40:48 -05:00
Christoph Oelckers
1fa37aaeb7 - fixed code generation for if statements with empty 'true' part. For those the jump statement backpatching was not done correctly. 2016-12-18 14:09:16 +01:00
Christoph Oelckers
8dd91f7129 - added a missing null pointer check to FxIfStatement::Emit. 2016-12-18 12:18:03 +01:00
Major Cooke
1bcebb091a Added option to check the location for resizing, changing the return into a bool. 2016-12-18 11:59:24 +01:00
Major Cooke
3023af8223 - Added A_SetSize(double newradius, double newheight = -1). 
- Changes the calling actor's radius and height.
 2016-12-18 11:59:24 +01:00
Magnus Norddahl
2fea46a719 Removed leftovers from QZDoom 2016-12-18 11:58:32 +01:00
Magnus Norddahl
9ac7a07be6 - 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-18 11:58:32 +01:00
Edoardo Prezioso
88942dcc68 - Game-Music-Emu: Merge commits 87b322b and d48c1c8. 
Commit titles:
87b322b - 'Properly clamp SPC CPU registers and temporaries.'
d48c1c8 - 'Complete bumping version to 0.6.1.'

This completes the code upgrade to GME 0.6.1.
 2016-12-18 11:52:26 +01:00
Edoardo Prezioso
b515a034f6 - Game-Music-Emu: Merge commits dfffd2b and 2cbb70f. 
Commit titles:
dfffd2b - 'Hide the GCC visibility option to non-GCC compilers.'
2cbb70f - 'Merged in edward_san/game-music-emu (pull request #3)'
 2016-12-18 11:52:25 +01:00
Edoardo Prezioso
dd92587841 - Game-Music-Emu: Merge commit bf60977. 
Commit title: 'Fix compile failures with zlib support enabled.'
 2016-12-18 11:52:25 +01:00
Edoardo Prezioso
3d3bc8e40e - Game-Music-Emu: Merge commits b1948ac, 8af6ba4, eb5f592 and 56d43f4. 
Commit titles:
b1948ac - 'Describe CMake addition for static libs in changelog.'
8af6ba4 - 'Bump version in CMakeLists as well.'
eb5f592 - 'Update readme for repo move and next version.'
56d43f4 - 'Update readme as well now.'
 2016-12-18 11:52:24 +01:00
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
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
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