dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,694 Commits 1 Branch 0 Tags
13a716980ae433e459dcc2e56c7ac21a4fbd9c18
Commit Graph

139 Commits

Author SHA1 Message Date
Jonathan G Rennison
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
 2016-05-12 22:57:42 +01:00
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
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
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
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
frosch
88175c2503 (svn r25968) -Add: [Script] ScriptTown::TOWN_GROWTH_NONE to indicate no town growth via ScriptTown::SetGrowthRate and GetGrowthRate. 2013-11-12 17:57:12 +00:00
frosch
56365e81e1 (svn r25922) -Codechange: Rename TOWN_IS_FUNDED to TOWN_IS_GROWING. It is not tied to funding a town. 2013-10-28 10:55:34 +00:00
frosch
670c4879cf (svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES. 2013-10-12 16:33:19 +00:00
frosch
0a0ab26fdf (svn r25814) -Doc: Some Town members. 2013-10-06 10:16:33 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
rubidium
76d5833650 (svn r24179) -Codechange: move some variables of Town to TownCache 2012-04-25 20:50:13 +00:00
rubidium
0cfe86cead (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
truebrain
aa1a0053b0 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 2011-12-20 17:57:56 +00:00
truebrain
6961332f05 (svn r23626) -Add: ScriptTown::SetText, which adds custom text to the Town GUI 2011-12-19 21:00:55 +00:00
truebrain
b00fcef81a (svn r23620) -Add: ScriptTown::SetCargoGoal and ScriptTown::SetGrowthRate (GameScript only) 2011-12-19 20:59:19 +00:00
rubidium
3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
24263638bf (svn r23526) -Codechange: unify cargos vs cargoes 2011-12-15 21:56:00 +00:00
terkhen
a6557b4f09 (svn r23407) -Codechange: Keep a bitmap of all cargos accepted by towns. 2011-12-03 22:23:10 +00:00
terkhen
a9cc00bf68 (svn r23405) -Codechange: Keep a matrix of cargos accepted by houses for each town (michi_cc). 2011-12-03 22:21:27 +00:00
truebrain
2306f2ab6d (svn r23300) -Add: show on the GUI when a town grows and make a general framework to store goals of a town 2011-11-23 16:07:14 +00:00
truebrain
19791d3189 (svn r23298) -Add: track statistics of all incoming and outgoing goods. Incoming based on TownEffect, outgoing based on CargoType (based on patch by Terkhen) 2011-11-23 16:05:19 +00:00
truebrain
ed6ec8c52a (svn r23296) -Codechange: I found a fund building, but do I fund found buildings? 2011-11-23 13:42:23 +00:00
michi_cc
56a592dcbd (svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct. 2011-11-15 20:47:53 +00:00
yexo
72500ddedf (svn r22920) -Cleanup: replace two very old town variables taht were rarely used by small functions that compute there value on-the-fly when necessary 2011-09-11 11:47:18 +00:00
frosch
43b88046d0 (svn r22888) -Doc: Doxygenize Town struct. (adf88) 2011-09-04 09:06:07 +00:00
terkhen
2eb8903dce (svn r22568) -Change: Add a list of persistent storages to the Town class. 2011-06-12 20:49:07 +00:00
frosch
62b6d0eb0e (svn r22482) -Codechange: Add some contants for the number of ticks between certain cyclical tasks. 2011-05-21 11:26:37 +00:00
rubidium
1de34d3103 (svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille) 2010-09-16 16:31:57 +00:00
rubidium
bd4524646c (svn r20443) -Codechange: more TileHash to a more generic location 2010-08-10 23:31:43 +00:00
alberth
91eba89331 (svn r20320) -Doc: Small Doxygen and normal comment fixes, and an missed addition. 2010-08-02 20:47:27 +00:00
frosch
c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
alberth
e5b703ddf9 (svn r20279) -Doc: Doxygen additions/improvements. 2010-08-01 17:45:53 +00:00
terkhen
9f14507ec5 (svn r20150) -Cleanup: Remove an unused function header. 2010-07-14 19:37:04 +00:00
rubidium
f09a74a996 (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 2010-05-13 09:44:44 +00:00
rubidium
92648be718 (svn r19798) -Codechange: generalise the waypoint naming method 2010-05-12 18:31:39 +00:00
smatz
d2e99657fa (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
alberth
ae5b11321b (svn r19400) -Codechange: CheckforTownRating returns a CommandCost. 2010-03-13 15:33:07 +00:00
alberth
8bda21c5a0 (svn r19399) -Doc: Doxyment enum TownRatingCheckType. 2010-03-13 15:13:19 +00:00
alberth
87c09ddcc0 (svn r19279) -Codechange: CheckIfAuthorityAllowsNewStation() returns CommandCost. 2010-02-27 17:42:55 +00:00
rubidium
9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
b2d7edddfa (svn r18027) -Codechange: make some unneededly global variables static and remove some unused variables 2009-11-09 09:59:35 +00:00
smatz
ad2c641bca (svn r17612) -Feature: possibility to choose (randomise or enter custom) town name before its creation (original patch by Terkhen) 2009-09-22 13:54:54 +00:00
smatz
a2f43040af (svn r17608) -Codechange: use CmdFoundTown when founding 'Random town' too 2009-09-21 20:22:56 +00:00
alberth
ba5e072881 (svn r17582) -Codechange: Move TownActions and _town_action_costs[] to a header file to allow sharing. 2009-09-20 10:08:10 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
smatz
0502a6df42 (svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source 
-Change [FS#1134]: subsidies aren't bound to stations after awarding anymore, they still apply to town or industry, no matter what station is used for loading and unloading. Awarded subsidies from older savegames are lost
-Change [NoAI]: due to these changes, AISubsidy::GetSource and AISubsidy::GetDestination now return STATION_INVALID for awarded subsidies
 2009-08-08 16:42:55 +00:00