Commit Graph

126 Commits

Author SHA1 Message Date
Sergii Pylypenko 3ba683874b Merge remote-tracking branch 'origin/master' into HEAD 2019-04-23 18:16:24 +03:00
Charles Pigott c3bc7d657e Codechange: Remove ability for SDL to be dynamically loaded on Windows 2019-03-02 17:13:05 +01:00
Owen Rudge 7bd2fa3516 Feature: Add XAudio2 driver 2018-05-17 15:06:37 +01:00
Michael Lutz 27bfb1df8f Codechange: [OSX] Use 10.6+ APIs to initialise audio when available. 2018-04-10 23:30:01 +02:00
Sergii Pylypenko b4cc822085 Merge svn r27779
Conflicts:
	src/autoreplace_gui.cpp
	src/economy.cpp
	src/fios_gui.cpp
	src/lang/spanish_MX.txt
	src/network/network_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/toolbar_gui.cpp
	src/window.cpp
2017-03-17 23:14:41 +02:00
michi_cc 36cbb54a9d (svn r27673) -Add: [Win32] Thread names for windows debuggers. 2016-10-30 18:22:55 +00:00
michi_cc c83306391e (svn r27673) -Add: [Win32] Thread names for windows debuggers. 2016-10-30 18:22:55 +00:00
pelya 3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
rubidium 8f711aca53 (svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference 2015-08-12 20:50:10 +00:00
rubidium c4d4612736 (svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference 2015-08-12 20:50:10 +00:00
Sergii Pylypenko 91ebce1a9c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
rubidium beb540ec55 (svn r26538) -Codechange: remove double accounting of the drivers 2014-04-28 21:06:51 +00:00
rubidium b476086c39 (svn r26538) -Codechange: remove double accounting of the drivers 2014-04-28 21:06:51 +00:00
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
pelya 6dc8be0332 Android patches 2014-03-15 19:44:27 +02:00
rubidium d709a7f465 (svn r26108) -Codechange: some coding style (whitespace) 2013-11-25 14:30:22 +00:00
rubidium defda16eb6 (svn r26108) -Codechange: some coding style (whitespace) 2013-11-25 14:30:22 +00:00
rubidium f843a0b5d9 (svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations 2013-11-25 14:26:46 +00:00
rubidium 6996b441d9 (svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations 2013-11-25 14:26:46 +00:00
fonsinchen 4396dcf642 (svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0 2013-08-10 12:47:24 +00:00
fonsinchen 0baa72aff9 (svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0 2013-08-10 12:47:24 +00:00
terkhen 82a5e4e35e (svn r22877) -Fix (r22874): Fix broken compilation on MinGW. 2011-09-03 10:31:28 +00:00
terkhen 008b5b6d27 (svn r22877) -Fix (r22874): Fix broken compilation on MinGW. 2011-09-03 10:31:28 +00:00
michi_cc 7c325fcb78 (svn r22874) -Fix [FS#4747]: Check size of various buffers before allocation. (monoid) 2011-09-02 20:16:41 +00:00
michi_cc 65637d8941 (svn r22874) -Fix [FS#4747]: Check size of various buffers before allocation. (monoid) 2011-09-02 20:16:41 +00:00
rubidium eb2197f4c8 (svn r22410) -Document: some more bits ;) 2011-05-02 16:14:23 +00:00
rubidium 4d5dbf5170 (svn r22410) -Document: some more bits ;) 2011-05-02 16:14:23 +00:00
rubidium 6e9122828e (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
rubidium 5a620d1c65 (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
frosch c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch 4bd32799f1 (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch 5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
glx f87e0e8d7c (svn r19304) -Fix [FS#3652]: disable sound when a sound error happen instead crashing 2010-03-02 23:11:23 +00:00
glx 4167a5b647 (svn r19304) -Fix [FS#3652]: disable sound when a sound error happen instead crashing 2010-03-02 23:11:23 +00:00
glx 515fb15805 (svn r18934) -Fix (r18892, r18913): the deadlock should be definitively gone now 2010-01-28 13:49:20 +00:00
glx 27491c5586 (svn r18934) -Fix (r18892, r18913): the deadlock should be definitively gone now 2010-01-28 13:49:20 +00:00
glx 89479162de (svn r18913) -Fix (r18892): the deadlock was still possible 2010-01-25 00:43:51 +00:00
glx 57718cc5a7 (svn r18913) -Fix (r18892): the deadlock was still possible 2010-01-25 00:43:51 +00:00
glx 0ccb10ead6 (svn r18892) -Fix: in some rare case a deadlock could happen when stopping sound driver (windows) 2010-01-23 01:36:49 +00:00
glx a554b41452 (svn r18892) -Fix: in some rare case a deadlock could happen when stopping sound driver (windows) 2010-01-23 01:36:49 +00:00
rubidium f762b70a41 (svn r18821) -Codechange: [Allegro] make the frequency and number of samples runtime configurable 2010-01-15 23:47:28 +00:00
rubidium 21fff6407d (svn r18821) -Codechange: [Allegro] make the frequency and number of samples runtime configurable 2010-01-15 23:47:28 +00:00
rubidium d017ada3a3 (svn r18820) -Codechange: [SDL] make the number of samples runtime configurable and increase the default slightly 2010-01-15 23:45:26 +00:00
rubidium f74ce1890e (svn r18820) -Codechange: [SDL] make the number of samples runtime configurable and increase the default slightly 2010-01-15 23:45:26 +00:00
rubidium 9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium 4b903b80ac (svn r17788) -Fix [FS#3268] (r16702): don't fail hard when no soundcard could be detected; just fall back on the null-driver 2009-10-17 15:15:00 +00:00
rubidium d0d4cd7b8a (svn r17788) -Fix [FS#3268] (r16702): don't fail hard when no soundcard could be detected; just fall back on the null-driver 2009-10-17 15:15:00 +00:00