6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
3 years ago
0125892f04
Fix #8297 : Infrastructure counters for road tunnels, bridges, depots … ( #8454 )
...
The previous fix 887e9481ff0e70df6bf93ce15a3899a03f124c50 only worked for roads and failed to consider a multiplier used for the infrastructure totals for tunnels/bridges.
Also, depots and bus/truck stops are counted as 2 road pieces on creation but were only counted as 1 road piece on conversion because the function DiagDirToRoadBits() was used, which only ever returns single-piece road segments.
Co-authored-by: A. S <admin-git@sotai.tk>
4 years ago
b623d6f2ee
Change: extend the allowed range for max loan setting ( #8386 )
...
(cherry picked from commit b2895dfcd0
4 years ago
ba4626d450
Add: new economy "frozen" that stops production changes and industry closures ( #8282 )
...
(cherry picked from commit c9fd85528a
4 years ago
b2895dfcd0
Change: extend the allowed range for max loan setting ( #8386 )
4 years ago
c9fd85528a
Add: new economy "frozen" that stops production changes and industry closures ( #8282 )
4 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
5d66d8fd7d
Codechange: Remove ExpensesTypeByte
5 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
944f785be8
Fix: Spelling errors ( #6769 )
6 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
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
c7620a1ea7
(svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies
11 years ago
ab69c6c2a0
(svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies
11 years ago
3d605f6488
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
13 years ago
df16ebd730
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
13 years ago
fc8633e1ac
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
d3b7b89493
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
796fe54a2f
(svn r23413) -Add: Company infrastructure counts for canals.
13 years ago
c06bbb4863
(svn r23413) -Add: Company infrastructure counts for canals.
13 years ago
85ec2f07af
(svn r23411) -Add: Company infrastructure counts for rail.
13 years ago
d30fcd4e35
(svn r23411) -Add: Company infrastructure counts for rail.
13 years ago
063931d435
(svn r21060) -Doc: Improved wording of comments (mostly by __ln__)
14 years ago
7e48d85104
(svn r21060) -Doc: Improved wording of comments (mostly by __ln__)
14 years ago
1f2276b785
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
14 years ago
3da3d131c6
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
14 years ago
7d3de0632d
(svn r20262) -Codechange: Remove unused ScoreInfo::id field, and doxyment the data structures.
14 years ago
3f62ee6355
(svn r20262) -Codechange: Remove unused ScoreInfo::id field, and doxyment the data structures.
14 years ago
f09a74a996
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
398418b8fa
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
170ad8a3c9
(svn r19720) -Feature: New base costs for building/clearing canals, building/clearing aqueducts and building/clearing locks.
14 years ago
52ab1c7d40
(svn r19720) -Feature: New base costs for building/clearing canals, building/clearing aqueducts and building/clearing locks.
14 years ago
d2e99657fa
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
53aaabe6e9
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
a493ba8f26
(svn r19131) -Doc: Add doxygen comments to some economy variables and constants.
15 years ago
ac65c41509
(svn r19131) -Doc: Add doxygen comments to some economy variables and constants.
15 years ago
d31d15ec00
(svn r18945) -Codechange: typo
15 years ago
a43a23b408
(svn r18945) -Codechange: typo
15 years ago
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
0f31a2f7e4
(svn r18284) -Cleanup (r18268, r18283): Replace magic value with enum.
15 years ago
324396ec74
(svn r18284) -Cleanup (r18268, r18283): Replace magic value with enum.
15 years ago
13a72bb345
(svn r18283) -Feature: [NewGRF] Add new price bases for removing industries, building/removing unmovables (new objects), building/removing rail-waypoints/buoys, interacting with town-authority, building foundations, funding primary industries (when not prospecting) and towns.
...
If a GRF does not set price multipliers for these new prices, but for the previously used ones, the old modifiers will be propagated to the new bases.
15 years ago
830231e2bd
(svn r18283) -Feature: [NewGRF] Add new price bases for removing industries, building/removing unmovables (new objects), building/removing rail-waypoints/buoys, interacting with town-authority, building foundations, funding primary industries (when not prospecting) and towns.
...
If a GRF does not set price multipliers for these new prices, but for the previously used ones, the old modifiers will be propagated to the new bases.
15 years ago
Jonathan G Rennison
gooball
Pavel Stupnikov
S. D. Cloudt
Charles Pigott
Joan Josep
patch-import
zuu
rubidium
michi_cc
alberth
terkhen
smatz
yexo
frosch