Commit Graph

119 Commits

Author SHA1 Message Date
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
660a95e5d2 (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 2014-10-12 18:41:53 +00:00
rubidium
18e157fe7a (svn r26809) -Fix: do not dereference the -1 index of the file names array of music files. It definitely breaks on m68k, and might cause failures on other platforms as well 2014-09-10 16:33:42 +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
Sergii Pylypenko
657e563f7c Fixed no sound when playing music, fixed music volume reverted on new track 2014-05-28 15:41:53 +03:00
rubidium
beb540ec55 (svn r26538) -Codechange: remove double accounting of the drivers 2014-04-28 21:06:51 +00:00
rubidium
5c7c2445d8 (svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay 2014-04-23 21:23:21 +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
pelya
61e8275ebf Fixed vehicle and music dialog size 2014-03-23 18:47:49 +02:00
Juanjo
b69c4bb7a9 Add scrollbars to tracklist window and set min sizing. 2014-03-15 21:56:55 +02:00
planetmaker
adfbda8999 (svn r25776) -Add [FS#5743]: Sticky and shade buttons for jukebox window (retro) 2013-09-15 15:56:46 +00:00
frosch
16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch
25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
frosch
3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
truebrain
4c344a82a9 (svn r23544) -Codechange: document and rename widgets to be consistent and understandable 2011-12-16 18:02:27 +00:00
truebrain
49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
rubidium
9aab2dc861 (svn r23474) -Codechange: move the declaration error related functions to error.h 2011-12-10 13:54:10 +00:00
glx
a7cde1ebb1 (svn r23430) -Fix (r23219): also consider the old directories when playing a song 2011-12-04 14:17:51 +00:00
rubidium
5135e2a09e (svn r23219) -Change: different directories for basesets and newgrfs. So data to baseset or newgrf, and gm to baseset 2011-11-14 21:34:27 +00:00
rubidium
c3e83edbe5 (svn r23035) -Fix (r23034): compile failure 2011-10-16 19:59:07 +00:00
rubidium
c00b74f7ca (svn r23034) -Fix: make sure the custom playlists are 0 terminated 2011-10-16 19:56:47 +00:00
rubidium
75414c3bcd (svn r23033) -Fix [FS#4776]: the last custom playlist items went lost when the files in the .obm are not contiguous 2011-10-16 19:53:02 +00:00
planetmaker
c495862ced (svn r22694) -Cleanup [FS#4579]: Remove unused but confusing widget 2011-07-30 07:38:38 +00:00
frosch
7b251297c9 (svn r22429) -Add: some constants for specific palette colours used in the GUI. 2011-05-06 21:13:29 +00:00
frosch
7cc3d3e143 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 2011-05-04 17:45:16 +00:00
frosch
4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 2011-03-13 21:31:29 +00:00
rubidium
2e5b1f178e (svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings 2011-03-05 18:00:48 +00:00
rubidium
6ed9a8fb77 (svn r21698) -Fix: incorrectly named global variable 2011-01-02 18:12:39 +00:00
alberth
0722492c1b (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 2010-11-26 15:22:18 +00:00
rubidium
5ec2bcc0d9 (svn r21157) -Codechange: remove information about the text direction out of the language "list" 2010-11-13 09:56:25 +00:00
yexo
b4ec144af2 (svn r20474) -Cleanup: remove some unused code 2010-08-12 21:36:43 +00:00
rubidium
8c85b4ce3d (svn r20281) -Codechange: unify case scope closure + break coding style 2010-08-01 18:53:30 +00:00
alberth
71aac2192f (svn r20221) -Codechange: Move unscrolled row calculation into a function. 2010-07-26 13:02:28 +00:00
alberth
c2a871d10b (svn r20043) -Codechange: Introduce vertical alignment for DrawStringMultiLine(). 2010-07-02 13:53:05 +00:00
smatz
5504b1105e (svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit 2010-02-24 14:46:15 +00:00
frosch
94a5c917a5 (svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick(). 2010-01-30 18:34:48 +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
42d7f30dcc (svn r18608) -Change: add the concept of music sets 2009-12-22 21:40:29 +00:00
rubidium
834a91ddc6 (svn r18603) -Codechange: move getting the song name to music_gui.cpp 2009-12-22 18:34:07 +00:00
rubidium
2d1827dfa6 (svn r18369) -Fix [FS#3339] (rbeginning): off-by-one in the preconfigured music lists 2009-12-02 08:55:53 +00:00
rubidium
21f2acfd01 (svn r18324) -Codechange: there's no need for a default size when the window isn't resizable 2009-11-28 15:01:49 +00:00
rubidium
45eb0be570 (svn r18322) -Codechange: remove the WDP duplication; no need to tell the same twice. 2009-11-28 14:42:35 +00:00
rubidium
74b737f958 (svn r18311) -Codechange: no need to hardcode locations of some 'random' windows 2009-11-28 13:38:34 +00:00
rubidium
ab417c6c06 (svn r18280) -Codechange: remove widget indices that are not needed for custom drawing/handling input 2009-11-24 21:13:36 +00:00
rubidium
50359b2d08 (svn r18277) -Codechange: remove unneeded widget indices for close, resize and sticky boxes and for window captions 2009-11-24 18:05:55 +00:00
rubidium
f8b79068e6 (svn r18274) -Codechange: remove the unused WDF flags 2009-11-24 17:28:29 +00:00
rubidium
ea0fd4656a (svn r18267) -Codechange: make the music window big font aware 2009-11-24 13:14:48 +00:00
alberth
5bee09c924 (svn r18230) -Codechange: Allow fill stepsize to be set from Window::UpdateWidgetSize(). 2009-11-22 18:28:14 +00:00
alberth
18b33fde83 (svn r18229) -Codechange: Make fill_x, fill_y a number instead of a bool. 2009-11-22 18:26:01 +00:00
rubidium
5d685f7195 (svn r18192) -Codechange: make the music window RTL aware 2009-11-19 20:34:45 +00:00