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
7 years ago
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
7 years ago
8d8b9a026a
Feature #6610 : Allow towns to build houses on road turns ( #6758 )
7 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
8 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)
8 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)
8 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
9 years ago
95b65163e3
Revert back to v2 of house picking/placing patch.
9 years ago
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
9 years ago
0fd34a17a5
Update to v4 of house placing patch.
9 years ago
26fa77c5ee
Run animations at the normal rate regardless of day length factor.
9 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.
10 years ago
813e85f301
(svn r27260) -Fix (r27244): economy.allow_town_roads should not affect town placement during world generation.
10 years ago
071b574e2c
(svn r27259) -Fix (r27244): Incorrect merge. (_dp_)
10 years ago
5992f4fa1b
(svn r27259) -Fix (r27244): Incorrect merge. (_dp_)
10 years ago
9714f95c63
(svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_)
10 years ago
9aa0ba43f7
(svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_)
10 years ago
f27dc40c8a
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
10 years ago
9fb56ca02e
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
10 years ago
c1505cfcdb
(svn r27247) -Cleanup: Make GrowTownAtRoad return a bool.
10 years ago
93d7db0b36
(svn r27247) -Cleanup: Make GrowTownAtRoad return a bool.
10 years ago
ddae581ac8
(svn r27244) -Change [FS#6245]: Do not consider road junctions with trivial dead ends as branch points during town growth. (_dp_)
10 years ago
915aad7603
(svn r27244) -Change [FS#6245]: Do not consider road junctions with trivial dead ends as branch points during town growth. (_dp_)
10 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)
11 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
11 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
11 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
11 years ago
f7732ab5b3
(svn r26346) -Fix [FS#5870]: Call Layouter::ReduceLineCache from GenerateTownName in all cases.
11 years ago
55502341ac
(svn r26346) -Fix [FS#5870]: Call Layouter::ReduceLineCache from GenerateTownName in all cases.
11 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.
11 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.
11 years ago
30c9f0740d
(svn r26313) -Codechange: use a set for finding unique town names instead of iterating all just created town names (MJP)
11 years ago
9f6b8aea49
(svn r26313) -Codechange: use a set for finding unique town names instead of iterating all just created town names (MJP)
11 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)
11 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)
11 years ago
80a5ac215f
(svn r26310) -Codechange: clean up some caches during town generation to keep memory usage significantly lower (MJP)
11 years ago
fcb122124b
(svn r26310) -Codechange: clean up some caches during town generation to keep memory usage significantly lower (MJP)
11 years ago
732ae5b600
(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)
11 years ago
30a95966ec
(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)
11 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.
12 years ago
87fae6ba57
(svn r25140) -Fix [FS#5519]: Towns are build as OWNER_TOWN, so they also need to be removed as OWNER_TOWN.
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
Pavel Stupnikov
Jonathan G Rennison
PeterN
frosch
patch-import
rubidium
zuu
planetmaker