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.
4 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
4 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
4 years ago
c3223903ed
Codechange: Cache resolved town, station and industry name strings
4 years ago
22ba048c89
Change: Only resort town directory window on population change if necessary
4 years ago
b868ce8605
Town directory window: Only resort on population change if necessary
4 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
4 years ago
39e6247bec
Fix #7899 , 196d5868: don't trigger filter changes more than expected
4 years ago
f401622149
Feature: Script API to change town rating of companies
4 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
5 years ago
f20b75d712
Codechange: Remove TownLayoutByte type
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
cebdd72146
Fix #7440 : Remove town sign when deleting town, not add it once more
5 years ago
53ff27370d
Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion
5 years ago
8ad3e50b80
Fix handling of viewport kd-tree in CmdDeleteTown
5 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
5 years ago
7395705775
Remove assertion in TownGenerateCargo
...
It is not correct with the new town cargo generation algorithm
5 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
5 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
5 years ago
e3b85f617b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/station_cmd.cpp
5 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
5 years ago
dea7f078f4
Codechange: Update town sign on population change only when population is shown ( #7368 )
5 years ago
e8d397e4ee
Codechange: Make a merged k-d tree index of all viewport signs
5 years ago
d84b67e54d
Codechange: Make a k-d tree index of stations
5 years ago
7b56be0f3a
Codechange: Make a k-d tree index of towns
5 years ago
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
5 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.
5 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
5 years ago
ebc3934ee6
Fix #7043 , Fix #7274 : Delete town owned bridge based on adjacent tile ownership, not nearest town. ( #7284 )
...
This only affects failed town generation, as towns do not delete bridges under any other circumstances.
The existing test performed badly with a large number of towns due to having to calculate the
nearest town, and also by its nature assumed a bridge was built by the nearest town, leading
to bridges of nearby large towns be removed incorrectly.
If we gain the ability to quickly retrieve the correct town (which is _not_ the nearest town) from the bridge, this change should be reviewed.
5 years ago
50a0cf1915
Change: Allow towns to build bridges over rails and one-way roads. ( #7291 )
5 years ago
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
5 years ago
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
5 years ago
48b334cf97
Add: Houses can accept up to 16 different cargo types via NewGRF.
...
New Action0 property 23 for feature 07, variable length, format B n*(B B). Initial byte is number of structures following. First byte in structure is cargo id, second is acceptance level in 1/8 units.
5 years ago
08998d95ba
De-virtualise tile animation calls
5 years ago
d8ccad91f9
Fix: Some code and comment typos
...
Found with codespell
5 years ago
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
5 years ago
9aecbac2b4
Codechange: Define INVALID_TOWN as a TownID ( #7044 )
5 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
b5028efc1f
Fix: Protect against a few out of bounds or uninitialised usage errors
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
eed0da60a2
Fix #6622 : Fixes empty company name in news when gamescript constructs a town
6 years ago
c6d4a6b5e4
Rework end loop in GrowTownWithBridge
...
Rework the end loop in GrowTownWithBridge to keep track of bridge
types already tried. This also fixes a bug that prevented the last
bridge type from being tried at all.
(cherry picked from commit 2b1d2c5887f8c3e27a8229ef87d670395aab2011)
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
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
9fc3212679
Feature #6397 : Keep town growth rate in sync with house count
...
Takes some code and ideas from #6378 patch, but doesn't change anything GS-related.
6 years ago
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
793a446062
Zoning: Ensure that screen is refreshed when necessary in authority overlay
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
8d8b9a026a
Feature #6610 : Allow towns to build houses on road turns ( #6758 )
6 years ago
c3a9eca1a9
Add town growth setting, rate depends on proportion of transported cargo
7 years ago
36a712a579
Add very and extremely slow options to town growth rate setting
7 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
9ed0541e77
Import town bridges over rails patch
...
Add setting (default off)
From: https://www.tt-forums.net/viewtopic.php?f=33t=76052
7 years ago
7b88f7a290
Add minimum town distance patch, with minor modifications
...
Move implicitly added value of 20 to setting default.
Adjust setting texts.
From: https://www.tt-forums.net/viewtopic.php?p=1095146#p1095146
7 years ago
bcc2c7d06e
(svn r27739) -Cleanup/Revert (r12162): Clearing MP_HOUSE with DC_EXEC always fails, so there is no effect in testing for houses first. (adf88)
7 years ago
6c573dc3b5
(svn r27739) -Cleanup/Revert (r12162): Clearing MP_HOUSE with DC_EXEC always fails, so there is no effect in testing for houses first. (adf88)
7 years ago
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
8 years ago
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
8 years ago
3b42e299aa
Merge branch 'town_cargo_adj-sx' into jgrpp
8 years ago
5428c9e5ab
Fix generation of town cargo other than pax/mail (e.g. ECS tourists).
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
26fa77c5ee
Run animations at the normal rate regardless of day length factor.
8 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
34627862c6
(svn r27423) -Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile.
9 years ago
ab7ebdcfd9
(svn r27423) -Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile.
9 years ago
49a18025f8
(svn r27420) -Fix [FS#6362]: GrowTownAtRoad sometimes returned false, even when a house was built. (_dp_)
9 years ago
d626962a38
(svn r27420) -Fix [FS#6362]: GrowTownAtRoad sometimes returned false, even when a house was built. (_dp_)
9 years ago
44ed3cb3bd
Merge branch 'town-rating-label' into jgrpp
...
Conflicts:
src/lang/english.txt
src/town_cmd.cpp
9 years ago
33d395ad59
Import town rating label patch
...
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
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
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
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
ce34225b0e
Merge branch 'house_placing' into jgrpp
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
60377f2262
Merge branch 'master' into town_cargo_adj
...
Conflicts:
src/settings_gui.cpp
9 years ago
1c9801e6b6
Import town cargo generation factor patch
...
Adjust whitespace
http://www.tt-forums.net/viewtopic.php?f=33&t=46399&start=200#p1086221
9 years ago
b1763f1e77
(svn r27306) -Fix (r27305): Confused tiles.
9 years ago
ab69952f2a
(svn r27306) -Fix (r27305): Confused tiles.
9 years ago
19d1cda92e
(svn r27305) -Fix [FS#6320]: Account for road-bridges and drive-through-stops in CanFollowRoad.
9 years ago
0e378747db
(svn r27305) -Fix [FS#6320]: Account for road-bridges and drive-through-stops in CanFollowRoad.
9 years ago
09caebf357
(svn r27260) -Fix (r27244): economy.allow_town_roads should not affect town placement during world generation.
9 years ago
813e85f301
(svn r27260) -Fix (r27244): economy.allow_town_roads should not affect town placement during world generation.
9 years ago
071b574e2c
(svn r27259) -Fix (r27244): Incorrect merge. (_dp_)
9 years ago
5992f4fa1b
(svn r27259) -Fix (r27244): Incorrect merge. (_dp_)
9 years ago
9714f95c63
(svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_)
9 years ago
9aa0ba43f7
(svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_)
9 years ago
f27dc40c8a
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
9 years ago
9fb56ca02e
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
9 years ago
c1505cfcdb
(svn r27247) -Cleanup: Make GrowTownAtRoad return a bool.
9 years ago
93d7db0b36
(svn r27247) -Cleanup: Make GrowTownAtRoad return a bool.
9 years ago
ddae581ac8
(svn r27244) -Change [FS#6245]: Do not consider road junctions with trivial dead ends as branch points during town growth. (_dp_)
9 years ago
915aad7603
(svn r27244) -Change [FS#6245]: Do not consider road junctions with trivial dead ends as branch points during town growth. (_dp_)
9 years ago
84b7773724
(svn r27105) -Fix [FS#6195]: grow_counter was not properly bounded by growth_rate, but by some other value used to calculate growth_rate.
10 years ago
30f778e933
(svn r27105) -Fix [FS#6195]: grow_counter was not properly bounded by growth_rate, but by some other value used to calculate growth_rate.
10 years ago
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
d534c80e94
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
9daf7e749c
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
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
f7732ab5b3
(svn r26346) -Fix [FS#5870]: Call Layouter::ReduceLineCache from GenerateTownName in all cases.
10 years ago
55502341ac
(svn r26346) -Fix [FS#5870]: Call Layouter::ReduceLineCache from GenerateTownName in all cases.
10 years ago
cd51dd9960
(svn r26345) -Cleanup (r26310): Spawning towns does not touch persistent NewGRF storage. ClearPersistentStorageChanges is a dangerous/magic function which should not be called without reason.
10 years ago
20785c79fc
(svn r26345) -Cleanup (r26310): Spawning towns does not touch persistent NewGRF storage. ClearPersistentStorageChanges is a dangerous/magic function which should not be called without reason.
10 years ago
30c9f0740d
(svn r26313) -Codechange: use a set for finding unique town names instead of iterating all just created town names (MJP)
10 years ago
9f6b8aea49
(svn r26313) -Codechange: use a set for finding unique town names instead of iterating all just created town names (MJP)
10 years ago
d662b17dbe
(svn r26311) -Codechange: use a different method for finding whether there is a nearby town when the map has thousands of towns (MJP)
10 years ago
d05ff6e77b
(svn r26311) -Codechange: use a different method for finding whether there is a nearby town when the map has thousands of towns (MJP)
10 years ago
80a5ac215f
(svn r26310) -Codechange: clean up some caches during town generation to keep memory usage significantly lower (MJP)
10 years ago
fcb122124b
(svn r26310) -Codechange: clean up some caches during town generation to keep memory usage significantly lower (MJP)
10 years ago
732ae5b600
(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)
10 years ago
30a95966ec
(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)
10 years ago
437dcfb37d
(svn r26104) -Fix: do not attempt to do stuff with an invalid direction, especially using it as index into a table
11 years ago
c143ca729a
(svn r26104) -Fix: do not attempt to do stuff with an invalid direction, especially using it as index into a table
11 years ago
81c0b0e861
(svn r26051) -Fix: out of bounds access in CmdTownCargoGoal
11 years ago
8e27031492
(svn r26051) -Fix: out of bounds access in CmdTownCargoGoal
11 years ago
88175c2503
(svn r25968) -Add: [Script] ScriptTown::TOWN_GROWTH_NONE to indicate no town growth via ScriptTown::SetGrowthRate and GetGrowthRate.
11 years ago
9a41aefcc4
(svn r25968) -Add: [Script] ScriptTown::TOWN_GROWTH_NONE to indicate no town growth via ScriptTown::SetGrowthRate and GetGrowthRate.
11 years ago
b9fe9c3bb9
(svn r25931) -Fix [FS#5786-ish]: [NoGo] Preserve the relative town growth progress when changing the town growth rate.
11 years ago
cef342d57c
(svn r25931) -Fix [FS#5786-ish]: [NoGo] Preserve the relative town growth progress when changing the town growth rate.
11 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
e124838db5
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
11 years ago
dfb5663313
(svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro)
11 years ago
670c4879cf
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
11 years ago
6a0439a789
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
11 years ago
d9d978d6d2
(svn r25833) -Codechange: Move ObjectType from map array into pool item.
11 years ago
35d7e8bca4
(svn r25833) -Codechange: Move ObjectType from map array into pool item.
11 years ago
a89875b64e
(svn r25789) -Fix (r25783): Calling GSTown.FoundTown in world gen caused world gen to terminate and start the game
11 years ago
ffec9b41e8
(svn r25789) -Fix (r25783): Calling GSTown.FoundTown in world gen caused world gen to terminate and start the game
11 years ago
f0fa978c09
(svn r25785) -Feature: [Script] Allow AIs and GS to found towns. Allow GS to rename towns
11 years ago
67ab3108d6
(svn r25785) -Feature: [Script] Allow AIs and GS to found towns. Allow GS to rename towns
11 years ago
42f401aa26
(svn r25140) -Fix [FS#5519]: Towns are build as OWNER_TOWN, so they also need to be removed as OWNER_TOWN.
11 years ago
87fae6ba57
(svn r25140) -Fix [FS#5519]: Towns are build as OWNER_TOWN, so they also need to be removed as OWNER_TOWN.
11 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
732e073261
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
1881f70fbb
(svn r24391) -Change [FS#5229]: Disallow original and better road layouts to build roads under bridges along the bridge direction.
12 years ago
6c2e201133
(svn r24391) -Change [FS#5229]: Disallow original and better road layouts to build roads under bridges along the bridge direction.
12 years ago
1008ceddb8
(svn r24291) -Add: [Script] ScriptEventRoadReconstruction.
12 years ago
95d3d6fdef
(svn r24291) -Add: [Script] ScriptEventRoadReconstruction.
12 years ago
4e074cdbf7
(svn r24290) -Add: [Script] ScriptEventExclusiveTransportRights.
12 years ago
8dc553a039
(svn r24290) -Add: [Script] ScriptEventExclusiveTransportRights.
12 years ago
bfaf2bd49c
(svn r24287) -Feature [FS#2688]: News item for exclusive transport rights. (based on patch by Grantovich)
12 years ago
ec91dc5ffc
(svn r24287) -Feature [FS#2688]: News item for exclusive transport rights. (based on patch by Grantovich)
12 years ago
2aa43d6c8b
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
12 years ago
a8c88f43b6
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
12 years ago
c6af35c085
(svn r24283) -Codechange: Add AddTileNewsItem function to preemptively deduplicate code.
12 years ago
a0be398da9
(svn r24283) -Codechange: Add AddTileNewsItem function to preemptively deduplicate code.
12 years ago
675fc185be
(svn r24205) -Feature [FS#5178-ish]: Show a hint in the supplies tab of station windows, if the station is affected by exclusive transport rights.
12 years ago
477a09d13e
(svn r24205) -Feature [FS#5178-ish]: Show a hint in the supplies tab of station windows, if the station is affected by exclusive transport rights.
12 years ago
4fda069104
(svn r24183) -Fix [FS#5169]: Town radii were not updated immediatelly after construction/destruction of houses, resulting in desyncs.
12 years ago
cc1e4ca5ad
(svn r24183) -Fix [FS#5169]: Town radii were not updated immediatelly after construction/destruction of houses, resulting in desyncs.
12 years ago
76d5833650
(svn r24179) -Codechange: move some variables of Town to TownCache
12 years ago
41e5c839e0
(svn r24179) -Codechange: move some variables of Town to TownCache
12 years ago
e11179453b
(svn r24105) -Feature: Be more careful with the population of a small town while placing a statue.
12 years ago
0d74c074dd
(svn r24105) -Feature: Be more careful with the population of a small town while placing a statue.
12 years ago
32b20603cb
(svn r24104) -Codechange: Output the resulting tile through the user data.
12 years ago
2911732841
(svn r24104) -Codechange: Output the resulting tile through the user data.
12 years ago
035fb43e7a
(svn r24103) -Codechange: Handle clear tiles separately from house tiles.
12 years ago
a01948dbf3
(svn r24103) -Codechange: Handle clear tiles separately from house tiles.
12 years ago
2fdd9b918b
(svn r24102) -Codechange: Refactor tile clearability test out of the statue callback.
12 years ago
c876d18320
(svn r24102) -Codechange: Refactor tile clearability test out of the statue callback.
12 years ago
e2d963d794
(svn r24101) -Codechange: Reverse a condition for increased readability.
12 years ago
f607538882
(svn r24101) -Codechange: Reverse a condition for increased readability.
12 years ago
48fd132847
(svn r24064) -Fix [FS#5121]: make the full snowedness level of houses the same as roads and rails
12 years ago
c8ce0faca4
(svn r24064) -Fix [FS#5121]: make the full snowedness level of houses the same as roads and rails
12 years ago
9ef4a017ae
(svn r23953) -Fix [FS#5062]: When the population of a town changes the town view might even have to change size due to different cargo requirements.
12 years ago
5486e05f65
(svn r23953) -Fix [FS#5062]: When the population of a town changes the town view might even have to change size due to different cargo requirements.
12 years ago
076f3ead20
(svn r23819) -Fix [FS#4951]: Removal of towns with 0 population failed during map generation.
13 years ago
2458a29fd0
(svn r23819) -Fix [FS#4951]: Removal of towns with 0 population failed during map generation.
13 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6961332f05
(svn r23626) -Add: ScriptTown::SetText, which adds custom text to the Town GUI
13 years ago
ad48ab9237
(svn r23626) -Add: ScriptTown::SetText, which adds custom text to the Town GUI
13 years ago
bc78328918
(svn r23622) -Add: a set of events to trigger in a GameScript
13 years ago
77b7366c29
(svn r23622) -Add: a set of events to trigger in a GameScript
13 years ago
b00fcef81a
(svn r23620) -Add: ScriptTown::SetCargoGoal and ScriptTown::SetGrowthRate (GameScript only)
13 years ago
afcf07ac8a
(svn r23620) -Add: ScriptTown::SetCargoGoal and ScriptTown::SetGrowthRate (GameScript only)
13 years ago
37954d5098
(svn r23617) -Add: ScriptTown::ExpandTown, to grow a town (GameScript only)
13 years ago
5ff98b45c1
(svn r23617) -Add: ScriptTown::ExpandTown, to grow a town (GameScript only)
13 years ago
24263638bf
(svn r23526) -Codechange: unify cargos vs cargoes
13 years ago
3d88c74389
(svn r23526) -Codechange: unify cargos vs cargoes
13 years ago
56f37d9386
(svn r23476) -Codechange: use the error queue to replace switch mode error strings, again making it possible to return multiple errors
13 years ago
2bf0fc3c5c
(svn r23476) -Codechange: use the error queue to replace switch mode error strings, again making it possible to return multiple errors
13 years ago
9aab2dc861
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
58423b26d1
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
a6557b4f09
(svn r23407) -Codechange: Keep a bitmap of all cargos accepted by towns.
13 years ago
de0bf0663a
(svn r23407) -Codechange: Keep a bitmap of all cargos accepted by towns.
13 years ago
a9cc00bf68
(svn r23405) -Codechange: Keep a matrix of cargos accepted by houses for each town (michi_cc).
13 years ago
59d8b0204f
(svn r23405) -Codechange: Keep a matrix of cargos accepted by houses for each town (michi_cc).
13 years ago
af1b3cc070
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
13 years ago
98103121d4
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
13 years ago
9fe11f3283
(svn r23342) -Fix (r23300): for arctic and desert towns you were required to deliver more than 4 billion units, instead of one or more units
13 years ago
04c40aa04d
(svn r23342) -Fix (r23300): for arctic and desert towns you were required to deliver more than 4 billion units, instead of one or more units
13 years ago
2635be0549
(svn r23323) -Fix: when you fund a town, it should grow; goals reached or not
13 years ago
7ff6daee80
(svn r23323) -Fix: when you fund a town, it should grow; goals reached or not
13 years ago
0043123c33
(svn r23319) -Fix (r23316): Offsets of viewport signs were not scaled up.
13 years ago
3e1d070413
(svn r23319) -Fix (r23316): Offsets of viewport signs were not scaled up.
13 years ago
08efac8549
(svn r23303) -Add: economy.fund_buildings, to disallow funding buildings
13 years ago
Jonathan G Rennison
Yexo
Michael Lutz
dP
glx
Niels Martin Hansen
frosch
Yourself
S. D. Cloudt
Gabda
peter1138
Charles Pigott
Henry Wilson
PeterN
SamuXarick
nikolas
Joan Josep
Max Maton
cirdan
patch-import
rubidium
zuu
planetmaker
alberth
truebrain
terkhen