Sergii Pylypenko
|
66e3334f0e
|
Merge upstream branch 1.8
|
2018-05-31 22:59:50 +03:00 |
|
Sergii Pylypenko
|
35d1878dd9
|
More Android patches reverted
|
2018-05-31 22:09:18 +03:00 |
|
frosch
|
b4b98e5165
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
2017-08-13 18:38:42 +00:00 |
|
Sergii Pylypenko
|
21c13781e4
|
Fixed a crash in confirmation dialog
|
2017-03-17 22:40:04 +02:00 |
|
Sergii Pylypenko
|
96501e9f08
|
Warning: crashes! Confirmation dialog will also show estimated cost
|
2017-03-17 22:40:04 +02:00 |
|
pelya
|
9cf2149c78
|
Fixed UI when building with non-autorail tool with confirmation window
|
2017-03-17 22:40:04 +02:00 |
|
pelya
|
8a27d0bb1e
|
Fixed non-autorail building with confirmation dialog, UI is still slightly broken
|
2017-03-17 22:40:04 +02:00 |
|
Sergii Pylypenko
|
fd0a3f9ffc
|
Proper transparent confirmation window
|
2016-04-08 21:45:30 +03:00 |
|
Sergii Pylypenko
|
a1a662782c
|
Keep building area highlighted when confirmation window is shown
|
2016-04-08 21:45:29 +03: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 |
|
alberth
|
b1f1647303
|
(svn r27344) -Doc: Documenting the (Re)setObjectToPlace functions.
|
2015-07-28 08:16:52 +00:00 |
|
alberth
|
3cd390b2ce
|
(svn r27344) -Doc: Documenting the (Re)setObjectToPlace functions.
|
2015-07-28 08:16:52 +00:00 |
|
frosch
|
67ae231f1b
|
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
|
2015-07-26 09:47:17 +00:00 |
|
frosch
|
4830497f0b
|
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
|
2015-07-26 09:47:17 +00:00 |
|
frosch
|
f27dc40c8a
|
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
|
2015-04-25 11:58:19 +00:00 |
|
frosch
|
9fb56ca02e
|
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
|
2015-04-25 11:58:19 +00:00 |
|
pelya
|
8f7e444f4f
|
Allow scrolling when selecting destination station or building single-tile objects
|
2015-03-29 20:22:19 +03:00 |
|
pelya
|
0d3412d064
|
Hide all windows when selecting vehicle destination station
|
2015-03-29 20:22:18 +03:00 |
|
pelya
|
fdddd873dd
|
Auto-select last used tool when user cancels build action, only for roads now
|
2015-03-29 20:22:18 +03:00 |
|
frosch
|
8d04567343
|
(svn r27162) -Fix [FS#6208]: Tile selection was drawn outside of map in some cases. (adf88)
|
2015-02-22 15:05:48 +00:00 |
|
frosch
|
f26e9bf59d
|
(svn r27162) -Fix [FS#6208]: Tile selection was drawn outside of map in some cases. (adf88)
|
2015-02-22 15:05:48 +00:00 |
|
frosch
|
939719ffc0
|
(svn r27161) -Fix [FS#6156] [FS#6206]: Reimplement the viewport drawing algorithm.
|
2015-02-22 14:42:34 +00:00 |
|
frosch
|
3adf082db2
|
(svn r27161) -Fix [FS#6156] [FS#6206]: Reimplement the viewport drawing algorithm.
|
2015-02-22 14:42:34 +00:00 |
|
frosch
|
d35670aa2a
|
(svn r27160) -Fix: Division of signed values by TILE_SIZE requires cast to stay signed.
|
2015-02-22 14:14:30 +00:00 |
|
frosch
|
cfac8dbbc6
|
(svn r27160) -Fix: Division of signed values by TILE_SIZE requires cast to stay signed.
|
2015-02-22 14:14:30 +00:00 |
|
frosch
|
79380a566e
|
(svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code.
|
2015-02-22 14:10:44 +00:00 |
|
frosch
|
06d1d50884
|
(svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code.
|
2015-02-22 14:10:44 +00:00 |
|
frosch
|
bd3a8bf9e4
|
(svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges.
|
2015-02-22 14:01:24 +00:00 |
|
frosch
|
e8e49e5dda
|
(svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges.
|
2015-02-22 14:01:24 +00:00 |
|
frosch
|
891e4c40ce
|
(svn r27148) -Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty.
|
2015-02-14 12:53:07 +00:00 |
|
frosch
|
2e1be6081d
|
(svn r27148) -Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty.
|
2015-02-14 12:53:07 +00:00 |
|
rubidium
|
0c2f4bdc2b
|
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
|
2014-10-15 18:31:37 +00:00 |
|
rubidium
|
d534c80e94
|
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
|
2014-10-15 18:31:37 +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 |
|
rubidium
|
fddeeb5e49
|
(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 |
|
rubidium
|
22dd5ddca1
|
(svn r26910) -Fix: account for the height of the landscape at the edge of the map to determine the scroll boundaries (based on patch by ic111)
|
2014-09-22 18:14:44 +00:00 |
|
rubidium
|
a229fb79b5
|
(svn r26910) -Fix: account for the height of the landscape at the edge of the map to determine the scroll boundaries (based on patch by ic111)
|
2014-09-22 18:14:44 +00:00 |
|
rubidium
|
1c077e596b
|
(svn r26908) -Codechange: replace a magic number by a more logical calculation
|
2014-09-22 15:04:18 +00:00 |
|
rubidium
|
adf237d550
|
(svn r26908) -Codechange: replace a magic number by a more logical calculation
|
2014-09-22 15:04:18 +00:00 |
|
rubidium
|
dfd472f4a4
|
(svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111)
|
2014-09-21 17:29:48 +00:00 |
|
rubidium
|
073aa05da5
|
(svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111)
|
2014-09-21 17:29:48 +00:00 |
|
rubidium
|
6cee5310c1
|
(svn r26899) -Codechange: reduce the amount of tiles that needs to be drawn by taking the height of tiles into account instead of drawing way too many (ic111)
|
2014-09-21 17:27:37 +00:00 |
|
rubidium
|
4d619ad10e
|
(svn r26899) -Codechange: reduce the amount of tiles that needs to be drawn by taking the height of tiles into account instead of drawing way too many (ic111)
|
2014-09-21 17:27:37 +00:00 |
|
rubidium
|
44bcff645c
|
(svn r26870) -Fix (r15190): since freeform edges the 'tile height' at southern edge * 8 pixels just 'south' of the edge tile would not be drawn and would as a result not be refreshed causing artefacts to remain there. This adds a virtual slope to level 0 so it can be redrawn appropriately. Loosely based on patch by ic111
|
2014-09-21 08:19:32 +00:00 |
|
rubidium
|
c9d7e89138
|
(svn r26870) -Fix (r15190): since freeform edges the 'tile height' at southern edge * 8 pixels just 'south' of the edge tile would not be drawn and would as a result not be refreshed causing artefacts to remain there. This adds a virtual slope to level 0 so it can be redrawn appropriately. Loosely based on patch by ic111
|
2014-09-21 08:19:32 +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 |
|
pelya
|
f469e7f57b
|
Show info about facility/station/vehicle on mouse up instead of mouse down, to allow better map dragging.
|
2014-06-01 01:23:34 +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 |
|