3f4333bcc8
Add setting to enable non-admin multiplayer clients to rename towns
4 years ago
13b34b9917
Fix code style in Town::UpdateLabel
4 years ago
e95216b59d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
4 years ago
310bb876a2
Add: new town council "indifferent" attitude
...
Closes : #184
4 years ago
4ce941bbc2
Codechange: turn a constant variable into a real constant.
4 years ago
a4035af337
Codechange: Apply coding style ( #8640 )
...
* Fix: Missing or needed spaces
* Codechange: Remove space
* Codechange: Remove space
* Codechange: More missing spaces
* Codechange: Missing spaces
* Codechange: Remove space
* Codechange: Remove space
4 years ago
650d5e014e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ai/ai_gui.cpp
# src/company_cmd.cpp
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/korean.txt
# src/lang/slovak.txt
# src/main_gui.cpp
# src/video/sdl2_v.cpp
4 years ago
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
4 years ago
1dda7d6486
Fix: don't walk out of the map when trying to build tunnels ( #8600 )
4 years ago
f9956d88c3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/company_gui.cpp
# src/lang/arabic_egypt.txt
# src/lang/czech.txt
# src/lang/esperanto.txt
# src/lang/faroese.txt
# src/lang/finnish.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/latvian.txt
# src/lang/malay.txt
# src/lang/polish.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/unfinished/urdu.txt
# src/main_gui.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/settings_type.h
# src/station_cmd.cpp
# src/table/settings.ini
4 years ago
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
4 years ago
39df1c49a1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fileio.cpp
# src/group_gui.cpp
# src/industry.h
# src/lang/korean.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.cpp
# src/linkgraph/linkgraphschedule.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/town_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
4 years ago
8da5cff210
Fix #8462 : Don't check whether to grow a town road on water ( #8471 )
4 years ago
8e6574dcdb
Revert 78f92130: "Fix #8506 : Towns shouldn't add junctions to NewGRF roads they cannot build ( #8535 )" ( #8541 )
...
As per https://github.com/OpenTTD/OpenTTD/pull/8535#issuecomment-757122918 ,
jumped the gun here.
4 years ago
b0456669c9
Fix #8506 : Towns shouldn't add junctions to NewGRF roads they cannot build ( #8535 )
4 years ago
b08c66a796
Fix 7bdfb38: Drive-thru road stations can be connected at either end ( #8528 )
4 years ago
9c0da686da
Add: Towns can build tunnels ( #8473 )
4 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
c7609e767f
Fix #7604 : prevent houses to wander too far from town center when rebuilding ( #8507 )
...
When a multi-tile house is rebuild, it always used the most northern
tile to build the new house. This can very easily lead to houses
wandering off in the north-ish direction (either NW or NE).
To prevent this, pick the tile closest to town center when rebuilding
on a multi-tile house. This still means a house can be build away
from a road, but it is no longer wandering around finding another
town to call home.
4 years ago
a4e34e824c
Change: towns can now bridge 4 rails (up from 3)
...
Having 4 rails is a pretty common design, and towns now couldn't
bridge out of this common design.
4 years ago
64eddaeb49
Feature: Make maximum length of town bridges depend on population.
4 years ago
860c270c73
Codechange: Replace assert_compile macro with static_assert
4 years ago
7bdfb382a8
Change: Towns don't build dead-end road bridges ( #8401 )
4 years ago
c7fa284db4
Move scale factor setting scaling to common function
4 years ago
2ad446369d
Cache animated tile speed, use btree map for animated tiles
4 years ago
946442ab6b
GRF: Add extra road/tram type flag: towns cannot modify tiles
4 years ago
14adcbac80
Add NewGRF bridge property to prevent town or AI/GS building bridge type
4 years ago
352b361e1b
Viewport: Replace viewport mark dirty if zoom level below with flags param
...
Fix missing flags for tracerestrict and effect vehicles
4 years ago
1fd9c929ef
Increase church/stadium count field size, fix save/load
...
Fix too many error message
4 years ago
157beb05ed
Add settings to ignore date/zone/GRF when placing houses in scenario editor
...
See: #177
4 years ago
b7118b60fe
Add setting to enable multiple churches/stadiums in scenario editor
...
See: #177
4 years ago
3adeff1883
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
4 years ago
7045186594
Change #8159 : Remove now unused town cargo caches without bumping the savegame version
4 years ago
3eb8d62148
Fix #157 : Integer overflow in town GetNormalGrowthRate
4 years ago
43c538fa7d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/town_cmd.cpp
4 years ago
a82572d0f5
Codechange: remove has_newhouses global
4 years ago
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
4 years ago
63ccb36ef3
Codechange: Use std::string for most of the user-settable custom names.
4 years ago
93d1d8773f
Fix: Desync after house replacement
4 years ago
d37d08ebb3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
# src/station_cmd.cpp
# src/station_func.h
4 years ago
f2a9a1e2a5
Fix #8137 : New clients can't join (desync) after funding an industry
4 years ago
7bd52970a1
Codechange: Refactor FindStationsAroundTiles to avoid code duplication
4 years ago
7949de2c05
Add a minimum visible height and no ground tile parameter to DrawTileProc.
...
Filter out tile parts which are entirely outside the drawing area.
5 years ago
c42ce832ae
Fix viewport signs and text effects marking viewports dirty unnecessarily
...
* When at high zoom levels where the signs are not shown
* Where the sign type is disabled in the display options
5 years ago
dd99fd646d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_station_base.h
# src/industry.h
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/station_cmd.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
5 years ago
c3223903ed
Codechange: Cache resolved town, station and industry name strings
5 years ago
22ba048c89
Change: Only resort town directory window on population change if necessary
5 years ago
b868ce8605
Town directory window: Only resort on population change if necessary
5 years ago
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
5 years ago
39e6247bec
Fix #7899 , 196d5868: don't trigger filter changes more than expected
5 years ago
f401622149
Feature: Script API to change town rating of companies
5 years ago
ee7a8eebca
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
5 years ago
514565fad6
Codechange: Replace FOR_ALL_OBJECTS with range-based for loops
5 years ago
00c2a98cf3
Codechange: Replace FOR_ALL_INDUSTRIES with range-based for loops
5 years ago
fa9769f81a
Codechange: Replace FOR_ALL_DEPOTS with range-based for loops
5 years ago
ddabfed1cd
Codechange: Replace station related FOR_ALL with range-based for loops
5 years ago
3a14cea068
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
5 years ago
fe9b024f1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/signs_cmd.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
# src/waypoint_cmd.cpp
5 years ago
9900af38f5
Fix #7847 : Use ViewportSign coordinates for sign Kdtree coordinates ( #7849 )
...
Ensure the same coordinates are used for station/town/player signs regardless of how the landscape changes below it after the coordinates were first determined.
By keeping track of whether each ViewportSign is valid for Kdtree use (and only ever registering the viewport sign when the object is valid) a lot of code can be simplified and become more robust at the same time.
5 years ago
b8ab9debed
Merge branch 'master' into jgrpp
5 years ago
61dba850af
Revert #7837 , 7e22f243e: OpenTTD tries to replicate the original game mechanics.
...
Making numbers look nice and correlate is no goal, and in this case they actually did not correlate.
5 years ago
7e22f243ed
Fix: typo in town growth rates ( #7837 )
5 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
000f86f23d
Fix town growth to correctly follow custom bridge heads
5 years ago
6562937899
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
5 years ago
04ef407ddf
Merge branch 'jgrpp' into jgrpp-nrt
...
# Conflicts:
# .ottdrev-vc
# README.md
# jgrpp-changelog.md
# src/ship_cmd.cpp
5 years ago
5155afee9b
Ensure nearby stations list updated in CBID_HOUSE_DESTRUCTION callback
5 years ago
a8786632f7
Always call UpdateTownCargoTotal in UpdateTownCargoes
5 years ago
b870596f15
Add #6887 : Option to show zone inside local authority boundary of towns
...
Can be found at town information > local authority window
Layout for button is same as Graph Keys
Turn on/off for every town individually
5 years ago
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
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
9519c5c1fb
Ensure town cargo bitmap correctly set after town creation
5 years ago
326dfd33eb
Fix town nearby station cache not being updated when house is rebuilt smaller/different shape
5 years ago
6d9f9ec352
Fix recalculation area in UpdateTownCargoesHouse
5 years ago
c2470a21af
Fix town production and acceptance cache saveload/update handling
5 years ago
33344482ae
Add a stepped OrthogonalTileIterator for grid iteration
5 years ago
b91ee6fb4b
Improve performance of name sorting in industry list window
5 years ago
f6b9395c6a
Improve performance of name sorting in town and station list windows
5 years ago
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
6 years ago
f20b75d712
Codechange: Remove TownLayoutByte type
6 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
cebdd72146
Fix #7440 : Remove town sign when deleting town, not add it once more
6 years ago
53ff27370d
Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion
6 years ago
8ad3e50b80
Fix handling of viewport kd-tree in CmdDeleteTown
6 years ago
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
6 years ago
7395705775
Remove assertion in TownGenerateCargo
...
It is not correct with the new town cargo generation algorithm
6 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
6 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
6 years ago
e3b85f617b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/station_cmd.cpp
6 years ago
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
6 years ago
dea7f078f4
Codechange: Update town sign on population change only when population is shown ( #7368 )
6 years ago
e8d397e4ee
Codechange: Make a merged k-d tree index of all viewport signs
6 years ago
d84b67e54d
Codechange: Make a k-d tree index of stations
6 years ago
7b56be0f3a
Codechange: Make a k-d tree index of towns
6 years ago
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
6 years ago
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.
6 years ago
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
6 years ago
Jonathan G Rennison
Yourself
frosch
SamuXarick
Tyler Trahan
Patric Stout
Charles Pigott
Didac Perez Parera
dP
Yexo
Michael Lutz
glx
Niels Martin Hansen
S. D. Cloudt
Gabda
peter1138
Henry Wilson