Commit Graph

753 Commits

Author SHA1 Message Date
pelya
0d868d80bd Merge branch 'master' into 1.5
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/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/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/station_gui.cpp
	src/table/settings.ini
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2015-03-29 21:48:14 +03:00
pelya
e0efbfbd75 Fixed network save setting not saved to config file 2015-03-29 20:19:58 +03:00
pelya
be3f236eaf Cloudsave support 2015-03-29 20:19:53 +03:00
pelya
7fa4e7bbc3 WIP backup savegames to network 2015-03-29 20:19:04 +03:00
rubidium
7ae2a1764d (svn r27183) -Fix: GCC5 compilation 2015-03-13 19:42:49 +00:00
frosch
6cb930168f (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 2015-02-22 15:26:27 +00:00
frosch
04b8fe6d0b (svn r27151) -Add: Allow changing max heightlevel in scenario editor. 2015-02-14 21:55:30 +00:00
frosch
3d37abf802 (svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels. 2015-02-12 20:00:23 +00:00
frosch
f933dec10b (svn r27137) -Fix (r0): Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion. 2015-02-06 21:54:19 +00:00
peter1138
2c21d4fbd1 (svn r27048) -Fix (r26158): Position in articulated vehicle is 4D, not 4A. 2014-10-28 00:51:51 +00:00
rubidium
0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
0efe811f74 (svn r27009) -Add: extra level of general map heightness (ChillCore) 2014-10-13 14:22:48 +00:00
rubidium
26574124b1 (svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param 2014-10-12 18:26:54 +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
ee266b9b9d (svn r26965) -Codechange: Add palette bit to indicate that palette is actually a text colour remap, and draw closebox as a sprite, using said bit. Change news popup to use closebox widget for its closebox. 2014-10-05 21:18:37 +00:00
rubidium
340ecd7385 (svn r26930) -Add: extra shadings to he heightmap colour tables (Chillcore) 2014-09-27 14:51:34 +00:00
rubidium
4b8d6ee319 (svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111) 2014-09-27 11:17:54 +00:00
rubidium
ae406cf52e (svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder 2014-09-27 10:43:59 +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
rubidium
ab3660278a (svn r26880) -Add: stub settings for limiting bridge and map height 2014-09-21 11:27:34 +00:00
rubidium
6592da4952 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 2014-09-21 07:57:45 +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
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
3cb6c7d5ee Fixed right toolbar moving to the left, removed remainder of 'touchscreen mode' stuff 2014-06-03 21:55:41 +03:00
Sergii Pylypenko
41da4be66b Removed remainder of the 'touchscreen mode' code 2014-06-03 20:27:45 +03:00
pelya
9923ecfed0 Vertical toolbar is drawn okay, but does not work 2014-06-02 00:15:15 +03:00
pelya
9f780643ed WIP do not compile - split toolbar into two vertical toolbars 2014-06-01 13:45:45 +03: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
fffab86525 (svn r26528) -Remove: A bunch of archaic settings from the advanced settings GUI. 2014-04-27 15:35:31 +00:00
frosch
b2c786ea68 (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes.
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
2014-04-27 12:15:14 +00:00
pelya
982c84b3ee Removed unused variable 2014-03-23 15:39:18 +02:00
Juanjo
4f60841795 Base functions for a confirm action mode. 2014-03-15 22:52:14 +02:00
Juanjo
a4c6102822 Add settings for touchscreen controls. 2014-03-15 22:51:42 +02:00
Juanjo
d95a9c6160 Add a setting for automatically set min sizing values. 2014-03-15 21:37:17 +02:00
Juanjo
0442649289 Add min sizing. 2014-03-15 21:35:16 +02:00
frosch
ce92faf682 (svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor. 2014-03-03 20:02:31 +00:00
frosch
1f056ce552 (svn r26374) -Fix [FS#5928]: Mixed up callback mask flags in station inspect window. (adf88) 2014-02-24 19:22:22 +00:00
fonsinchen
193a20d260 (svn r26323) -Fix: update some constants related to map size. 2014-02-09 15:00:30 +00:00
frosch
968ba79de2 (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 2014-01-12 18:01:33 +00:00
frosch
cb6aee2f27 (svn r26237) -Cleanup: Remove unused SCC_STRING_ID. 2014-01-12 17:59:27 +00:00
frosch
e6f83028f6 (svn r26206) -Fix [FS#5829]: Run everything from ini, obg, obs, obs, ... files through str_validate. 2014-01-02 17:55:57 +00:00
frosch
9a00a23656 (svn r26158) -Fix: NewGRF inspect window lacked several newer variables. 2013-12-13 20:52:25 +00:00
rubidium
a498a56573 (svn r26130) -Codechange: add some guards against using invalid image indices 2013-11-26 16:08:58 +00:00
rubidium
ecfed05729 (svn r26050) -Fix: possible, but currently untriggered, out of bounds access in strgen 2013-11-22 21:43:47 +00:00
frosch
0d5ab589fe (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 2013-10-27 15:09:41 +00:00
planetmaker
91c3c20cc5 (svn r25876) -Codechange: Unify object placement during map creation 2013-10-17 21:41:17 +00:00
planetmaker
dd7cfa310d (svn r25874) -Add: [NewGRF] NewObject property 0x10, bit 13 indicating that object amount scales with water content of map border (e.g. used for lighthouses) 2013-10-17 21:31:53 +00:00
planetmaker
18ea5a8544 (svn r25873) -Codechange: Add property for the amount of generated objects upon map creation to default objects 2013-10-17 21:27:08 +00:00