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

246 Commits

Author SHA1 Message Date
Rachael Alexanderson 4e45ea2300 Merge https://github.com/coelckers/gzdoom 2017-01-31 23:04:56 -05:00
alexey.lysiuk b12c8a8f79 RDTSC-based glcycle_t for macOS 
Time profiler implementation is now closer to Windows version
 2017-01-31 16:00:14 +02:00
alexey.lysiuk 1cdfcb4935 RDTSC-based cycle_t for macOS 
Windows and macOS now share most of related code
Old implementation using mach_absolute_time() was more precise (at least in theory) but too costly
 2017-01-31 15:57:47 +02:00
Magnus Norddahl 9c4b11b671 Add OpenGL ES support to Linux target and enable it for ARM devices 2017-01-25 07:18:26 +01:00
Magnus Norddahl eb2b5269f9 Fix linux compile errors 2017-01-25 03:28:11 +01:00
Magnus Norddahl 934f6a88bb Fix compile error 2017-01-24 17:10:28 +01:00
Magnus Norddahl 55d9392fb8 Add fallback code to Linux target so if OpenGL is either unavailable or can't be used it falls back to the old software SDL FB 2017-01-24 01:43:45 +01:00
Rachael Alexanderson 03226e5a0a Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
 2017-01-23 00:17:25 -05:00
alexey.lysiuk da4981ef91 Fixed invisible mouse cursor in SDL backend 
See https://mantis.zdoom.org/view.php?id=71
 2017-01-22 10:25:37 +02:00
Magnus Norddahl 1d941c9839 Merge remote-tracking branch 'gzdoom/master' into qzdoom 
# Conflicts:
#	src/r_plane.cpp
#	src/win32/zdoom.rc
 2017-01-13 13:21:10 +01:00
alexey.lysiuk 4001e7e6bd Fixed compilation with macOS SDK earlier than 10.7 2017-01-13 10:52:35 +02: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
Kyle Evans 8cc52dab5e Fix build on GCC/Clang 
Obtained from: kcat/Csonicgo (IRC)
 2017-01-09 10:11:13 +02:00
alexey.lysiuk 2f9d5e285d Removed deprecated code from macOS SDL backend 2016-12-27 13:18:33 +02:00
alexey.lysiuk 186c7b8814 Removed deprecated code from macOS SDL backend 2016-12-27 12:56:21 +02:00
alexey.lysiuk 96228fd645 Fixed compilation of non-Windows backends 2016-12-27 12:55:26 +02:00
Rachael Alexanderson 2200f6eda3 - fixed: compile error with SDLGLVideo class macro 2016-12-07 13:21:28 +01:00
Christoph Oelckers 56f67726f0 - seems a Linux file was missed when refactoring the IMPLEMENT_CLASS macros. 2016-12-07 00:54:40 +01:00
Rachael Alexanderson 8a23befd4d - Fixed abstract class macro in SDLGLFB class. 2016-12-06 18:22:36 -05: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 c3fb43db3a Merge branch 'gz-zscript' 2016-12-06 22:47:37 +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
Rachael Alexanderson 509108f8b6 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-11-24 23:46:33 -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
Christoph Oelckers 49605bc109 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-11-24 09:59:48 +01:00
Magnus Norddahl 4eb32a50e3 Add vid_vsync support to Linux target 2016-11-24 09:59:40 +01:00
Christoph Oelckers aa4b3bb230 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-24 09:58:29 +01:00
Edoardo Prezioso 68dc3c4f2d - Preventive fix for future include conflicts. 
basicinlines.h is only included in m_fixed.h, while basictypes.h is included only in headers, so it's better to respect this convention. OSX compiles fine also without m_fixed.h, even better.
 2016-11-24 09:09:09 +01:00
Magnus Norddahl 7b4df20c51 Merge branch 'linux_vsync' into qzdoom 2016-11-24 07:41:58 +01:00
Magnus Norddahl 33958ca5b2 Add vid_vsync support to Linux target 2016-11-24 07:37:15 +01:00
Christoph Oelckers d1f5d916c2 Merge branch 'master' into zscript 2016-11-23 14:39:14 +01:00
Magnus Norddahl ff738de279 Bgra support 2016-11-23 01:01:28 +01:00
Magnus Norddahl f313bfd2cc Merge branch 'gl_swframebuffer' into qzdoom 2016-11-23 00:56:39 +01:00
Magnus Norddahl 7beac65471 Add Linux support for GLSWFrameBuffer 2016-11-23 00:55:07 +01:00
Rachael Alexanderson fc011e42dd Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-19 12:46:01 -05:00
alexey.lysiuk c28bcca3f3 Print unknown if release information is unavailable on macOS 
At least 10.4 Tiger doesn't support required sysctl name
 2016-11-19 16:42:16 +01:00
alexey.lysiuk 60ac12be0a Fixed compilation warnings in Cocoa backend 2016-11-19 16:42:16 +01: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 470046ec5a Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-13 07:30:34 -05:00
Braden Obrzut 472f35d2ce - Fixed building with gtk2 headers. 2016-11-13 00:17:09 -05: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