zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-02-28 05:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
10646 commits 2 branches 66 tags 53 MiB
Commit graph

241 commits

Author SHA1 Message Date
nashmuhandes
43550742d5 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_main.cpp
#	src/r_things.cpp
 2017-02-15 09:43:06 +08:00
alexey.lysiuk
dd0f55e8d8 Fixed compilation of Cocoa backend 2017-02-14 22:02:47 +02:00
Christoph Oelckers
2234d36c7a Merge branch 'thereisnospoon' of https://github.com/jewalky/gzdoom 
# Conflicts:
#	src/dobject.h
 2017-02-14 19:10:02 +01:00
nashmuhandes
d2c49cccd5 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-02-12 00:32:22 +08:00
alexey.lysiuk
7c8babceba Extended mouse wheel handling in Cocoa backend 
Horizontal scrolling using mouse wheel with Shift keyboard button hold is no longer ignored
 2017-02-09 16:07:28 +02:00
nashmuhandes
032ad95b0f Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	docs/licenses/README.TXT
#	src/gl/dynlights/gl_dynlight.cpp
#	src/r_bsp.cpp
#	src/r_draw.cpp
#	src/r_plane.h
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
#	src/win32/win32video.cpp
#	src/win32/zdoom.rc
 2017-02-05 20:13:39 +08:00
nashmuhandes
96cacf5418 Updated game icons 2017-02-05 19:19:16 +08:00
ZZYZX
b833f5a852 Merge remote-tracking branch 'gz/master' into thereisnospoon 2017-02-04 10:27:37 +02:00
alexey.lysiuk
c6e42d6fa0 Added handling of modifier keys for mouse events in Cocoa backend 2017-02-03 22:01:34 +02:00
alexey.lysiuk
f04b0d129d Removed useless assignment in Cocoa backend 2017-02-03 21:56:14 +02:00
ZZYZX
03f7c39ea7 Fixed mouse input in event handlers. Added RequireMouse field in event handler to signify that native mouse should be turned on for certain handlers. 2017-02-03 20:34:34 +02:00
ZZYZX
08f1731ded Added keyboard modifiers for mouse events in SDL backend. 2017-02-03 17:39:26 +02:00
ZZYZX
6a0103a746 Merged p_setup conflict 2017-02-03 13:02:44 +02:00
ZZYZX
9bb4cf1c03 User input events first take 2017-02-03 12:28:40 +02:00
Christoph Oelckers
1515ab8f4a - removed the long broken and obsolete PlayMovie code. 2017-02-02 23:21:21 +01: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
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
alexey.lysiuk
4001e7e6bd Fixed compilation with macOS SDK earlier than 10.7 2017-01-13 10:52:35 +02:00
Kyle Evans
8cc52dab5e Fix build on GCC/Clang 
Obtained from: kcat/Csonicgo (IRC)
 2017-01-09 10:11:13 +02:00
nashmuhandes
19d2042364 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
 2016-12-30 12:05:00 +08:00
alexey.lysiuk
2f9d5e285d Removed deprecated code from macOS SDL backend 2016-12-27 13:18:33 +02:00
nashmuhandes
ef61177571 Replace XPM icon to not portray the Doomguy. 2016-12-23 00:53:00 +08:00
nashmuhandes
e5e7e85b81 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/basicinlines.h
#	src/m_fixed.h
#	src/r_3dfloors.h
#	src/r_bsp.cpp
#	src/r_bsp.h
#	src/r_draw.cpp
#	src/r_draw.h
#	src/r_main.cpp
#	src/r_main.h
#	src/r_plane.h
#	src/r_segs.h
#	src/r_swrenderer.cpp
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
#	src/win32/fb_ddraw.cpp
#	wadsrc_lights/static/doomdefs.txt
#	wadsrc_lights/static/hticdefs.txt
 2016-12-23 00:51:30 +08: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
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
nashmuhandes
82b193c49d Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/sound/fmodsound.cpp
 2016-11-25 13:01:15 +08: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
Christoph Oelckers
d1f5d916c2 Merge branch 'master' into zscript 2016-11-23 14:39:14 +01: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
nashmuhandes
4358c00c73 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/r_things.cpp
#	src/win32/fb_d3d9.cpp
#	src/win32/win32video.cpp
 2016-11-19 08:00:49 +08: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
Braden Obrzut
472f35d2ce - Fixed building with gtk2 headers. 2016-11-13 00:17:09 -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
nashmuhandes
e3df34845d Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/asm_ia32/tmap2.asm
#	src/r_draw.h
#	src/r_drawt.cpp
#	src/r_main.cpp
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
 2016-11-04 12:22:39 +08:00
Christoph Oelckers
747b612860 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-03 19:42:03 +01:00
Kyle Evans
1502eae2ac Add XPM (X PixMap) version of ZDoom icon 2016-10-30 19:31:32 +01:00