dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,076 Commits 1 Branch 0 Tags
f8d6e781bae9d64c5cc76451abc88feca7697e7b
Commit Graph

82 Commits

Author SHA1 Message Date
Jonathan G Rennison
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
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
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
 2019-07-08 16:19:07 +01:00
Charles Pigott
5d66d8fd7d Codechange: Remove ExpensesTypeByte 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
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
 2018-05-03 23:54:51 +01:00
Joan Josep
944f785be8 Fix: Spelling errors (#6769) 2018-04-30 18:52:32 +02:00
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
a4ad4130a6 Merge branch 'master' into infrastructure_sharing 
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
 2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch 
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
 2015-08-06 22:24:28 +01:00
zuu
c7620a1ea7 (svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies 2013-09-21 13:07:42 +00:00
zuu
ab69c6c2a0 (svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies 2013-09-21 13:07:42 +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
df16ebd730 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
michi_cc
fc8633e1ac (svn r23415) -Feature: Infrastructure maintenance costs. 2011-12-03 23:40:46 +00:00
michi_cc
d3b7b89493 (svn r23415) -Feature: Infrastructure maintenance costs. 2011-12-03 23:40:46 +00:00
michi_cc
796fe54a2f (svn r23413) -Add: Company infrastructure counts for canals. 2011-12-03 23:40:23 +00:00
michi_cc
c06bbb4863 (svn r23413) -Add: Company infrastructure counts for canals. 2011-12-03 23:40:23 +00:00
michi_cc
85ec2f07af (svn r23411) -Add: Company infrastructure counts for rail. 2011-12-03 23:40:13 +00:00
michi_cc
d30fcd4e35 (svn r23411) -Add: Company infrastructure counts for rail. 2011-12-03 23:40:13 +00:00
alberth
063931d435 (svn r21060) -Doc: Improved wording of comments (mostly by __ln__) 2010-10-30 17:51:07 +00:00
alberth
7e48d85104 (svn r21060) -Doc: Improved wording of comments (mostly by __ln__) 2010-10-30 17:51:07 +00:00
rubidium
1f2276b785 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 2010-08-08 10:59:30 +00:00
rubidium
3da3d131c6 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 2010-08-08 10:59:30 +00:00
alberth
7d3de0632d (svn r20262) -Codechange: Remove unused ScoreInfo::id field, and doxyment the data structures. 2010-07-31 19:45:48 +00:00
alberth
3f62ee6355 (svn r20262) -Codechange: Remove unused ScoreInfo::id field, and doxyment the data structures. 2010-07-31 19:45:48 +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
398418b8fa (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
terkhen
170ad8a3c9 (svn r19720) -Feature: New base costs for building/clearing canals, building/clearing aqueducts and building/clearing locks. 2010-04-25 13:56:51 +00:00
terkhen
52ab1c7d40 (svn r19720) -Feature: New base costs for building/clearing canals, building/clearing aqueducts and building/clearing locks. 2010-04-25 13:56:51 +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
smatz
53aaabe6e9 (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
alberth
a493ba8f26 (svn r19131) -Doc: Add doxygen comments to some economy variables and constants. 2010-02-14 15:58:10 +00:00
alberth
ac65c41509 (svn r19131) -Doc: Add doxygen comments to some economy variables and constants. 2010-02-14 15:58:10 +00:00
yexo
d31d15ec00 (svn r18945) -Codechange: typo 2010-01-29 00:11:30 +00:00
yexo
a43a23b408 (svn r18945) -Codechange: typo 2010-01-29 00:11:30 +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
82fc28f77f (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
frosch
0f31a2f7e4 (svn r18284) -Cleanup (r18268, r18283): Replace magic value with enum. 2009-11-24 23:34:46 +00:00
frosch
324396ec74 (svn r18284) -Cleanup (r18268, r18283): Replace magic value with enum. 2009-11-24 23:34:46 +00:00
frosch
13a72bb345 (svn r18283) -Feature: [NewGRF] Add new price bases for removing industries, building/removing unmovables (new objects), building/removing rail-waypoints/buoys, interacting with town-authority, building foundations, funding primary industries (when not prospecting) and towns. 
If a GRF does not set price multipliers for these new prices, but for the previously used ones, the old modifiers will be propagated to the new bases.
 2009-11-24 22:15:42 +00:00
frosch
830231e2bd (svn r18283) -Feature: [NewGRF] Add new price bases for removing industries, building/removing unmovables (new objects), building/removing rail-waypoints/buoys, interacting with town-authority, building foundations, funding primary industries (when not prospecting) and towns. 
If a GRF does not set price multipliers for these new prices, but for the previously used ones, the old modifiers will be propagated to the new bases.
 2009-11-24 22:15:42 +00:00
frosch
f60a437d36 (svn r18268) -Feature: [NewGRF] Make price base multipliers related to vehicles only apply to the GRF locally, if it defines engines of that type itself. 2009-11-24 13:15:58 +00:00
frosch
d507136e04 (svn r18268) -Feature: [NewGRF] Make price base multipliers related to vehicles only apply to the GRF locally, if it defines engines of that type itself. 2009-11-24 13:15:58 +00:00
frosch
c0936d100d (svn r18016) -Codechange: Move the arbitrary basecost multiplier offset (8) to newgrf loading and make the internal state zero-based instead. 2009-11-08 18:04:53 +00:00
frosch
f48f73f060 (svn r18016) -Codechange: Move the arbitrary basecost multiplier offset (8) to newgrf loading and make the internal state zero-based instead. 2009-11-08 18:04:53 +00:00
frosch
d6e65fc173 (svn r18008) -Codechange: Rename NUM_PRICES to PR_END, and use the Price enum some more. 2009-11-08 12:23:02 +00:00
frosch
3f5e42b04a (svn r18008) -Codechange: Rename NUM_PRICES to PR_END, and use the Price enum some more. 2009-11-08 12:23:02 +00:00