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

633 commits

Author SHA1 Message Date
Rachael Alexanderson
78db0a0d06 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-23 01:43:12 -05:00
Braden Obrzut
789315bb4a - Fixed build with MinGW-w64 (TDM-GCC 5.1). Note that the resulting binary will crash under -O3 until the alignment violation is taken care of in FRemapTable::Alloc. 
- It appears that CMake added native support for building rc files with MinGW at some point so removed manual rc compiling code.
 2016-11-22 22:41:32 -05:00
Rachael Alexanderson
71b4f57058 Merge commit 'refs/pull/122/head' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/posix/sdl/hardware.cpp
#	src/win32/hardware.cpp
 2016-11-16 01:03:32 -05:00
Rachael Alexanderson
813030efef - Fully implemented CVAR_OVERRIDEGET for vid_renderer from the ZDoom code submission. 2016-11-15 20:03:50 -05:00
Christoph Oelckers
3a2d0e3486 - copied all necessary adjustments from the test branch in the QZDoom repo. 2016-11-15 11:49:27 +01:00
Christoph Oelckers
6e223ebc21 Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript 
# Conflicts:
#	src/CMakeLists.txt
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/decorate.txt
 2016-11-15 11:36:59 +01:00
Christoph Oelckers
196986ae6b Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-15 11:25:42 +01:00
Christoph Oelckers
85ff172ee3 Merge remote-tracking branch 'remotes/origin/master' into zscript 2016-11-14 15:03:14 +01:00
Rachael Alexanderson
87e9ba0f05 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-12 22:31:05 -05:00
Braden Obrzut
9342898361 - Added support for GTK3 (thanks to "MineyMe" and edward-san) 
- Replaced GTK/OS X (note different from Cocoa) clipboard code with SDL clipboard API.
- Removed requirement to link to GTK in order to compile with GTK support.
	- GTK is no longer init'd if the GTK IWAD picker is not used.
	- Our usage of GTK is such that the dynamic loader can work with both GTK2 and GTK3 depending on what's installed.
	- Since we're accumulating a lot of library loaders I've built a generic interface as FModule which replaces TOptWin32Proc and the loaders in the OpenAL and Fluidsynth code.
 2016-11-12 18:32:09 -05:00
Leonard2
7dbc4710f1 Add the new argument to all uses of the implement macro 2016-11-09 17:45:55 +01:00
Leonard2
bb2d61de50 Replaced the many implement macros with a single one that takes arguments instead 2016-11-09 17:45:53 +01:00
Christoph Oelckers
5c7affd102 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-08 14:31:10 +01:00
Rachael Alexanderson
901727a7f8 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-06 08:11:04 -05:00
Marisa Heit
55ee78fc0b Add bottomclip parameter to FillSimplePoly() for the software implementation 
- Polygons will be clipped to bottomclip. If this is zero or below, they
  will be clipped to the bottom of the screen instead. This keeps the
  polygons from overwriting the status bar border for sofware 2D. The
  hardware version ignores it, since it always draws the status bar border
  every frame.
 2016-11-05 22:49:33 -05:00
Christoph Oelckers
747b612860 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-03 19:42:03 +01:00
Rachael Alexanderson
7cba67ad45 Merge branch 'master' of http://github.com/rheit/zdoom 2016-11-02 03:12:21 -04:00
Marisa Heit
3f32ccada6 Zero In2D before calling Flip() 
- Fixes an assert when resizing the window in windowed mode. Flip() can call
  V_OutputResized() in windowed mode.
 2016-11-01 22:54:27 -05:00
