Sergii Pylypenko
66e3334f0e
Merge upstream branch 1.8
2018-05-31 22:59:50 +03:00
frosch
0d1cc32b19
(svn r27952) -Change: Reword texts in industry view, when stockpiling is used.
2017-12-27 21:54:52 +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
alberth
34ca88c098
(svn r27751) -Feature: Display cargo suffix of accepted cargoes in industry view based on cb37 result type.
...
Industry-sets that have no stockpiling get better control over the displayed accepted cargo information.
- result 0401 only prints the accepted cargo
- results 0800-0BFF prints the accepted cargo and a string (but not the amount)
2017-02-26 15:34:15 +00:00
alberth
dcc240f826
(svn r27751) -Feature: Display cargo suffix of accepted cargoes in industry view based on cb37 result type.
...
Industry-sets that have no stockpiling get better control over the displayed accepted cargo information.
- result 0401 only prints the accepted cargo
- results 0800-0BFF prints the accepted cargo and a string (but not the amount)
2017-02-26 15:34:15 +00:00
alberth
5bcca41ace
(svn r27750) -Codechange: Add cb37 result type to the cargo suffix.
2017-02-26 15:33:39 +00:00
alberth
325a46e8ed
(svn r27750) -Codechange: Add cb37 result type to the cargo suffix.
2017-02-26 15:33:39 +00:00
alberth
c9a8360419
(svn r27749) -Codechange: Fold cb37 cargo suffix text in a structure.
2017-02-26 15:30:25 +00:00
alberth
e8635aca1a
(svn r27749) -Codechange: Fold cb37 cargo suffix text in a structure.
2017-02-26 15:30:25 +00:00
Sergii Pylypenko
d49e71d803
Build confirmation window, for each build action on the map
2016-04-08 21:45:29 +03: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
4a6036208a
(svn r27277) -Codechange: Make _displayed_industries a std::bitset.
2015-05-09 09:24:19 +00:00
frosch
5e47c27550
(svn r27277) -Codechange: Make _displayed_industries a std::bitset.
2015-05-09 09:24:19 +00:00
peter1138
6872b647f1
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
2014-10-05 11:20:02 +00:00
peter1138
0877f892c5
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
2014-10-05 11:20:02 +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
alberth
633ac888f6
(svn r26723) -Fix[FS#5997]: Properly check for cargo acceptance of houses.
2014-08-09 19:32:51 +00:00
alberth
be4bbf7dd9
(svn r26723) -Fix[FS#5997]: Properly check for cargo acceptance of houses.
2014-08-09 19:32:51 +00:00
planetmaker
796fcaa9e1
(svn r26656) -Fix [FS#6044]: Production cheat cannot not be allowed to be active in multiplayer for desync reasons, even when activated in singleplayer previously
2014-06-20 20:04:10 +00:00
planetmaker
73bfec0fc8
(svn r26656) -Fix [FS#6044]: Production cheat cannot not be allowed to be active in multiplayer for desync reasons, even when activated in singleplayer previously
2014-06-20 20:04:10 +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
frosch
1b0929a9f0
(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
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
141bb0861e
Before opening linked to main toolbar windows, delete linked windows.
2014-03-15 22:56:17 +02:00
Juanjo
7079e675bf
Align construction windows with main toolbar.
2014-03-15 22:53:35 +02:00
Juanjo
96d3b0695c
Amend gui's to work with touchscreen controls.
2014-03-15 22:23:22 +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
d95a9c6160
Add a setting for automatically set min sizing values.
2014-03-15 21:37:17 +02:00
Juanjo
3f81edb664
More sizing and centering.
2014-03-15 21:36:24 +02:00
Juanjo
0442649289
Add min sizing.
2014-03-15 21:35:16 +02:00
Juanjo
cab76bd7af
Draw strings vertically aligned on some windows.
2014-03-15 21:34:36 +02:00
frosch
7b238142b8
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
2014-01-12 18:00:39 +00:00
frosch
ba1779b978
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
2014-01-12 18:00:39 +00: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
rubidium
3784110fe6
(svn r26080) -Fix: possible out of bounds array access
2013-11-24 09:30:30 +00:00
rubidium
a8e8f606d8
(svn r26080) -Fix: possible out of bounds array access
2013-11-24 09:30:30 +00:00
frosch
670c4879cf
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
2013-10-12 16:33:19 +00:00
frosch
6a0439a789
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
2013-10-12 16:33:19 +00:00
frosch
0c42bd6a7b
(svn r25732) -Fix: In BuildIndustryWindow in RTL mode, draw industry color icon at the right. (sbr)
2013-08-18 20:06:01 +00:00
frosch
87ef3ab449
(svn r25732) -Fix: In BuildIndustryWindow in RTL mode, draw industry color icon at the right. (sbr)
2013-08-18 20:06:01 +00:00
fonsinchen
4396dcf642
(svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0
2013-08-10 12:47:24 +00:00
fonsinchen
0baa72aff9
(svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0
2013-08-10 12:47:24 +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