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

384 Commits

Author SHA1 Message Date
Sergii Pylypenko 66e3334f0e Merge upstream branch 1.8 2018-05-31 22:59:50 +03:00
pelya 0f91382c7b Hide title bars for all windows when 'title bars' option is de-selected 2018-05-31 21:55:28 +03:00
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch a682962719 (svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88) 2017-07-11 19:37:10 +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
frosch ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
frosch 2d636266f5 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
frosch 8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
frosch a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
peter1138 217635d357 (svn r26935) -Codechange: Fit company colour selection drop down list to UI scale. 2014-09-28 19:19:47 +00:00
peter1138 58458c6652 (svn r26935) -Codechange: Fit company colour selection drop down list to UI scale. 2014-09-28 19:19:47 +00:00
peter1138 c2d4068a5e (svn r26856) -Codechange: Ensure company face widgets can fit company face. 2014-09-20 09:18:22 +00:00
peter1138 ea33b69798 (svn r26856) -Codechange: Ensure company face widgets can fit company face. 2014-09-20 09:18:22 +00:00
pelya c938b99716 Fixed company face selection dialog too tall 2014-08-19 19:12:01 +03: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 a0581f42bd Revert "Select the actions that will need confirmation." 
This reverts commit 02caad7c1b.
 2014-06-03 18:14:15 +03:00
frosch 7a6d2e0110 (svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM 2014-04-27 15:30:53 +00:00
frosch 2a16c33461 (svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM 2014-04-27 15:30:53 +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
Sergii Pylypenko 121a8ad773 Merge remote-tracking branch 'upstream/master' 2014-03-19 22:01:51 +02:00
planetmaker f44d54a9e4 (svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch) 2014-03-18 20:53:34 +00:00
planetmaker 3dd1a6ad2d (svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch) 2014-03-18 20:53:34 +00:00
Juanjo 02caad7c1b Select the actions that will need confirmation. 2014-03-15 22:53:35 +02:00
Juanjo 94c01f0c66 Sizing and centering of owner face window. 2014-03-15 21:36:24 +02:00
Juanjo 0442649289 Add min sizing. 2014-03-15 21:35:16 +02:00
rubidium 201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium 83eeba28b7 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
frosch f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +00:00
frosch 98fdd20f84 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +00:00
rubidium c4719635e9 (svn r25517) -Fix-ish (r25515) / Feature-ish [FS#5623]: properly align the statistics as well when the infra sharing is turned on 2013-06-29 13:19:19 +00:00
rubidium 4356510408 (svn r25517) -Fix-ish (r25515) / Feature-ish [FS#5623]: properly align the statistics as well when the infra sharing is turned on 2013-06-29 13:19:19 +00:00
rubidium 45d3369502 (svn r25516) -Codechange: reduce code duplication in infrastructure statistics window 2013-06-29 13:11:52 +00:00
rubidium ba1e42d057 (svn r25516) -Codechange: reduce code duplication in infrastructure statistics window 2013-06-29 13:11:52 +00:00
rubidium 0a880b87c3 (svn r25515) -Feature [FS#5595]: right align the infrastructure statistics 2013-06-29 12:41:43 +00:00
rubidium c27ce651c9 (svn r25515) -Feature [FS#5595]: right align the infrastructure statistics 2013-06-29 12:41:43 +00:00
rubidium aa9bf82121 (svn r25442) -Codechange: move height and ascender information into the FontCache instances 2013-06-23 15:32:09 +00:00
rubidium d724088a1c (svn r25442) -Codechange: move height and ascender information into the FontCache instances 2013-06-23 15:32:09 +00:00
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch 8157a8afd8 (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 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
rubidium 0f53f270c1 (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 2013-02-04 20:29:38 +00:00
rubidium 99a08e1e8c (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 2013-02-04 20:29:38 +00:00
frosch eb20798aae (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 2012-12-08 17:18:51 +00:00
frosch b533523258 (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 2012-12-08 17:18:51 +00:00
frosch 3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
alberth 37cda0af25 (svn r24655) -Codechange(r18310): Difference between female and male is no longer needed for tie and earrings (found by botankras) 2012-10-31 20:54:19 +00:00
alberth f883454db2 (svn r24655) -Codechange(r18310): Difference between female and male is no longer needed for tie and earrings (found by botankras) 2012-10-31 20:54:19 +00:00