miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,106 Commits 14 Branches 28 Tags
5be853ed096240719db6589718aa138992273ef5
Commit Graph

1020 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
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
bdf090b406 (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
frosch
0982762c22 (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
rubidium
d1429cd936 (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
1088ad48fc (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
peter1138
253c91b17d (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
frosch
33f4f0b464 (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
peter1138
42c65264f8 (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
d600334c09 (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
c72d362840 (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
rubidium
ce04c49e3d (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
peter1138
e353ef5908 (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
planetmaker
61e129cc22 (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
frosch
c3c966fd79 (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
frosch
06b210ff42 (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
31095e4181 (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
7e928a6b80 (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
0d565ae612 (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
0c9e666d96 (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
01d9c7b336 (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
380a1de250 (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
0ba81bff17 (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
frosch
ebd2d3ccef (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