Jonathan G Rennison
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
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
Jonathan G Rennison
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
2019-07-08 16:19:07 +01:00
Charles Pigott
f20b75d712
Codechange: Remove TownLayoutByte type
2019-04-29 17:40:22 +01:00
Charles Pigott
0e439aeab7
Codechange: Remove TownFoundingByte type
2019-04-29 17:40:22 +01:00
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2019-03-27 18:12:04 +00:00
Jonathan G Rennison
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
2019-03-13 03:38:26 +00:00
Niels Martin Hansen
52572cafa6
Add: Option for population-linear town cargo generation
...
Introduce a new default algorithm for town cargo generation (passengers and mail), and a game setting to choose between the new and original algorithm.
The original town cargo generation algorithm has the property of the generated amount relating to the square of each building's population, meaning large towns easily produce more cargo than can realistically be transported. The problem is excessive cargo is amplified if playing with cargodist.
The new algorithm introduced instead has a linear relation to the population. The result is that smaller towns will produce slightly more cargo, while the largest towns will produce about a fourth of what they would with the original algorithm.
Existing savegames will use the original algorithm, while new games will default to the new algorithm.
2019-03-04 20:19:44 +01:00
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
2019-01-14 00:01:44 +00:00
nikolas
4fc1b2baae
Fix: Grammar in a bunch of comments ( #7054 )
2019-01-13 07:38:48 +00:00
patch-import
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
2015-08-03 21:29:13 +01:00
michi_cc
56a592dcbd
(svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct.
2011-11-15 20:47:53 +00:00
michi_cc
6548ec6e9e
(svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct.
2011-11-15 20:47:53 +00:00
terkhen
a88fe7c2aa
(svn r22343) -Change: Remove pixel limiter for query strings.
2011-04-17 18:42:17 +00:00
terkhen
10caf391a1
(svn r22343) -Change: Remove pixel limiter for query strings.
2011-04-17 18:42:17 +00:00
rubidium
623ed581e3
(svn r21797) -Fix/Change: unify the size (in characters) of the string inputs with eachother and TTD to prevent crashes/asserts with e.g. signs that are too long
2011-01-14 22:08:40 +00:00
rubidium
6b86ee9888
(svn r21797) -Fix/Change: unify the size (in characters) of the string inputs with eachother and TTD to prevent crashes/asserts with e.g. signs that are too long
2011-01-14 22:08:40 +00:00
rubidium
eafc316342
(svn r21414) -Codechange: limit town name by amount of characters, not bytes
2010-12-05 22:25:21 +00:00
rubidium
5c9c3f1acf
(svn r21414) -Codechange: limit town name by amount of characters, not bytes
2010-12-05 22:25:21 +00:00
rubidium
f09a74a996
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
2010-05-13 09:44:44 +00:00
rubidium
398418b8fa
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
2010-05-13 09:44:44 +00:00
frosch
ed80045221
(svn r19654) -Codechange: Use Extract<> in more places.
2010-04-17 13:31:41 +00:00
frosch
75d4bc947d
(svn r19654) -Codechange: Use Extract<> in more places.
2010-04-17 13:31:41 +00:00
alberth
a7619c7fb3
(svn r19479) -Codechange: Test range of town size and layout instead of against the current last value.
2010-03-20 10:59:06 +00:00
alberth
7ef97932d9
(svn r19479) -Codechange: Test range of town size and layout instead of against the current last value.
2010-03-20 10:59:06 +00:00
alberth
b0f3fff54b
(svn r19478) -Codechange: Resolve TS_ prefix clash between TileSource and TownSize enums.
2010-03-20 10:55:08 +00:00
alberth
e89f154c0d
(svn r19478) -Codechange: Resolve TS_ prefix clash between TileSource and TownSize enums.
2010-03-20 10:55:08 +00:00
smatz
f7466979b9
(svn r18281) -Feature: founding towns in-game (based on work by Belugas, TheJosh, GeekToo, Terkhen and others)
2009-11-24 21:18:11 +00:00
smatz
f0c64208cf
(svn r18281) -Feature: founding towns in-game (based on work by Belugas, TheJosh, GeekToo, Terkhen and others)
2009-11-24 21:18:11 +00:00
rubidium
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
2009-08-21 20:21:05 +00:00
smatz
d39c08fd9d
(svn r16664) -Codechange: move house-related stuff from town.h and town_type.h to separate files
2009-06-26 13:44:14 +00:00
smatz
e6a165881c
(svn r16664) -Codechange: move house-related stuff from town.h and town_type.h to separate files
2009-06-26 13:44:14 +00:00
rubidium
87dfc2a881
(svn r16428) -Codechange: use the less bloated SimpleTinyEnumT instead of TinyEnumT if the stuff provided by TinyEnumT but not SimpleTinyEnumT is not used.
2009-05-26 11:19:04 +00:00
rubidium
b19d0e0254
(svn r16428) -Codechange: use the less bloated SimpleTinyEnumT instead of TinyEnumT if the stuff provided by TinyEnumT but not SimpleTinyEnumT is not used.
2009-05-26 11:19:04 +00:00
smatz
a43f7ad823
(svn r16277) -Codechange: enumerize values and remove unneeded values used for testing town rating
2009-05-11 11:55:41 +00:00
smatz
e1e6687bfd
(svn r16277) -Codechange: enumerize values and remove unneeded values used for testing town rating
2009-05-11 11:55:41 +00:00
rubidium
c3e87f345d
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
2009-03-15 00:32:18 +00:00
rubidium
b25a4f8231
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
2009-03-15 00:32:18 +00:00
smatz
f561fa2891
(svn r15352) -Codechange: make the arguments passed around while founding a town a bit more readable
2009-02-05 13:33:37 +00:00
smatz
aa692a99a9
(svn r15352) -Codechange: make the arguments passed around while founding a town a bit more readable
2009-02-05 13:33:37 +00:00
smatz
3a8d57816a
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
...
-Fix: use a flag instead of TL_NO_ROADS to forbid towns to build roads. The flag is ignored during world generation, so there won't be 'ghost' towns anymore
-Feature: town layout is now stored per town, so it is possible to (manually) set different layout for each town
2009-02-04 20:17:25 +00:00
smatz
832e392855
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
...
-Fix: use a flag instead of TL_NO_ROADS to forbid towns to build roads. The flag is ignored during world generation, so there won't be 'ghost' towns anymore
-Feature: town layout is now stored per town, so it is possible to (manually) set different layout for each town
2009-02-04 20:17:25 +00:00
rubidium
e589c7e580
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
2008-09-30 20:51:04 +00:00
rubidium
b650a86e58
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
2008-09-30 20:51:04 +00:00
rubidium
c816cc37fd
(svn r14063) -Codechange: replace some "magic" constants with enumified constants.
2008-08-13 06:05:01 +00:00
rubidium
97c184f8f8
(svn r14063) -Codechange: replace some "magic" constants with enumified constants.
2008-08-13 06:05:01 +00:00
rubidium
b830e6c714
(svn r13413) -Codechange: remove some enums that haven't been used for years.
2008-06-08 12:28:23 +00:00
rubidium
eac3301b63
(svn r13413) -Codechange: remove some enums that haven't been used for years.
2008-06-08 12:28:23 +00:00
frosch
7fbfe54c74
(svn r13234) -Fix: Check/affect town rating when removing/bulldozing town-owned road under drivethrough stops.
...
-Fix: Reset the 'town-owned-road'-flag when removing and rebuilding road under drivethrough stops.
2008-05-24 22:15:10 +00:00
