Commit Graph

339 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
ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
pelya
8f7e444f4f Allow scrolling when selecting destination station or building single-tile objects 2015-03-29 20:22:19 +03:00
pelya
6f9c0181c1 Align all construction windows to the left, to make more space at the center of the screen 2015-03-29 20:22:18 +03:00
pelya
bde4cdebc1 Fixed too wide buttons in the railroad semaphore dialog 2015-03-29 20:22:18 +03:00
Sergii Pylypenko
400b6daad0 Auto-select last used tool for railroad 2015-03-29 20:22:18 +03:00
pelya
396aebaa98 Shorter rail station construction window 2015-03-29 20:22:18 +03: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
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
peter1138
4f63bbedc1 (svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level. 2014-09-22 08:01:25 +00:00
pelya
d3e9368f34 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/autoreplace_gui.cpp
2014-06-15 22:32:06 +03:00
frosch
7b3ead329b (svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours. 2014-06-10 16:37:25 +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
41da4be66b Removed remainder of the 'touchscreen mode' code 2014-06-03 20:27:45 +03:00
Sergii Pylypenko
742f20fcc3 Revert "Erase queued command also when depot direction/airport type/station type changes."
This reverts commit 60a7ac9f3c.
2014-06-03 18:44:34 +03:00
Sergii Pylypenko
b2bfcf6816 Revert "Erase queued commands when another command is about to be queued."
This reverts commit 604205045f.
2014-06-03 18:44:16 +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
Sergii Pylypenko
1362aaab60 Fixed 'build waypoint' button building a train station. 2014-05-28 22:41:25 +03: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
55a09da6b2 Merge remote-tracking branch 'upstream/master' 2014-03-23 19:04:54 +02:00
frosch
5c3b3f84d6 (svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose. 2014-03-23 13:28:32 +00:00
Juanjo
141bb0861e Before opening linked to main toolbar windows, delete linked windows. 2014-03-15 22:56:17 +02:00
Juanjo
604205045f Erase queued commands when another command is about to be queued. 2014-03-15 22:53:35 +02:00
Juanjo
60a7ac9f3c Erase queued command also when depot direction/airport type/station type changes. 2014-03-15 22:53:35 +02:00
Juanjo
b164486616 Reset queued command when closing windows that can queue them. 2014-03-15 22:53:35 +02:00
Juanjo
02caad7c1b Select the actions that will need confirmation. 2014-03-15 22:53:35 +02:00
Juanjo
381c4e98aa Place station when releasing the mouse. 2014-03-15 21:56:55 +02:00
Juanjo
c872509d7b Do actions when releasing the mouse, instead of when clicking:
Build town, industry, airport, dock, lock,
buoy, aqueduct, depots, change bridge rail/road specs.
2014-03-15 21:56:55 +02:00
Juanjo
7b1560dcb6 Center sprites on station picker for road stations and rail stations. 2014-03-15 21:36:24 +02:00
Juanjo
4c8c1ce146 Add min sizings to some construction buttons. 2014-03-15 21:35:41 +02:00
frosch
504bd2a913 (svn r26375) -Fix [FS#5929]: Station sizes > 8 were always allowed. (adf88) 2014-02-24 19:57:18 +00:00
rubidium
c1cbc05ca7 (svn r26088) -Fix (r26086): Windows compilation 2013-11-24 15:17:53 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium
34ae6d4b39 (svn r25972) -Fix [FS#5665]: rail laying sounds of others could be heard in multiplayer (adf88) 2013-11-12 21:48:55 +00:00
frosch
ee97c8cfdd (svn r25929) -Fix [FS#5733]: Position signal sprites size-aware in the signal GUI, that is: Center sprites horizontally, and align the vertical reference point at some baseline which centers the tallest sprite. 2013-10-28 13:39:18 +00:00
frosch
3c9cfb1678 (svn r25928) -Fix [FS#5733]: Reserve enough space for two digits of signal density. (adf88) 2013-10-28 13:04:34 +00:00
frosch
3d34b5c5a2 (svn r25927) -Fix [FS#5733]: Consider size of signal sprites for sizing the signal GUI. (based on patch by adf88) 2013-10-28 12:59:44 +00:00
zuu
ac08e89a32 (svn r25854) -Change: Display the cost to upgrade a bridge at the end of bridge that was clicked and not the other end, which could be outside of the screen in some cases (cirdan, LordAro) 2013-10-12 22:45:19 +00:00
frosch
538159cb1d (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 2013-06-30 14:36:31 +00:00
frosch
bc4423300d (svn r25535) -Fix [FS#5584]: Initialise scrollbars before FinishInitNested, so their capacity is set via OnResize. 2013-06-30 14:35:44 +00:00
frosch
ac73a5fea6 (svn r25532) -Fix: Do not make the minimal size of matrix or panel widgets depend on their number of rows, since that changes when resizing the window. 2013-06-30 14:33:15 +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
4a8f47b9a5 (svn r25464) -Fix: Hide default size button in non-newstation rail-station picker since it is not resizeable anyway. 2013-06-25 20:22:08 +00:00
frosch
173aed1687 (svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList. 2013-06-15 15:31:22 +00:00
frosch
303aa2f473 (svn r25412) -Codechange: Make use of Window::OnHotkey 2013-06-15 15:30:44 +00:00
frosch
1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 2013-06-15 15:28:09 +00:00
frosch
55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 2013-06-15 15:27:33 +00:00
frosch
fdd94f7601 (svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file. 2013-06-15 15:05:54 +00:00
frosch
01dc8ee620 (svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window. 2013-06-11 18:36:26 +00:00
frosch
13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00