Magnus Norddahl
ea9b45d988 Change read access violations to be non-fatal 2016-10-29 06:50:09 +02:00
Rachael Alexanderson
11a98bec7e - fixed: Compiler error in hardware.cpp (vid_forceddraw) 2016-10-21 18:18:48 -04:00
Rachael Alexanderson
16fded31e1 - Show current renderer on startup. This is for diagnostic purposes when we ask people for their startup logs so we know what key settings are being used when there is a problem. 2016-10-21 17:53:21 -04:00
Magnus Norddahl
c9a9e93c66 Fix warning C4805: '!=': unsafe mix of type 'bool' and type 'int' in operation 2016-10-17 11:54:03 +02:00
raa-eruanna
931d241056 - Change "vid_used3d" to true by default, in Windows. 2016-10-17 01:13:58 -04:00
Magnus Norddahl
27b432a930 Improve crash handling in drawers 2016-10-12 13:25:05 +02: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
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
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
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
267b131c03 Merge http://github.com/rheit/zdoom 2016-10-02 23:10:28 -04:00
Christoph Oelckers
2da18bfa56 Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-03 00:56:55 +02:00
N.E.C
671646be26 Fix errors encountered when compiling for v140_xp target 2016-10-02 13:05:26 -07:00
raa-eruanna
c8d0a478d8 Merge http://github.com/coelckers/gzdoom 2016-09-25 19:43:52 -04:00
Christoph Oelckers
750c194959 - changed order of SwapBuffers and glFinish call. The new order with glFinish coming last is recommended by OpenGL and it fixes a stalling problem with portals and camera textures visible at the same time. 
- check and use WGL_EXT_swap_control_tear extension. The above change makes the system always wait for a full vsync with a wglSwapInterval of 1, so it now uses the official extension that enables adaptive vsync. Hopefully this also works on the cards where the old setup did not.
 2016-09-26 01:38:25 +02:00
Magnus Norddahl
5ef46d1730 Merge remote-tracking branch 'gzdoom/master' into qzdoom 2016-09-24 09:37:18 +02:00
Christoph Oelckers
6bfbe30b99 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/g_level.cpp
#	src/p_saveg.cpp
#	src/r_defs.h
#	src/version.h

(note that this commit will not compile!)
 2016-09-24 00:40:15 +02:00
Christoph Oelckers
f397a4943c - added OutputDebugString calls to I_Error functions in Win32, so that these messages can be seen in the debug output. 2016-09-23 08:14:40 +02:00
raa-eruanna
b0029fcd1e Set version to 0.0 (prerelease), set render defaults for true-color software renderer since that is the focus of this project 2016-09-14 06:38:08 -04:00
raa-eruanna
004c7de89b Part 1 of code merge 2016-09-14 04:03:39 -04:00
raa-eruanna
81545d9b4e Merge http://github.com/rheit/zdoom 
# Conflicts:
#	src/v_video.cpp
 2016-09-14 02:24:59 -04:00
raa-eruanna
b85e3b56e3 Establish QZDoom 2016-09-14 02:21:35 -04:00
Magnus Norddahl
7070bded77 Merge remote-tracking branch 'origin/aspectratio' into aspectratio_gzdoom 2016-09-12 20:03:21 +02:00
Magnus Norddahl
d3d8180f57 Resize framebuffer in windowed mode to match the client area 2016-09-12 13:04:36 +02:00
raa-eruanna
dede94b7e2 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/win32/hardware.cpp
#	wadsrc/static/menudef.txt
 2016-09-08 03:26:11 -04:00
raa-eruanna
32f758de41 Merge branch 'truecolor' of https://github.com/dpjudas/zdoom 
# Conflicts:
#	src/v_video.cpp
 2016-09-08 03:19:08 -04:00
Christoph Oelckers
e08015a181 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-03 14:02:28 +02:00
Christoph Oelckers
5770e5dfaf - split up m_specialpaths.cpp to be a separate file for each operating system. 
The reason for this is that the macOS version uses a deprecated API and in order to correct this, the file needs to be compiled as Objective-C++ which requires a different extension.
 2016-09-03 12:00:08 +02:00
Christoph Oelckers
7efae2c8f8 - fixed: When requesting GL version 2.x, do not try to create a core profile context, because that can not support legacy features. 2016-09-01 12:14:20 +02:00
Christoph Oelckers
8f535997f8 - enable core profile by default on GL 3.x. 
After doing some profiling it was very obvious that this has better performance than client arrays. Persistent buffers are still better, though, especially for handling dynamic lights.
 2016-08-29 11:33:20 +02:00
Magnus Norddahl
945d5b154a Remove gl_vid_multisample 2016-08-28 18:10:39 +02:00
Christoph Oelckers
abafcd5486 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/language.enu
 2016-08-28 10:00:19 +02:00
Christoph Oelckers
e04055dbb2 - added multiple message levels for 'developer' CVAR so that the important stuff won't get drowned in pointless notification spam that's of no use to anyone. 
- made 'developer' CVAR persist across launches and added some menu entries for it.
- added checks for 'developer' to ACS's CheckInventory function.
 2016-08-28 09:55:04 +02:00
