Commit Graph

473 Commits

Author SHA1 Message Date
pelya
74c1382675 Compilation fixes 2016-03-27 23:14:56 +03:00
Sergii Pylypenko
d00e9cd050 WTF why is it swapped?
Conflicts:
	src/settings_gui.cpp
2016-03-27 22:52:35 +03:00
Sergii Pylypenko
d2a582fb9e Changing GUI zoom factor will also change resolution
Conflicts:
	src/settings_gui.cpp
2016-03-27 22:51:23 +03:00
pelya
34e886c5e5 Reverted more SetMinimalSize() hacks 2016-03-27 22:48:45 +03:00
pelya
9652791a07 Fixed game settings dialog 2016-03-27 22:45:58 +03: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
frosch
9f72662ecc (svn r27366) -Fix [FS#6358]: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font. 2015-08-09 10:22:51 +00:00
frosch
c9120cd714 (svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines. 2015-08-09 10:21:06 +00:00
rubidium
c017c18c26 (svn r27026) -Fix: some (older-ish) GCC compiler warnings 2014-10-21 16:58:15 +00:00
peter1138
aa6fdf6f13 (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 2014-10-12 20:43:25 +00:00
peter1138
2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
frosch
4132e4e7e3 (svn r26986) -Change: Rename 'Advanced Settings' to just 'Settings'. 2014-10-09 21:16:29 +00:00
peter1138
ae22f8ab55 (svn r26959) -Codechange: GUI-scale for settings window. 2014-10-04 20:34:43 +00:00
rubidium
babe50da92 (svn r26886) -Change (r26885): the max height setting belongs more in the limitations section of the settings 2014-09-21 12:35:34 +00:00
rubidium
fa193ece85 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 2014-09-21 12:25:04 +00:00
rubidium
647a3c8e5f (svn r26882) -Feature: allow limiting the height of bridges (ic111) 2014-09-21 11:40:11 +00:00
peter1138
657c108d32 (svn r26858) -Codechange: Rearrange smallmap filter and settings expand/collapse buttons to fix frame borders and allow buttons to fit height of resize button. 2014-09-20 10:23:38 +00:00
planetmaker
035fedd30b (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 2014-09-13 13:30:31 +00:00
Sergii Pylypenko
2603e6b5e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
2014-08-19 19:21:47 +03:00
frosch
ef3ca2047b (svn r26678) -Codechange: Simplify settings widget layout. (Juanjo) 2014-07-08 20:06:45 +00:00
pelya
d3e9368f34 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/autoreplace_gui.cpp
2014-06-15 22:32:06 +03:00
frosch
f8def6184b (svn r26629) -Fix [FS#6012]: If the video driver fails to supply a list of resolutions, display an error message. 2014-06-05 17:14:16 +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
e465c8db4d Added vertical toolbar option to game settings 2014-06-03 20:27:10 +03:00
frosch
5fd223ae9b (svn r26623) -Codechange: Make SettingsEntry and SettingsPage polymorphic classes. 2014-06-01 12:14:32 +00:00
frosch
202c4ebd40 (svn r26622) -Codechange: Construct settings tree on the heap instead of using static arrays. 2014-06-01 11:51:24 +00:00
frosch
59a49a4483 (svn r26614) -Add: Adv. settings window can handle the autosave setting as well. 2014-05-25 15:02:04 +00:00
frosch
7e359e1b8d (svn r26604) -Add: Most of the mapgen settings to advances settings window. 2014-05-21 18:07:30 +00:00
frosch
90f0ba840f (svn r26536) -Change: Reshuffle advanced settings tree. 2014-04-27 20:52:56 +00:00
frosch
e811c54d1d (svn r26533) -Codechange: Rename some strings 2014-04-27 20:40:52 +00:00
frosch
fffab86525 (svn r26528) -Remove: A bunch of archaic settings from the advanced settings GUI. 2014-04-27 15:35:31 +00:00
frosch
9430dfe7fa (svn r26525) -Remove: Screenshot format setting from GUI. 2014-04-27 15:13:46 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +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
Sergii Pylypenko
fed40b76ff Change butto nsize and font size in game options 2014-04-07 22:36:22 +03:00
pelya
313e3b73b3 Auto-resize all buttons and fonts, when screen resoluition changes 2014-03-23 17:19:30 +02:00
pelya
b17015932c Stacked game options dialog in two columns 2014-03-16 00:15:36 +02:00
pelya
b2bc556137 Revert "Settings in three columns for tablets."
This reverts commit 94abe055a2.
2014-03-15 23:53:18 +02:00
Juanjo
94abe055a2 Settings in three columns for tablets. 2014-03-15 22:52:13 +02:00
Juanjo
a4c6102822 Add settings for touchscreen controls. 2014-03-15 22:51:42 +02:00
Juanjo
f43337d022 Some amends about sizings. 2014-03-15 21:56:55 +02:00
Juanjo
3f81edb664 More sizing and centering. 2014-03-15 21:36:24 +02:00
Juanjo
0442649289 Add min sizing. 2014-03-15 21:35:16 +02:00
Juanjo
cab76bd7af Draw strings vertically aligned on some windows. 2014-03-15 21:34:36 +02:00
pelya
6dc8be0332 Android patches 2014-03-15 19:44:27 +02:00
alberth
9c2ba28589 (svn r26322) -Feature: Warn the user about empty setting search results too. 2014-02-09 13:06:35 +00:00
alberth
27849aad18 (svn r26321) -Feature: Warn the user about missing setting search results due to filtering. 2014-02-09 13:05:46 +00:00
alberth
e3583b4cd1 (svn r26320) -Add: Label for both the filter category and filter type in the advanced settings window. 2014-02-09 13:04:50 +00:00
rubidium
4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00