Commit graph

6173 commits

Author SHA1 Message Date
Randy Heit
b1405921bf Merged WM_GetOutput_Linear and WM_GetOutput_Gauss into WM_DoGetOutput
- With mixing moved into separate functions, these two functions became
  identical except for the function they called to do mixing.
2015-12-28 20:44:10 -06:00
Randy Heit
635b496165 Separate WildMidi mixing from event handling
- In order to use ZDoom's own MIDI sequencer event handling must be
  completely separate from mixing, but WildMidi had them intertwined
  because it wasn't designed for external sequencers.
- Also remove all 'long's defining the output buffers to avoid having
  something that's 32 bits wide on Windows and 64 bits wide on Linux.
2015-12-28 20:33:41 -06:00
Randy Heit
a2ebf771d3 Remove '\r' character from beginning of WildMidi error messages 2015-12-28 19:13:34 -06:00
Christoph Oelckers
b27116cbbd Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-28 22:52:48 +01:00
Christoph Oelckers
9d48c84ee3 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-28 21:24:41 +01:00
Christoph Oelckers
060a6b2ff2 - shut down WildMidi when exiting.
The pointless error message in WildMidi_Shutdown was removed to keep the rest of the code simple and allowing to call this even when the device never was used.
2015-12-28 21:23:21 +01:00
Christoph Oelckers
a94120b6a4 Merge branch 'master' into WildMidi 2015-12-28 21:01:17 +01:00
Braden Obrzut
96576a6cf6 Merge branch 'gtk-fix' of git://github.com/kevans91/zdoom into gtk-fix 2015-12-28 00:56:14 -05:00
Randy Heit
33a252bf4b Add /LARGEADDRESSAWARE to VC2005 project 2015-12-27 21:52:44 -06:00
Kyle Evans
5346b813da Re-do GTK2_LIBARY_DIRS inclusion on a separate branch 2015-12-27 09:48:22 -06:00
Christoph Oelckers
1070bd9beb - fixed: APlayerPawn::ViewHeight wasn't stored in savegames. 2015-12-26 16:17:56 +01:00
Christoph Oelckers
05b8e275cd Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-26 15:33:11 +01:00
Christoph Oelckers
400038643c - fixed: Strife dialogues could crash on invalid links. 2015-12-26 15:31:59 +01:00
coelckers
1d3cf60d73 Merge pull request #34 from alexey-lysiuk/texture_fixes2
Various texture related fixes (take 2)
2015-12-26 11:40:15 +01:00
alexey.lysiuk
f8c38a0bbe - fixed GCC's 'unknown pragma' warnings in hqNx MMX implementation 2015-12-25 15:42:13 +02:00
alexey.lysiuk
1c5d0ccd65 - enabled hqNx MMX on all platforms with Intel intrinsics support 2015-12-25 15:41:06 +02:00
alexey.lysiuk
69813993b0 - added missing hqNx modes to options menu 2015-12-25 10:00:31 +02:00
alexey.lysiuk
19ae244f66 - fixed: allow to use all hqNx texture upscale modes 2015-12-25 09:52:27 +02:00
alexey.lysiuk
571f7a4eb6 - fixed: debug assertion failure in texture precaching
loading of level from command line attempted to use uninitialized time value
2015-12-25 09:48:22 +02:00
Christoph Oelckers
c8810db5fe - fixed: clipping swimmable against non-swimmable translucent 3D-floors was broken due to an incorrect flag check. 2015-12-24 16:34:00 +01:00
Christoph Oelckers
452479e5aa Merge commit '7a96f91591b3f1ca76a5986cf46f5446caee2d38' 2015-12-23 13:06:14 +01:00
coelckers
7a96f91591 Merge pull request #449 from Blue-Shadow/getmaxinv
Added GetMaxInventory ACS function
2015-12-22 22:30:07 +01:00
Christoph Oelckers
beb7a8e4a2 - added /LARGEADDRESSAWARE linker flag to CMake project. 2015-12-22 22:21:59 +01:00
Blue-Shadow
c51abb0161 Added GetMaxInventory ACS function 2015-12-22 19:01:09 +03:00
Christoph Oelckers
03ccf03b8f - fixed: UDMF with Doom format specials used the line's ID, not the first arg as the tag parameter for its special. 2015-12-21 01:13:21 +01:00
Christoph Oelckers
792d3906fd - fixed: line activation checks for monster activation could be skipped if the lines also were flagged for player activation. 2015-12-19 20:32:41 +01:00
Christoph Oelckers
37e8221067 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-15 22:07:10 +01:00
Christoph Oelckers
60f7217fbb Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-15 22:01:03 +01:00
Chris Moeller
17a216c832 Fix issue #15 / CVE-2006-3668 2015-12-15 14:47:54 -06:00
Chris Moeller
e5a4031a70 Fixed another memory leak in an error handler 2015-12-15 14:47:43 -06:00
Chris Moeller
45e031170e Implement missing n_pchannels for AMF format reader 2015-12-15 14:47:34 -06:00
Chris Spiegel
865f083128 Fix memory leaks. 2015-12-15 14:47:25 -06:00
Tuomas Virtanen
3d83ed2ee5 Change dumb.h version information to match release version
Conflicts:
	dumb/include/dumb.h