Magnus Norddahl
276fb7dbb2 Add vid_maxfps support for Windows and Linux 2016-08-22 22:00:44 +02:00
Magnus Norddahl
0c2db5447c Save gl_debug in ini file and add support in Linux 2016-08-17 20:57:00 +02:00
Magnus Norddahl
2ac91f0c5a Fix Nvidia driver ignoring wglSwapIntervalEXT 2016-08-08 12:22:40 +02:00
Magnus Norddahl
aeb7df09de Added hardware gamma option and improved window handling on Windows 2016-07-27 11:15:19 +02:00
Magnus Norddahl
b9d7a98aec Change swtruecolor cvar to take effect immediately 2016-06-01 06:02:37 +02:00
Magnus Norddahl
e929eec80f Make x86 asm aware of swtruecolor 2016-06-01 05:28:14 +02:00
Magnus Norddahl
05220a7133 Added IsBgra() to DCanvas 
Changed SWRender output format to be decided by IsBgra()
 2016-05-31 09:36:18 +02:00
Magnus Norddahl
045bad1b52 Removed the need for the pixel_canvas_t typedef 2016-05-31 05:31:32 +02:00
Magnus Norddahl
7080180d47 Added menu option for toggling true color output on and off 2016-05-30 13:32:24 +02:00
Magnus Norddahl
6e53c1bd12 Change render target output from PAL8 to BGRA8 2016-05-28 20:40:33 +02:00
Christoph Oelckers
4940f0249d Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-28 20:33:29 +02:00
Christoph Oelckers
fc25a74a03 - fixed: In case of a crash the buffered console output was not dumped to the rich edit control so it never got into the crash log. 2016-05-28 20:11:19 +02:00
Christoph Oelckers
4781b73d5b Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-21 01:09:21 +02:00
Gaerzi
68c5191798 Add GOG path for SVE 
Since GOG.com is finally offering this game.
 2016-05-20 02:18:48 +02:00
Christoph Oelckers
d4806f82ca - reinstated some texturing-based dynamic light code. Not active yet and not tested yet. 2016-04-28 00:58:44 +02:00
Christoph Oelckers
ee7a4daa8c - preparations for textured dynamic lights. 2016-04-27 23:19:54 +02:00
Christoph Oelckers
6e1b21d513 - added back sprite splitting for low end, plus some dynamic light code. 2016-04-26 21:31:24 +02:00
Christoph Oelckers
f066457a48 - add shader patching to allow running the engine with GLSL 1.2. 
- made some initial preparations for the shader-less fallback path.
 2016-04-26 15:26:52 +02:00
Christoph Oelckers
8b5c741358 - check the proper command line option for rejecting a core profile. 2016-04-26 15:19:38 +02:00
Christoph Oelckers
328047ea28 - fixed issues with recent Stereo3D submission: 
* there was a CVAR that was only defined in Windows
 * code did not compile with GCC.
 * due to bad setup it disabled multisampling.
 2016-04-14 10:16:04 +02:00
Christopher Bruns
09d0cb5fd5 Merge branch 'master' of https://github.com/coelckers/gzdoom into two_more_stereo_modes 
# Conflicts:
#	src/gl/system/gl_framebuffer.cpp
 2016-04-11 18:25:54 -04:00
Christoph Oelckers
7a2e957225 Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-11 23:14:53 +02:00
Christoph Oelckers
77bfffaee0 - removed a few __cdecl's from the source. 2016-04-11 12:46:48 +02:00
Christoph Oelckers
7ce670951b Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
 2016-04-11 10:49:11 +02:00
Christoph Oelckers
db86385cf6 - removed STACK_ARGS. 
The only reason this even existed was that ZDoom's original VC projects used __fastcall. The CMake generated project do not, they stick to __cdecl.
Since no performance gain can be seen by using __fastcall the best course of action is to just remove all traces of it from the source and forget that it ever existed.
 2016-04-11 10:46:30 +02:00
Christoph Oelckers
12129b0f07 - added a system-include independent wrapper for Windows's OutputDebugString, so that this can be used more easily in files that cannot include windows.h. 2016-04-10 13:03:44 +02:00
Christopher Bruns
c6fa01dfbf Reimplement blue/yellow and quadbuffered stereo, this time with an additional CVAR gate on quadbuffered, for better hardware compatibility.obj 
Something is terribly wrong with the separation in all stereo modes now though.
 2016-04-09 15:40:55 -04:00
