Jonathan G Rennison
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
Jonathan G Rennison
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
patch-import
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
Jonathan G Rennison
ce34225b0e
Merge branch 'house_placing' into jgrpp
9 years ago
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
9 years ago
Jonathan G Rennison
60377f2262
Merge branch 'master' into town_cargo_adj
...
Conflicts:
src/settings_gui.cpp
9 years ago
patch-import
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
frosch
b1763f1e77
(svn r27306) -Fix (r27305): Confused tiles.
9 years ago
frosch
19d1cda92e
(svn r27305) -Fix [FS#6320]: Account for road-bridges and drive-through-stops in CanFollowRoad.
9 years ago
frosch
09caebf357
(svn r27260) -Fix (r27244): economy.allow_town_roads should not affect town placement during world generation.
10 years ago
frosch
071b574e2c
(svn r27259) -Fix (r27244): Incorrect merge. (_dp_)
10 years ago
frosch
9714f95c63
(svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_)
10 years ago
frosch
f27dc40c8a
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
10 years ago
frosch
c1505cfcdb
(svn r27247) -Cleanup: Make GrowTownAtRoad return a bool.
10 years ago
frosch
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
rubidium
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
rubidium
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
rubidium
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
rubidium
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
11 years ago
rubidium
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
frosch
f7732ab5b3
(svn r26346) -Fix [FS#5870]: Call Layouter::ReduceLineCache from GenerateTownName in all cases.
11 years ago
frosch
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
rubidium
30c9f0740d
(svn r26313) -Codechange: use a set for finding unique town names instead of iterating all just created town names (MJP)
11 years ago
rubidium
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
rubidium
80a5ac215f
(svn r26310) -Codechange: clean up some caches during town generation to keep memory usage significantly lower (MJP)
11 years ago
rubidium
732ae5b600
(svn r26308) -Fix-ish: do not try to build more towns/industries than the pool can hold (MJP)
11 years ago
rubidium
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
rubidium
81c0b0e861
(svn r26051) -Fix: out of bounds access in CmdTownCargoGoal
11 years ago
frosch
88175c2503
(svn r25968) -Add: [Script] ScriptTown::TOWN_GROWTH_NONE to indicate no town growth via ScriptTown::SetGrowthRate and GetGrowthRate.
11 years ago
frosch
b9fe9c3bb9
(svn r25931) -Fix [FS#5786-ish]: [NoGo] Preserve the relative town growth progress when changing the town growth rate.
11 years ago
frosch
56365e81e1
(svn r25922) -Codechange: Rename TOWN_IS_FUNDED to TOWN_IS_GROWING. It is not tied to funding a town.
11 years ago
zuu
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
frosch
670c4879cf
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
11 years ago
frosch
d9d978d6d2
(svn r25833) -Codechange: Move ObjectType from map array into pool item.
11 years ago
zuu
a89875b64e
(svn r25789) -Fix (r25783): Calling GSTown.FoundTown in world gen caused world gen to terminate and start the game
11 years ago
zuu
f0fa978c09
(svn r25785) -Feature: [Script] Allow AIs and GS to found towns. Allow GS to rename towns
11 years ago
frosch
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
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
alberth
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
frosch
1881f70fbb
(svn r24391) -Change [FS#5229]: Disallow original and better road layouts to build roads under bridges along the bridge direction.
12 years ago
frosch
1008ceddb8
(svn r24291) -Add: [Script] ScriptEventRoadReconstruction.
13 years ago
frosch
4e074cdbf7
(svn r24290) -Add: [Script] ScriptEventExclusiveTransportRights.
13 years ago
frosch
bfaf2bd49c
(svn r24287) -Feature [FS#2688]: News item for exclusive transport rights. (based on patch by Grantovich)
13 years ago
frosch
2aa43d6c8b
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
13 years ago
frosch
c6af35c085
(svn r24283) -Codechange: Add AddTileNewsItem function to preemptively deduplicate code.
13 years ago
frosch
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.
13 years ago
frosch
4fda069104
(svn r24183) -Fix [FS#5169]: Town radii were not updated immediatelly after construction/destruction of houses, resulting in desyncs.
13 years ago
rubidium
76d5833650
(svn r24179) -Codechange: move some variables of Town to TownCache
13 years ago
alberth
e11179453b
(svn r24105) -Feature: Be more careful with the population of a small town while placing a statue.
13 years ago
alberth
32b20603cb
(svn r24104) -Codechange: Output the resulting tile through the user data.
13 years ago