Sergii Pylypenko
|
3ba683874b
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2019-04-23 18:16:24 +03:00 |
|
Alexander Weiss
|
b3dc90af58
|
Change: Clone tool in depot window now behaves like clone button in vehicle window. Keep the tool active when share-cloning. Open the vehicle GUI when copy-cloning. (#6754)
|
2018-10-31 12:51:10 +01:00 |
|
Sergii Pylypenko
|
66e3334f0e
|
Merge upstream branch 1.8
|
2018-05-31 22:59:50 +03:00 |
|
frosch
|
42392fd7b5
|
(svn r27938) -Fix (r27899): When scrolling in the train depot, also scroll the tile separators.
|
2017-12-10 13:48:49 +00:00 |
|
frosch
|
c14f23a03d
|
(svn r27937) -Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end.
|
2017-12-10 13:48:06 +00:00 |
|
frosch
|
61c68f906d
|
(svn r27899) -Feature: Draw vertical separators at tile distance in the train depot GUI. This only applies if all vehicles use consistent lengths, i.e. either if only using default vehicles, or if only using NewGRF vehicles with 32px reference width. (based on patch by Wolf01)
|
2017-08-26 12:12:59 +00:00 |
|
frosch
|
b4b98e5165
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
2017-08-13 18:38:42 +00:00 |
|
Sergii Pylypenko
|
b4cc822085
|
Merge svn r27779
Conflicts:
src/autoreplace_gui.cpp
src/economy.cpp
src/fios_gui.cpp
src/lang/spanish_MX.txt
src/network/network_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/toolbar_gui.cpp
src/window.cpp
|
2017-03-17 23:14:41 +02:00 |
|
frosch
|
caa9bffb56
|
(svn r27630) -Codechange: Deduplicate code to attach vehicle to cursor.
|
2016-08-15 18:33:52 +00:00 |
|
frosch
|
ddc9205212
|
(svn r27630) -Codechange: Deduplicate code to attach vehicle to cursor.
|
2016-08-15 18:33:52 +00:00 |
|
frosch
|
0e3e4eeb53
|
(svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites.
|
2016-08-15 18:33:08 +00:00 |
|
frosch
|
3cb7d9703b
|
(svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites.
|
2016-08-15 18:33:08 +00:00 |
|
frosch
|
c5ae45c764
|
(svn r27583) -Fix [FS#6415]: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave. (Airbus)
|
2016-05-29 12:21:40 +00:00 |
|
frosch
|
7d4754a4f8
|
(svn r27583) -Fix [FS#6415]: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave. (Airbus)
|
2016-05-29 12:21:40 +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 |
|
alberth
|
e32afcc4ea
|
(svn r27450) -Feature[FS#6391](r27446): Lower the sell-chain button in the train depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-20 09:25:27 +00:00 |
|
alberth
|
3ccfc954f3
|
(svn r27450) -Feature[FS#6391](r27446): Lower the sell-chain button in the train depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-20 09:25:27 +00:00 |
|
frosch
|
1a0723579b
|
(svn r27446) -Feature: Lower the sell-vehicle button in the depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-14 22:54:52 +00:00 |
|
frosch
|
f6891ac30e
|
(svn r27446) -Feature: Lower the sell-vehicle button in the depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-14 22:54:52 +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 |
|
frosch
|
cd3f113249
|
(svn r27133) -Fix: Dragging of free wagons in depot failed with GUI zoom.
|
2015-02-01 19:40:04 +00:00 |
|
frosch
|
3bc7ee3ab7
|
(svn r27133) -Fix: Dragging of free wagons in depot failed with GUI zoom.
|
2015-02-01 19:40:04 +00:00 |
|
rubidium
|
ba96233b6e
|
(svn r27014) -Fix [FS#6102]: unit number was not always fully shown in depots
|
2014-10-14 11:40:38 +00:00 |
|
rubidium
|
deca49f4c6
|
(svn r27014) -Fix [FS#6102]: unit number was not always fully shown in depots
|
2014-10-14 11:40:38 +00:00 |
|
peter1138
|
f7f49c15a3
|
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
|
2014-10-04 16:40:23 +00:00 |
|
peter1138
|
ce9fab58bc
|
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
|
2014-10-04 16:40:23 +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 |
|
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 |
|
Juanjo
|
1fe633b7b7
|
Draw vehicles vertically aligned on vehicle list, vehicle info panel, etc.
|
2014-03-15 21:34:36 +02:00 |
|
Juanjo
|
dfa346f89f
|
Make icons for selling, selling all, autoreplacing,... the same height.
|
2014-03-15 21:33:24 +02:00 |
|
rubidium
|
e12e78b95b
|
(svn r26106) -Codechange: document fall through explicitly
|
2013-11-25 13:28:08 +00:00 |
|
rubidium
|
a399fc667c
|
(svn r26106) -Codechange: document fall through explicitly
|
2013-11-25 13:28:08 +00:00 |
|
frosch
|
068d1adfd6
|
(svn r25548) -Fix [FS#5629] (r25537): Removed too much code and forgot some other places.
|
2013-07-01 17:15:30 +00:00 |
|
frosch
|
3a81868518
|
(svn r25548) -Fix [FS#5629] (r25537): Removed too much code and forgot some other places.
|
2013-07-01 17:15:30 +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
|
43ec0bf0c1
|
(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
|
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 |
|
frosch
|
ddf817e8f3
|
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
|
2013-06-01 14:33:48 +00:00 |
|
frosch
|
ce110eed32
|
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
|
2013-06-01 14:33:48 +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 |
|
frosch
|
4e4e635916
|
(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 |
|
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 |
|
frosch
|
c5d7445704
|
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
|
2013-04-13 13:42:08 +00:00 |
|
frosch
|
5eddbb338b
|
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
|
2013-04-13 13:42:08 +00:00 |
|