2015-12-15 14:47:13 -06:00
Randy Heit
8a6dfabedb Revert "- Implemented loop-accurate time position reporting into DUMB"
This reverts commit 153721b1c9f4cde62fa17d6aef56f782b37384bf.

Conflicts:
	dumb/include/dumb.h
	dumb/include/internal/tarray.h
	dumb/src/helpers/tarray.c
	dumb/src/it/itrender.c
2015-12-15 14:29:51 -06:00
Randy Heit
d0f1df1132 Revert "Fixed duplicating some timekeeping state variables"
This reverts commit 381ce8ea4237a64d63ac447d1e42463edde356da.
2015-12-15 14:17:02 -06:00
Randy Heit
d3000fd838 Revert "Fixed timekeeping"
This reverts commit 68f8a3aa8fb53b98625232d99cc5bd040e67dd96.

Conflicts:
	dumb/src/it/itrender.c
2015-12-15 14:16:34 -06:00
Randy Heit
06bb75576c Revert "Fixed timekeeping when starting a sigrenderer with a time offset"
This reverts commit cf2577d4bc284fb5c5b71377413a47c72a1362dc.
2015-12-15 14:13:54 -06:00
coelckers
fe990dcc7c Merge pull request #442 from alexey-lysiuk/fix_machexen_font
Fix incorrect small font rendering with Hexen Mac IWAD
2015-12-14 11:29:29 +01:00
alexey.lysiuk
9176d75580 Fix incorrect small font rendering with Hexen Mac IWAD
Unused high resolution font lumps broke composite font logic
Small font had doubled height because of that, at least alternate HUD and inter-hub text messages had noticeable visual issues
2015-12-14 11:47:46 +02:00
Christoph Oelckers
68a72d64a4 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-14 09:06:42 +01:00
Christoph Oelckers
af2ce6ef42 - fixed: The 'mindefaults' game configuration must define the player starts 5-8. 2015-12-14 09:06:13 +01:00
Christoph Oelckers
17569139b6 Merge branch 'master' of https://github.com/coelckers/gzdoom 2015-12-11 22:26:45 +01:00
Christoph Oelckers
37ea94abf3 - fixed: translucent walls did not set up their dynamic lights in the GL4 render path. 2015-12-11 22:26:10 +01:00
coelckers
d80b15e608 Merge pull request #32 from kevans91/gzdoom-freebsd-compile
<stdlib.h> has replaced <malloc.h> on FreeBSD as well
2015-12-11 09:25:18 +01:00
Kyle Evans
841ddb0d63 <stdlib.h> has replaced <malloc.h> on FreeBSD as well 2015-12-10 23:01:59 -06:00
Kyle Evans
7c6237e134 <stdlib.h> has replaced <malloc.h> on FreeBSD as well 2015-12-10 21:24:37 -06:00
Christopher Bruns
10088544c3 Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d
Conflicts:
	src/win32/i_system.cpp
2015-12-09 18:34:20 -05:00
Christoph Oelckers
5b4323ec6c Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-08 09:35:06 +01:00
coelckers
94c397b868 Merge pull request #435 from Edward850/pauseext-fix
Fix lost focus loosing network data
2015-12-07 12:52:23 +01:00
coelckers
fbccc3350c Merge pull request #437 from edward-san/lemon_free_buf_fix
- Fixed lemon trying to free non-allocated memory.
2015-12-07 12:49:55 +01:00