Christoph Oelckers
fde1f28d71 Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-09 20:48:54 +02:00
Christoph Oelckers
a827bab576 - refactored the use of tag lists so that they do not have to be passed around between functions. 
This means that the varargs functions themselves are now responsible for parsing them into DrawParms.
This was done because DrawTextV made a blanket assumption that every single vararg has the size of a 32 bit integer and caused crashes when anything else was passed. It also failed to eliminate any tag that is incompatible with text display. These will now abort DrawText and trigger an assert.
 2016-04-09 20:47:54 +02:00
Christoph Oelckers
bc42dd26c8 Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-09 13:00:14 +02:00
Christoph Oelckers
e2ae7d8f5d - removed the unused x and y parameters from DrawTextureParms. 2016-04-09 12:59:50 +02:00
Christoph Oelckers
c502a4b3cc Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-09 12:55:34 +02:00
Christoph Oelckers
43dd759859 - changed DrawTexture so that the parameters get parsed in the varargs function directly and that the virtual function that is getting called gets the fully prepared data. 
In order to avoid passing around tag lists, DrawTextV needs to parse everything itself and then pass a fully initialized structure to DrawTexture. This cannot be done if all variants require a varargs tag list.
Apparently the only reason for the old approach was the 'hw' parameter which was never used.
 2016-04-09 12:55:12 +02:00
Christoph Oelckers
88542bed78 Merge branch 'master' of https://github.com/rheit/zdoom 2016-04-07 13:43:00 +02:00
Christoph Oelckers
5409ada0e3 let WM_DISPLAYCHANGE and WM_STYLECHANGED call DefWindowProc. 
At least on GZDoom it seems to be important on some systems.
 2016-04-07 10:26:57 +02:00
Christoph Oelckers
f7553fcd51 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_defs.h
 2016-04-02 22:17:33 +02:00
Christoph Oelckers
8680391e0b - floatified the global view variables. 
The software renderer still uses internal copies of the fixed point version.
 2016-04-01 12:22:16 +02:00
Christoph Oelckers
251172c7f0 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_data/r_interpolate.cpp
 2016-03-30 18:24:22 +02:00
Christoph Oelckers
66929cbaff - floatified p_trace, p_slopes and p_udmf.cpp. 
- major cleanup of unused code.
 2016-03-30 16:30:22 +02:00
Christoph Oelckers
ae14268989 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_utility.cpp
 2016-03-29 10:09:03 +02:00
Christoph Oelckers
dabed04d2a - floatification of p_3dfloors, p_3dmidtex and p_acs.cpp plus some leftovers. 
- removed all references to Doom specific headers from xs_Float.h and cmath.h.
 2016-03-26 12:36:15 +01:00
Christoph Oelckers
f568a35756 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/win32/fb_d3d9.cpp
 2016-03-24 16:38:09 +01:00
Christoph Oelckers
41387622f2 - changed angle parameter of FillSimplePoly. 2016-03-24 16:36:43 +01:00
Christoph Oelckers
609defe078 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_defs.h
 2016-03-24 12:48:05 +01:00
Christoph Oelckers
09d8b4af80 - changed I_GetTimeFrac to return a double instead of a fixed_t. 2016-03-24 12:00:21 +01:00
Christoph Oelckers
2a0d5a621a - floatified some stuff in g_shared. 
Note: This commit does not handle z-spawn positions correctly.
 2016-03-23 00:53:09 +01:00
Christoph Oelckers
eee5143b26 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_defs.h
 2016-03-22 22:12:51 +01:00
Christoph Oelckers
1eb106e2c5 - floatification of some alpha parameters. 2016-03-22 13:35:16 +01:00
Christoph Oelckers
48afdd7dcb Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/CMakeLists.txt
#	src/actor.h
 2016-03-21 01:34:39 +01:00
Christoph Oelckers
51b05d331d - replaced AActor::vel and player_t::Vel with a floating point version. 
- Converted P_MovePlayer and all associated variables to floating point because this wasn't working well with a mixture between float and fixed.

Like the angle commit this has just been patched up to compile, the bulk of work is yet to be done.
 2016-03-20 00:54:18 +01:00
Christoph Oelckers
0bcbacea53 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/posix/sdl/hardware.cpp
 2016-03-04 01:21:59 +01:00
Michael Labbe
a4705c8404 vid_listmodes crash fix 2016-03-03 17:31:12 -06:00
Michael Labbe
97821a3036 21:9 aspect ratio support 
- vid_aspect 6 forces 21:9
 2016-03-03 17:31:12 -06:00
