dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,022 Commits 1 Branch 0 Tags
b8c7a0dd208076f86f26bb37d9c57ebb1116f515
Commit Graph

1136 Commits

Author SHA1 Message Date
Jonathan G Rennison
95b65163e3 Revert back to v2 of house picking/placing patch. 2016-05-12 22:35:39 +01:00
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
Jonathan G Rennison
26fa77c5ee Run animations at the normal rate regardless of day length factor. 2016-03-02 18:36:53 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp 
Conflicts:
	src/pathfinder/follow_track.hpp
 2015-10-31 10:53:00 +00:00
frosch
34627862c6 (svn r27423) -Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile. 2015-10-30 17:17:54 +00:00
frosch
ab7ebdcfd9 (svn r27423) -Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile. 2015-10-30 17:17:54 +00:00
frosch
49a18025f8 (svn r27420) -Fix [FS#6362]: GrowTownAtRoad sometimes returned false, even when a house was built. (_dp_) 2015-10-30 16:19:09 +00:00
frosch
d626962a38 (svn r27420) -Fix [FS#6362]: GrowTownAtRoad sometimes returned false, even when a house was built. (_dp_) 2015-10-30 16:19:09 +00:00
Jonathan G Rennison
44ed3cb3bd Merge branch 'town-rating-label' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/town_cmd.cpp
 2015-08-06 01:25:11 +01:00
patch-import
33d395ad59 Import town rating label patch 
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
 2015-08-06 00:19:40 +01:00
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
 2015-08-05 21:54:11 +01:00
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
 2015-08-05 21:25:13 +01:00
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
 2015-08-05 21:24:30 +01:00
Jonathan G Rennison
ce34225b0e Merge branch 'house_placing' into jgrpp 2015-08-03 21:29:22 +01: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
Jonathan G Rennison
60377f2262 Merge branch 'master' into town_cargo_adj 
Conflicts:
	src/settings_gui.cpp
 2015-08-02 00:04:04 +01:00
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
 2015-08-01 23:56:58 +01:00
frosch
b1763f1e77 (svn r27306) -Fix (r27305): Confused tiles. 2015-06-20 12:55:17 +00:00
frosch
ab69952f2a (svn r27306) -Fix (r27305): Confused tiles. 2015-06-20 12:55:17 +00:00
frosch
19d1cda92e (svn r27305) -Fix [FS#6320]: Account for road-bridges and drive-through-stops in CanFollowRoad. 2015-06-20 12:40:04 +00:00
frosch
0e378747db (svn r27305) -Fix [FS#6320]: Account for road-bridges and drive-through-stops in CanFollowRoad. 2015-06-20 12:40:04 +00:00
frosch
09caebf357 (svn r27260) -Fix (r27244): economy.allow_town_roads should not affect town placement during world generation. 2015-04-28 17:25:21 +00:00
frosch
813e85f301 (svn r27260) -Fix (r27244): economy.allow_town_roads should not affect town placement during world generation. 2015-04-28 17:25:21 +00:00
frosch
071b574e2c (svn r27259) -Fix (r27244): Incorrect merge. (_dp_) 2015-04-27 21:40:46 +00:00
frosch
5992f4fa1b (svn r27259) -Fix (r27244): Incorrect merge. (_dp_) 2015-04-27 21:40:46 +00:00
frosch
9714f95c63 (svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_) 2015-04-25 12:17:16 +00:00
frosch
9aa0ba43f7 (svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_) 2015-04-25 12:17:16 +00:00
frosch
f27dc40c8a (svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_) 2015-04-25 11:58:19 +00:00
frosch
9fb56ca02e (svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_) 2015-04-25 11:58:19 +00:00
frosch
c1505cfcdb (svn r27247) -Cleanup: Make GrowTownAtRoad return a bool. 2015-04-25 11:46:10 +00:00
frosch
93d7db0b36 (svn r27247) -Cleanup: Make GrowTownAtRoad return a bool. 2015-04-25 11:46:10 +00:00
frosch
ddae581ac8 (svn r27244) -Change [FS#6245]: Do not consider road junctions with trivial dead ends as branch points during town growth. (_dp_) 2015-04-25 11:12:47 +00:00
frosch
915aad7603 (svn r27244) -Change [FS#6245]: Do not consider road junctions with trivial dead ends as branch points during town growth. (_dp_) 2015-04-25 11:12:47 +00:00
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. 2015-01-01 21:25:42 +00:00
rubidium
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. 2015-01-01 21:25:42 +00:00
rubidium
0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
d534c80e94 (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
9daf7e749c (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
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 2014-04-23 20:13:33 +00:00
rubidium
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 2014-04-23 20:13:33 +00:00
frosch
f7732ab5b3 (svn r26346) -Fix [FS#5870]: Call Layouter::ReduceLineCache from GenerateTownName in all cases. 2014-02-16 17:45:24 +00:00
frosch
55502341ac (svn r26346) -Fix [FS#5870]: Call Layouter::ReduceLineCache from GenerateTownName in all cases. 2014-02-16 17:45:24 +00:00
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. 2014-02-16 17:42:28 +00:00
frosch
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. 2014-02-16 17:42:28 +00:00
rubidium
30c9f0740d (svn r26313) -Codechange: use a set for finding unique town names instead of iterating all just created town names (MJP) 2014-02-06 21:06:59 +00:00
rubidium
9f6b8aea49 (svn r26313) -Codechange: use a set for finding unique town names instead of iterating all just created town names (MJP) 2014-02-06 21:06:59 +00:00