zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-03-15 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity
12295 commits 2 branches 66 tags 53 MiB
Commit graph

303 commits

Author SHA1 Message Date
Rachael Alexanderson
3967afa551 Merge ../qzdoom 
# Conflicts:
#	src/oplsynth/dosbox/opl.cpp
#	src/oplsynth/mlopl.cpp
#	src/oplsynth/mlopl_io.cpp
#	src/oplsynth/music_opl_mididevice.cpp
#	src/oplsynth/music_opldumper_mididevice.cpp
#	src/oplsynth/muslib.h
#	src/oplsynth/nukedopl3.h
#	src/oplsynth/opl_mus_player.cpp
#	src/sound/fmodsound.cpp
#	src/sound/fmodsound.h
 2017-03-08 21:36:58 -05:00
Rachael Alexanderson
cc9a2e5121 Merge https://github.com/coelckers/gzdoom 2017-03-08 21:25:24 -05:00
Christoph Oelckers
ba0f5a3f94 - most WORD and SWORD are gone. 2017-03-08 18:55:55 +01:00
Christoph Oelckers
8ab562ef13 - the fourth. 2017-03-08 18:55:54 +01:00
Rachael Alexanderson
e72f3c4f72 Merge ../qzdoom-mqga 2017-03-06 22:26:25 -05:00
Rachael Alexanderson
0f1b39f138 Merge ../qzdoom 
# Conflicts:
#	CMakeLists.txt
#	src/CMakeLists.txt
#	src/posix/sdl/hardware.cpp
#	src/r_3dfloors.cpp
#	src/r_3dfloors.h
#	src/r_bsp.cpp
#	src/r_bsp.h
#	src/r_draw.cpp
#	src/r_draw.h
#	src/r_local.h
#	src/r_main.cpp
#	src/r_main.h
#	src/r_plane.cpp
#	src/r_plane.h
#	src/r_segs.cpp
#	src/r_segs.h
#	src/r_swrenderer.cpp
#	src/r_swrenderer.h
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/zdoom.rc
 2017-03-06 22:25:22 -05:00
Rachael Alexanderson
369c53504d Revert "Removal of the software renderer, part 1." 
This reverts commit eec89b7575.

# Conflicts:
#	src/win32/hardware.cpp
 2017-03-06 22:19:55 -05:00
Rachael Alexanderson
854d40cdef - Make QZDoom GZDoom again! 2017-03-06 19:42:05 -05:00
nashmuhandes
d298cc7414 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-03-02 22:15:28 +08:00
Rachael Alexanderson
d84ba4b953 Merge https://github.com/coelckers/gzdoom 2017-03-02 04:22:32 -05:00
Matthew McAllister
0583691670 Add bash-style console shortcuts 2017-03-01 11:33:14 +01:00
Rachael Alexanderson
e644adf3b8 - added "vid_glswfb" CVAR for linux, defaults to false, to allow init without GL framebuffer. This will need to be ultimately finished at a later date. 2017-02-18 02:46:30 -05:00
Rachael Alexanderson
5dad292c56 Merge remote-tracking branch 'remotes/gzdoom/master' 2017-02-15 05:43:15 -05:00
Rachael Alexanderson
2b8db72cef Merge commit '2234d36c7ac531fd802803216f747f82b58be8c2' 
# Conflicts:
#	src/r_main.cpp
#	src/r_plane.cpp
#	src/r_things.cpp
 2017-02-15 05:42:57 -05:00
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
Rachael Alexanderson
6ed46921c8 Merge https://github.com/coelckers/gzdoom 2017-02-09 11:21:01 -05: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
Rachael Alexanderson
ebb8da563a Merge https://github.com/coelckers/gzdoom 2017-02-04 02:56:18 -05: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
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
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
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
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