Jonathan G Rennison
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
Peter Nelson
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
6 years ago
Jonathan G Rennison
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
Alexis
25dbc6542c
Fix #6659 : Bus stations can be demolished when not in demolish mode ( #6815 )
...
For Bus and Road stations only, if you are in demolish mode and click on the station
without releasing the button. Then you cancel demolish mode with R key.
Finally you release the mouse button. The station was demolished, instead of being built.
The demolish mode was not checked when mouse up event occured.
6 years ago
Jonathan G Rennison
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
8 years ago
frosch
1d67a4e88d
(svn r27734) -Change: Hide the drive-in stops from the tram station picker.
8 years ago
frosch
2f5cc263c7
(svn r27734) -Change: Hide the drive-in stops from the tram station picker.
8 years ago
Jonathan G Rennison
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
Jonathan G Rennison
3af2f0e923
When building tunnels, open new viewports at the far end of the tunnel.
...
Loosely based on https://www.tt-forums.net/viewtopic.php?f=33&t=72639
8 years ago
Jonathan G Rennison
09291a3b74
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
frosch
8084f39bf3
(svn r27577) -Fix [FS#6386]: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen. (Eearslya)
8 years ago
frosch
b1272ee714
(svn r27577) -Fix [FS#6386]: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen. (Eearslya)
8 years ago
frosch
9aa33862a7
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
8 years ago
frosch
14c1a7ad0b
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
8 years ago
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
michi_cc
2b8bb12d62
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
michi_cc
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
Jonathan G Rennison
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
frosch
0ea4127837
(svn r27251) -Feature [FS#6252]: Make Ctrl+Remove-Roadstop also remove the road, just like for rail stations. (adf88)
10 years ago
frosch
e9c3ca62cd
(svn r27251) -Feature [FS#6252]: Make Ctrl+Remove-Roadstop also remove the road, just like for rail stations. (adf88)
10 years ago
frosch
c639fb0d8e
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
10 years ago
frosch
6cb930168f
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
10 years ago
frosch
a8080b6256
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
frosch
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
alberth
b67d483b46
(svn r27084) -Doc: Improve documentation of AllocateWindowDescFront.
10 years ago
alberth
edea2ce96d
(svn r27084) -Doc: Improve documentation of AllocateWindowDescFront.
10 years ago
peter1138
4f63bbedc1
(svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level.
10 years ago
peter1138
51fe741987
(svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level.
10 years ago
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
11 years ago
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
11 years ago
frosch
5c3b3f84d6
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
11 years ago
frosch
5370613924
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
11 years ago
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)
11 years ago
zuu
15ebb29447
(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)
11 years ago
frosch
173aed1687
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
11 years ago
frosch
fef30983e6
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
11 years ago
frosch
303aa2f473
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
frosch
5cb174c6b8
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
frosch
1565bb32a0
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
11 years ago
frosch
1b8b1f3f6c
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
11 years ago
frosch
55154f91b6
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
frosch
d9e9710cb3
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
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.
11 years ago
frosch
9cb89b3639
(svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window.
11 years ago
frosch
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
12 years ago
frosch
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
12 years ago
frosch
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
12 years ago
frosch
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
12 years ago
zuu
327ade9ecc
(svn r24948) -Codechange: Do not assume CA_BUS and CA_TRUCK to be equal, instead let the compiler optimize the code if that is the case. (ComLock)
12 years ago
zuu
24fd67f9d6
(svn r24948) -Codechange: Do not assume CA_BUS and CA_TRUCK to be equal, instead let the compiler optimize the code if that is the case. (ComLock)
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
frosch
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
frosch
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
truebrain
c74ccfff1b
(svn r23601) -Fix: fix the conflict in window number
13 years ago
truebrain
561b25d031
(svn r23601) -Fix: fix the conflict in window number
13 years ago
planetmaker
85df9df9b6
(svn r23559) -Codechange: Document and name consistently road build widgets
13 years ago
planetmaker
6bbae674b8
(svn r23559) -Codechange: Document and name consistently road build widgets
13 years ago
truebrain
d1dc135461
(svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile
13 years ago
truebrain
98d3f11d45
(svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile
13 years ago
truebrain
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
truebrain
2aa774e831
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
rubidium
6e9122828e
(svn r22406) -Document: some more "random-ish" tidbits
14 years ago
rubidium
5a620d1c65
(svn r22406) -Document: some more "random-ish" tidbits
14 years ago
frosch
4b4a40a72e
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
14 years ago
frosch
ec9540a12a
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
14 years ago
rubidium
cb2c7f871f
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
14 years ago
rubidium
bc3ce1e53b
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
14 years ago
terkhen
d865c6ea02
(svn r21779) -Cleanup(r21778): Remove unneeded space at the start of a line.
14 years ago
terkhen
1b237216a8
(svn r21779) -Cleanup(r21778): Remove unneeded space at the start of a line.
14 years ago
terkhen
6877ab9d05
(svn r21778) -Add: After building a road or tram tunnel, connect it to any existing road or tram.
14 years ago
terkhen
eb2b510e01
(svn r21778) -Add: After building a road or tram tunnel, connect it to any existing road or tram.
14 years ago
terkhen
3f3d477457
(svn r21776) -Codechange: Give a more appropriate name to the road connection function.
...
-Document: Add doxygen comments to the function.
14 years ago
terkhen
998246430a
(svn r21776) -Codechange: Give a more appropriate name to the road connection function.
...
-Document: Add doxygen comments to the function.
14 years ago
alberth
7d989073d4
(svn r21627) -Codechange: Remove _place_proc global variable.
14 years ago
alberth
852e647bcc
(svn r21627) -Codechange: Remove _place_proc global variable.
14 years ago
alberth
38a59fb3f3
(svn r21609) -Fix (r21545,r21552,r21580,r21586): Restore diagonal clearing of areas.
14 years ago
alberth
802ec80c5d
(svn r21609) -Fix (r21545,r21552,r21580,r21586): Restore diagonal clearing of areas.
14 years ago
alberth
cf72e1c418
(svn r21552) -Codechange: Move short callback functions into the switch.
14 years ago
alberth
23e3766bfb
(svn r21552) -Codechange: Move short callback functions into the switch.
14 years ago
alberth
ae06b95793
(svn r21551) -Codechange: Record the last started user action, and use that in the callback.
14 years ago
alberth
896c4acda1
(svn r21551) -Codechange: Record the last started user action, and use that in the callback.
14 years ago
alberth
353f42b244
(svn r21550) -Codechange: Move the small static functions into the switch.
14 years ago
alberth
22273fb8e8
(svn r21550) -Codechange: Move the small static functions into the switch.
14 years ago
alberth
0d131665ba
(svn r21549) -Codechange: Unfold the _build_road_button_proc array into a switch.
14 years ago
alberth
27d4a64020
(svn r21549) -Codechange: Unfold the _build_road_button_proc array into a switch.
14 years ago
alberth
b3b4bd0b07
(svn r21548) -Codechange: Code style, multi line statements should indent two tabs.
14 years ago
alberth
1e07f74b1e
(svn r21548) -Codechange: Code style, multi line statements should indent two tabs.
14 years ago
alberth
0722492c1b
(svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint().
14 years ago
alberth
f5c6fd1a25
(svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint().
14 years ago
terkhen
6c9580d6d0
(svn r20856) -Fix [FS#4141]: Road/water toolbars did not get updated when the first vehicle of their type becomes available.
14 years ago
terkhen
897bb71621
(svn r20856) -Fix [FS#4141]: Road/water toolbars did not get updated when the first vehicle of their type becomes available.
14 years ago
rubidium
360d6daf34
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
rubidium
30f2afac9b
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
frosch
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
frosch
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
rubidium
8c85b4ce3d
(svn r20281) -Codechange: unify case scope closure + break coding style
14 years ago
rubidium
e356cb9405
(svn r20281) -Codechange: unify case scope closure + break coding style
14 years ago
yexo
1e05ef9480
(svn r20073) -Feature: customizable hotkeys for the road toolbar
14 years ago