3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
11ba094582
Feature #4186 : Append '(City)' behind cities in the town directory (sbr)
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
eaa32f5ad5
Change: Use name of cargo instead of Passengers/Mail in town statistics. ( #6801 )
...
* Change: Use name of cargo instead of Passengers/Mail in town statistics.
* Cleanup: Remove strings from all language files.
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
6 years ago
cfb8092397
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
6 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
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
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
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
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
0fd34a17a5
Update to v4 of house placing patch.
8 years ago
e191dc959c
Fix stray uses of override instead of OVERRIDE macro.
9 years ago
531956bb4d
Merge branch 'house_placing' into jgrpp
9 years ago
7bd91f172b
Change house GUI picker logic to be more like object GUI window.
...
Deselect house on object placement abort.
Set object placement on init or house selection.
Adjust display to still work even if no house selected,
by continuing to show the previous selection.
9 years ago
b67d139317
Merge branch 'house_placing' into jgrpp
9 years ago
7040d61287
House picker: Allow only one instance, remove button toggle behaviour.
...
This makes it behave more like object picker window.
9 years ago
6d5833dfe8
Merge branch 'house_placing' into jgrpp
9 years ago
3e8611fca1
House placing: Fix uninitialised variable.
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
19dcbb1cb9
Import Picking and placing single houses in scenario editor patch
...
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
9 years ago
bd50600f5b
(svn r27341) -Fix [FS#6332]: Do not rerandomise the town name when only cost-estimating the founding.
9 years ago
a81968d0f3
(svn r27341) -Fix [FS#6332]: Do not rerandomise the town name when only cost-estimating the founding.
9 years ago
6872b647f1
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
0877f892c5
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
fba10bead9
(svn r26859) -Fix [FS#6119]: Height computation of game script text in town GUI did not consider margins.
10 years ago
c4fcc8d2aa
(svn r26859) -Fix [FS#6119]: Height computation of game script text in town GUI did not consider margins.
10 years ago
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
10 years ago
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
10 years ago
5c3b3f84d6
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
10 years ago
5370613924
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
10 years ago
56365e81e1
(svn r25922) -Codechange: Rename TOWN_IS_FUNDED to TOWN_IS_GROWING. It is not tied to funding a town.
11 years ago
12b30103b1
(svn r25922) -Codechange: Rename TOWN_IS_FUNDED to TOWN_IS_GROWING. It is not tied to funding a town.
11 years ago
853908c901
(svn r25630) -Fix [FS#5666]: city list sort of population and rating are reversed compared to the icon
11 years ago
184e7744c3
(svn r25630) -Fix [FS#5666]: city list sort of population and rating are reversed compared to the icon
11 years ago
13badddd75
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
11 years ago
4e4e635916
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
11 years ago
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
b803d0c1dd
(svn r25097) -Feature[FS#5288]: Add sorting on rating for the town directory window (based on work by sbr).
11 years ago
d5307c9722
(svn r25097) -Feature[FS#5288]: Add sorting on rating for the town directory window (based on work by sbr).
11 years ago
b84f833b94
(svn r25096) -Feature: Do descending sort order on population by default, and stabilize sort of equally populated towns.
11 years ago
Jonathan G Rennison
Alberth289346
PeterN
Pavel Stupnikov
J0an Josep
frosch
patch-import
peter1138
rubidium
alberth