Christoph Oelckers
a96d6ab072 Merge remote-tracking branch 'remotes/zdoom/master' 
# Conflicts:
#	src/g_level.cpp
#	src/p_3dfloors.cpp
#	src/p_lnspec.cpp
#	src/p_saveg.cpp
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	src/r_data/r_translate.cpp
#	src/r_data/sprites.cpp
#	src/r_defs.h
#	src/r_sky.h
#	src/stats.h
#	src/textures/texturemanager.cpp
#	src/textures/textures.h
#	src/version.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/i_system.cpp
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/compatibility.txt
#	wadsrc/static/language.enu
#	wadsrc/static/mapinfo/common.txt
#	wadsrc/static/menudef.txt
#	wadsrc/static/xlat/eternity.txt
 2016-03-01 18:50:45 +01:00
Christoph Oelckers
e3c06e3df7 Merge commit '165d26baa1569685651baf4575e12e73c8cbfd2e' 
# Conflicts:
#	bzip2/bzip2.vcproj
#	game-music-emu/game-music-emu.vcproj
#	gdtoa/gdtoa.vcproj
#	jpeg-6b/jpeg-6b.vcproj
#	src/p_spec.cpp
#	src/r_defs.h
#	tools/fixrtext/fixrtext.vcproj
#	tools/lemon/lemon.vcproj
#	tools/updaterevision/updaterevision.vcproj
#	tools/zipdir/zipdir.vcproj
#	wadsrc/static/xlat/eternity.txt
#	wadsrc/wadsrc.vcproj
#	zlib/zlib.vcproj
 2016-03-01 17:23:35 +01:00
Randy Heit
55142078d8 Normalize line endings 2016-03-01 09:47:10 -06:00
Christoph Oelckers
44a6cafd4b - we are using C++11 now, so all those old VC 2005 project files are of no use anymore. 2016-03-01 09:38:49 +01:00
Christoph Oelckers
0cf9cae7f3 - added some #pragma warnings to i_crash.cpp to silence a warning message in Microsoft's headers. 2016-02-29 10:48:51 +01:00
Christoph Oelckers
8362a4516f Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-24 11:26:35 +01:00
DaMan
78552cc676 Disable UAC virtualization 2016-02-22 17:56:18 -06:00
Christoph Oelckers
ca87e2fa3c Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
 2016-02-13 15:36:04 +01:00
Christoph Oelckers
340faef1ec - fixed a few 64-bit warnings. 2016-02-13 13:37:28 +01:00
Christoph Oelckers
d1f741a53d Merge branch 'master' of c:\programming\doom\zdoom 2016-02-09 15:07:16 +01:00
Christoph Oelckers
bcfb437302 - fixed message output. 2016-02-09 15:06:55 +01:00
Christoph Oelckers
15d5a5256f Merge branch 'master' of ZDoom 
# Conflicts:
#	.gitignore
#	src/win32/i_system.cpp
 2016-02-09 14:41:31 +01:00
Christoph Oelckers
4d2a52418f - added an errorlog option. 
This cuts down on as much message noise as possible, outputs everything to a file specified as a parameter and then quits immediately, allowing this to run from a batch that's supposed to check a larger list of files for errors.
Multiple outputs get appended if the file already exists.
 2016-02-09 14:20:49 +01:00
Christoph Oelckers
0678a469de Merge remote-tracking branch 'remotes/zdoom/master' 
# Conflicts:
#	src/win32/i_system.cpp
#	tools/re2c/re2c.vcproj
 2016-02-08 21:47:19 +01:00
Randy Heit
09a17c2198 Quiet some narrowing conversion warnings from VS2015 2016-02-05 22:18:53 -06:00
Christoph Oelckers
dda73b531c Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/p_setup.cpp
#	src/r_defs.h
#	src/version.h

This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.
 2016-02-05 12:31:41 +01:00
Randy Heit
b3b0886b64 Merge branch 'scripting' 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-02-04 15:17:22 -06:00
alexey.lysiuk
70e569f79c Fixed restoration of window position with OpenGL renderer 
Software renderer was not affected as it has maximize window button enabled
 2016-02-04 11:57:26 +02:00
Christoph Oelckers
8bc7a0a24e Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-30 23:01:36 +01:00
Christoph Oelckers
06fdb6ca45 - fixed: The reverb editor failed to open in fullscreen mode at desktop resolution. 
According to Blzut3:

