zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,461 Commits 139 Branches 144 Tags 187 MiB
Commit Graph

620 Commits

Author SHA1 Message Date
Christoph Oelckers 5396e8d07d - fixed: The Windows CreateFramebuffer methods need to check the desired screen size for an actual resolution when switching to fullscreen. 2017-01-09 21:26:19 +01:00
Rachael Alexanderson 05662e5c4d Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_bsp.cpp
#	src/r_plane.cpp
#	src/r_things.cpp
 2017-01-09 09:51:06 -05:00
Christoph Oelckers cd7986b1b1 - refactored global sides array to be more VM friendly. 
- moved FLevelLocals to its own header to resolve some circular include conflicts.
 2017-01-08 18:46:17 +01:00
Magnus Norddahl 2659090e1c Move renders into folders 2016-12-27 06:31:55 +01:00
Rachael Alexanderson 3810328193 - More options for the IWAD picker. 
- Rearranged some options around a bit.
- Disable auto load is now an archived cvar.

# Conflicts:
#	src/win32/zdoom.rc
 2016-12-22 11:26:23 +01:00
Rachael Alexanderson cb2c1e591a - Added Zandronum-specific copyright notices for IWAD picker. 2016-12-22 11:26:23 +01:00
Rachael Alexanderson 5fa6094e4f - Changed QZDoom messages to GZDoom. 2016-12-22 11:26:23 +01:00
Rachael Alexanderson 240f973f0c - Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box. 
(cherry picked from commit 578e3270e2)
 2016-12-22 11:26:23 +01:00
Rachael Alexanderson 8a9ea2eda8 - Mostly implemented Zandronum's IWAD selection box. Currently, this change only affects Windows. 
(cherry picked from commit b3bed807de)
 2016-12-22 11:26:23 +01:00
Rachael Alexanderson cd3fc2d6b8 - More options for the IWAD picker. 
- Rearranged some options around a bit.
- Disable auto load is now an archived cvar.
 2016-12-21 05:11:29 -05:00
Rachael Alexanderson dcd0ab98cc - Added Zandronum-specific copyright notices for IWAD picker. 2016-12-21 02:18:49 -05:00
Rachael Alexanderson 578e3270e2 - Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box. 2016-12-20 23:03:06 -05:00
Rachael Alexanderson b3bed807de - Mostly implemented Zandronum's IWAD selection box. Currently, this change only affects Windows. 2016-12-20 13:31:38 -05:00
Christoph Oelckers 98e549246d Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-17 17:39:57 +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
Christoph Oelckers 71fd949f26 Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-11 14:45:42 +01:00
Rachael Alexanderson c48b528824 Merge https://github.com/rheit/zdoom 2016-12-10 08:04:51 -05:00
Christoph Oelckers 6c86a33f5d - fixed compilation of cursor scaling code. This reported 'std::vector' not defined, so now it just uses TArray, like the rest of ZDoom. 2016-12-10 12:05:46 +01:00
WilliamFeely 0e448a6450 Change DPI Awareness to per-monitor on Windows8.1+ 2016-12-10 10:30:23 +01:00
Magnus Norddahl 54759782b3 Fix cursor size 2016-12-10 10:29:43 +01:00
Magnus Norddahl c4ca70101d Fix console window geometry size 2016-12-10 10:29:43 +01:00
Christoph Oelckers 14400c41b6 Merge branch 'zmaster' 2016-12-08 17:53:41 +01:00
Magnus Norddahl fb4e34d178 Fix crash reporter for 64 bit 2016-12-08 14:36:17 +01:00
Magnus Norddahl 2854e1fe03 Fix crash reporter for 64 bit 
(cherry picked from commit 3a0de8b0c714507823edaa24875bc97b39c76ab6)
 2016-12-08 07:47:31 -05:00
Christoph Oelckers f547daccc8 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
 2016-12-07 22:51:05 +01:00
Magnus Norddahl 3ff91807b8 Move swrenderer into a namespace, add multithreading framework, and move drawers to commands 2016-12-07 09:34:49 +01:00
Rachael Alexanderson a78b713f4b Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/v_video.cpp
 2016-12-06 18:19:08 -05:00
Christoph Oelckers 34970c9b9c - removed hexenglobal include from GL files. 2016-12-03 18:49:52 +01:00
Magnus Norddahl 9416d436fe Move software renderer into its own namespace to isolate its globals and make 
any access explicit. This reveals the places in the code where they are being
accessed where they shouldn't and prevents accidental usage.
 2016-12-01 02:38:32 +01:00
Christoph Oelckers c927aca2a0 Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript 
# Conflicts:
#	wadsrc/static/zscript.txt
 2016-11-30 18:46:23 +01:00
Christoph Oelckers b0ddba2240 Merge branch 'master' of c:\Programming\Doom-Dev\zdoom_\ into zscript 2016-11-27 16:31:26 +01:00
Rachael Alexanderson 383a59259a Revert "Merge commit 'refs/pull/122/head' of https://github.com/coelckers/gzdoom" 
This reverts commit 71b4f57058, reversing
changes made to 449d4963ae.
 2016-11-25 21:02:18 -05:00
Christoph Oelckers 66d28a24b8 - disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared. 
Needless to say, this is simply too volatile and would require constant active maintenance, not to mention a huge amount of work up front to get going.
It also hid a nasty problem with the Destroy method. Due to the way the garbage collector works, Destroy cannot be exposed to scripts as-is. It may be called from scripts but it may not be overridden from scripts because the garbage collector can call this function after all data needed for calling a scripted override has already been destroyed because if that data is also being collected there is no guarantee that proper order of destruction is observed. So for now Destroy is just a normal native method to scripted classes
 2016-11-25 00:25:26 +01:00
Rachael Alexanderson 2de7f67b7f Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-24 01:31:18 -05:00
Braden Obrzut dc11b63157 - Fixed building with vanilla MinGW, at least with whatever modified header files that my system has from my last experimentation. 2016-11-24 00:47:53 -05:00
Christoph Oelckers d1f5d916c2 Merge branch 'master' into zscript 2016-11-23 14:39:14 +01:00
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