Commit graph

189 commits

Author SHA1 Message Date
Christoph Oelckers
8ef16b72ee Merge branch 'master' of https://github.com/rheit/zdoom 2014-09-16 08:43:03 +02:00
Braden Obrzut
94123d5ef4 - Applied anonymous patch to fix uncapped stuttering in SDL backend. 2014-09-15 12:59:07 -04:00
Christoph Oelckers
b78b566b0a Merge branch 'master' of https://github.com/rheit/zdoom 2014-07-17 09:30:50 +02:00
Braden Obrzut
b6bbdf6195 - Call C_DeinitConsole in I_Quit so that we can be sure that Printf will work for as long as possible. Otherwise ZDoom will crash when ending a demo recording. 2014-07-16 18:59:49 -04:00
Christoph Oelckers
77277f4f75 Merge branch 'master' of https://github.com/rheit/zdoom 2014-06-29 01:10:51 +02:00
alexey.lysiuk
7b69c60af1 Use correct 'true' keyword 2014-06-28 11:00:01 +03:00
Braden Obrzut
d941203ab0 - Fixed edward-san's typo.
- Cleared a warning.
2014-06-26 20:37:11 -04:00
Christoph Oelckers
0cb1547890 Merge branch 'master' of https://github.com/rheit/zdoom 2014-06-26 09:45:27 +02:00
Edoardo Prezioso
0e3bee6f30 - Enable 'language' feature on unix targets.
The sdl version of the function 'SetLanguageIDs' is very limited, comparing to the win32 counterpart, as it will try to accept only the language codes (ie 'enu', 'fr', 'ptb', etc). If a different string is provided, zdoom will default its language to English.
2014-06-23 20:02:40 +02:00
Christoph Oelckers
4e64ad847b Merge branch 'master' of https://github.com/rheit/zdoom 2014-05-15 09:46:47 +02:00
Christoph Oelckers
adcdc11360 - GCC compile fix. 2014-05-14 15:44:05 +02:00
Christoph Oelckers
2944e4f6ae - fixed some Linux issues with recent changes. 2014-05-14 14:08:14 +02:00
Christoph Oelckers
3e318e4555 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	.gitignore
	src/CMakeLists.txt