The issue happens when the fullscreen resolution is the same as the desktop resolution. In this case WM_DISPLAYCHANGE doesn't occur so the editor never appears. This appears to be fixable by also catching WM_STYLECHANGED since at the very least the window caption will appear/disappear.
 2016-01-30 21:49:03 +01:00
Christoph Oelckers
bf747075e8 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:57:55 +01:00
Christoph Oelckers
cfcd2668cc Merge commit '772a5724313f2ad0bd6828fcc28545a9ee5e6068' into scripting 
Conflicts:
	src/p_pspr.cpp
	src/thingdef/thingdef_codeptr.cpp
 2016-01-17 20:00:45 +01:00
Christoph Oelckers
5207aa6cc0 Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting 
Conflicts:
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/shared/inventory.txt
 2016-01-17 19:09:05 +01:00
Christoph Oelckers
f83b21ff26 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_spec.cpp
 2016-01-11 15:35:01 +01:00
Randy Heit
42e9a6a711 Make atlas size a macro definition and default it to 512x512 (was 256x256) 2016-01-10 22:14:35 -06:00
Randy Heit
aaac5ac7a1 Use not so brilliant backgrounds for allocated atlas backgrounds 2016-01-10 22:01:29 -06:00
Randy Heit
4f0046105d Change texture atlas display to show allocated rectangles 2016-01-10 21:09:16 -06:00
Christoph Oelckers
f391216ab9 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-09 19:48:01 +01:00
Randy Heit
bf31d66d31 Use a better packing algorithm for the texture atlases 
- The old algorithm is something I threw together that produced decent,
  but not spectacular results since it had a tendency to waste space by
  forcing everything onto "shelves".
  The new packer is the Skyline-MinWaste-WasteMap-BestFirstFit algorithm
  described by Jukka Jylanki in his paper *A Thousand Ways to Pack the Bin - A
  Practical Approach to Two-Dimensional Rectangle Bin Packing*, which can
  currently be read at http://clb.demon.fi/files/RectangleBinPack.pdf
  This is minus the optimization to rotate rectangles to make better fits.
 2016-01-08 22:37:06 -06:00
Randy Heit
f330a81909 Rename packing textures to texture atlases for the D3D code 
- I figure since I now know the "proper" name for these things, I should
  call them by it.
 2016-01-08 20:08:10 -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
Braden Obrzut
964ee6bb23 - Worked around issue where stat doesn't work in v140_xp. Even though the bug was supposedly fixed for awhile now it didn't make it into Update 1. 2015-12-07 04:49:40 -05:00
Christopher Bruns
151b47c3ae Merge branch 'master' of https://github.com/coelckers/gzdoom into merge_down 
Conflicts:
	src/win32/i_system.cpp
 2015-11-03 20:21:27 -05:00
Christoph Oelckers
a5b43dfb66 Merge branch 'master' of https://github.com/rheit/zdoom 2015-11-03 23:55:41 +01:00
Christopher Bruns
89328e685c Use eye->TearDown method to restore glColorMask. 
Restore assert in i_system.cpp that was interfering with my debugging.
Restore scoped colorMask-ing in gl_portal.cpp and gl_drawinfo.cpp.
 2015-10-30 21:48:42 -04:00
Christopher Bruns
b82d611936 Call EndDrawScene for each eye. 
Actually use stereoscopic projection matrix.
 2015-10-30 21:29:36 -04:00
alexey.lysiuk
37dde2e77d Make console to Windows debug output controlled by CVAR 
DebugView can be used to view output without debugger attached
 2015-09-23 10:18:57 +03:00
alexey.lysiuk
c743b19e6d Make console text to appear in Windows debug output 
This works in Debug configuration only
Color escape sequences are stripped from text before output
 2015-09-22 15:19:44 +03:00
Christoph Oelckers
61e09da1be Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-06 08:41:27 +02:00
Edward Richardson
abb033d400 Fix deallocation of controllers with no axes 2015-09-05 14:18:48 +12:00
Gaerzi
98f214ee66 Added support for GOG paths 
This works a bit differently from the Steam version, because each game
has its own registry keys and its own independent path.
 2015-08-28 19:14:25 +02:00
Christoph Oelckers
44d25afaef Merge branch 'master' of https://github.com/rheit/zdoom 2015-08-01 09:38:37 +02:00
Christoph Oelckers
d9cc7c52ee - some declarations for selecting the proper GPU on modern laptops. 2015-08-01 09:38:20 +02:00