2014-02-16 21:08:44 +01:00
Braden Obrzut
efa9e0c3ee Merge branch 'maint' 2014-01-18 18:10:48 -05:00
Braden Obrzut
811a75ebf6 - Minor adjustments to SDL joystick code so that all axes have at least a small deadzone so that button mapping works properly. 2014-01-18 17:54:46 -05:00
Christoph Oelckers
dc8f81c2a7 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	src/sdl/iwadpicker_cocoa.mm
2014-01-18 01:18:21 +01:00
Christoph Oelckers
e126c3ec2f Merge branch 'maint' 2014-01-17 20:45:20 +01:00
Edoardo Prezioso
f51fcd90b3 - Fixed scanf in IWAD picker without GTK
If you try to kill the program with Ctrl-C, it would run the first IWAD available in the list instead of closing it.
2014-01-17 18:57:52 +01:00
Braden Obrzut
fa516c5ee6 - For some reason __MAC_10_6 is defined in the 10.5 SDK so use MAC_OS_X_VERSION_MAX to check SDK version instead. 2014-01-07 00:55:32 -05:00
Braden Obrzut
d8ff4ec281 - Fixed: All clang 5.0 warnings.
- Renamed autostart/autozend since Xcode’s build process links in strictly alphabetical order.
2014-01-05 19:50:09 -05:00
Christoph Oelckers
ad88cfc5e2 Merge branch 'master' of https://github.com/rheit/zdoom 2013-12-25 22:32:21 +01:00
Braden Obrzut
5904df7f56 Merge branch 'maint' 2013-12-13 03:05:06 -05:00
Braden Obrzut
12d45bbc33 - Use setenv for LC_NUMERIC since setlocale gets reset by the libraries on some systems. 2013-12-13 03:00:35 -05:00
Christoph Oelckers
0b1ccfb582 Merge branch 'master' of https://github.com/rheit/zdoom 2013-11-11 09:58:55 +01:00
Braden Obrzut
34457ce737 - Applied VoidMage's patch to strip color codes from system console on SDL platforms. 2013-11-06 13:42:05 -05:00
Christoph Oelckers
daf5b97ff9 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	src/version.h
2013-09-28 23:37:41 +02:00
Braden Obrzut
658b4f7e0f - For some reason git decided not to include the actual changes for the last commit. 2013-09-21 15:30:32 -04:00
Braden Obrzut
e8bcbd14fb - Added vid_asyncblit for Linux and OS X. It defaults to true and sets SDL_AYNCBLIT on the frame buffer. This allows for ZDoom to obtain ~100% CPU usage with an uncapped frame rate on Linux like it should. (Not sure if it does anything for OS X yet.) It also makes uncapped play smoothly for me (as long as the frame rate is >= 2*refresh rate), but I'm not sure if capped feels more jittery or not. I could use some feedback here. Do note that vid_asyncblit requires a restart after the value is changed. 2013-09-21 13:20:36 -04:00
Christoph Oelckers
37de4bea67 Merge branch 'master' of https://github.com/rheit/zdoom 2013-09-03 09:02:44 +02:00
Alex Qyoun-ae
b6baeecd9a Fixed compilation with LLVM compilers 2013-09-03 03:49:39 +04:00
Christoph Oelckers
737708b635 - fix c++11's compile problems. 2013-08-28 08:33:11 +02:00
Christoph Oelckers
9f12e5928c - removed stencil buffer check from SDL init code because it caused a crash. 2013-08-19 08:04:31 +02:00
Christoph Oelckers
b61ef3a107 - bumped minimum supported OpenGL version to 1.4. The engine was already using several 1.3 and 1.4 features which would have caused problems on 1.2.
- removed gl_vid_compatibility. With the bump to 1.4 no hardware requiring this flag is supported anymore.
- disabled 16 bit framebuffers for the same reason. As a conseqence all code for rendering without stencil could also be removed.
2013-08-18 15:41:52 +02:00
Christoph Oelckers
761ab4ab78 - moved all system specific code out of gl_interface.cpp into the respective Video classes (Win32GLVideo andSDLGLVideo.) (SDL side not tested yet!) 2013-08-18 14:16:33 +02:00
Christoph Oelckers
ef6fca823e Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	src/version.h
2013-07-30 15:20:38 +02:00
Braden Obrzut
c4af738bf6 - Fixed: crash when closing ZDoom in the save menu and a memory leak. 2013-07-30 00:20:21 -05:00
Braden Obrzut
eb5d57be06 - Fixed: crash when closing ZDoom in the save menu and a memory leak. 2013-07-29 18:35:19 -04:00
Christoph Oelckers
ba2faee125 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-22 23:01:58 +02:00
Christoph Oelckers
db562142f0 - Fix c++11 literal suffix warnings / patch by Edward-san. 2013-07-22 22:25:44 +02:00
Braden Obrzut
80a3e4f902 - Fixed: Cocoa IWAD picker needed to be updated to handle git version strings. 2013-07-03 01:58:13 -04:00
alexey.lysiuk
28fd035b22 * fix build on OS X via CMake 2013-06-28 11:02:55 +03:00
Christoph Oelckers
d1835b2db8 - DavidPH's patch for Linux compilation. 2013-06-23 17:38:51 -05:00
Christoph Oelckers
68984467b1 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-23 20:55:17 +02:00
Christoph Oelckers
3a477f6903 - DavidPH's patch for Linux compilation. 2013-06-23 20:54:21 +02:00
Christoph Oelckers
399d0974ab - added GL render as of SVN revision 1600. 2013-06-23 09:49:34 +02:00
Randy Heit
98ac224e53 - Use gitinfo.h instead of svnrevision.h for versioning.
- Use functions in gitinfo.cpp to retrieve the strings from gitinfo.h so
  that changes to gitinfo.h only require recompiling one file instead of
  several.
2013-06-22 21:49:51 -05:00
Braden Obrzut
1b5bff9603 - Fixed: Solaris compile.
SVN r3928 (trunk)
2012-11-01 18:23:39 +00:00
Braden Obrzut
3ec5f7ed88 - Run down the semaphores so they behave more like a mutex (note: mutexes/condition variables seem to be much slower).
- Fixed: vid_maxfps and cl_capfps could run into a deadlock on Linux based operating systems.

SVN r3900 (trunk)
2012-10-22 23:42:20 +00:00
Braden Obrzut
df5d43badf - OK, so we can't have vid_maxfps on OS X since there does not appear to be an equivalent to POSIX timers. The only thing I could find would require Objective-C and an event loop.
SVN r3892 (trunk)
2012-10-18 00:57:56 +00:00
Braden Obrzut
1907983ab7 - Ported frame rate limiting code to SDL.
SVN r3891 (trunk)
2012-10-17 19:45:04 +00:00