Commit Graph

333 Commits

Author SHA1 Message Date
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
2018-11-05 12:53:36 +00:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
38fb8c1b84 Zoning: Cache expensive zoning overlay values 2018-01-22 17:49:53 +00:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
3813b3ca09 Dump infrastructure totals when mismatch detected in CheckCaches. 2017-02-22 02:51:25 +00:00
Jonathan G Rennison
4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
2015-08-06 23:11:49 +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
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
alberth
44d2f6a988 (svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo). 2014-09-07 16:12:58 +00:00
alberth
f72ad87540 (svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo). 2014-09-07 16:12:58 +00:00
rubidium
b6ffc92bb2 (svn r26578) -Fix (r26576): network compilation got broken 2014-05-11 13:17:21 +00:00
rubidium
7215b6a3d3 (svn r26578) -Fix (r26576): network compilation got broken 2014-05-11 13:17:21 +00:00
rubidium
492c6ed39b (svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company 2014-05-11 12:52:21 +00:00
rubidium
4a52300838 (svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company 2014-05-11 12:52:21 +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
6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +00:00
rubidium
5b82822c12 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +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
zuu
01af09b830 (svn r25761) -Change: Disable story/goal buttons when there is no content to show instead of when there is zero companies 2013-09-13 12:45:25 +00:00
zuu
4e74a4c5cc (svn r25761) -Change: Disable story/goal buttons when there is no content to show instead of when there is zero companies 2013-09-13 12:45:25 +00:00
rubidium
9bcad08a7f (svn r25490) -Fix [FS#5610]: the face of the manager differed on clients when the company was started after the clients joined 2013-06-27 20:20:13 +00:00
rubidium
11e6d5c8df (svn r25490) -Fix [FS#5610]: the face of the manager differed on clients when the company was started after the clients joined 2013-06-27 20:20:13 +00:00
rubidium
71ce89c1d0 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 2013-05-19 14:43:23 +00:00
rubidium
50ae992b47 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 2013-05-19 14:43:23 +00:00
rubidium
8539c04192 (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 2013-02-14 17:06:49 +00:00
rubidium
369a6f9d1b (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 2013-02-14 17:06:49 +00:00
frosch
336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 2012-12-23 21:09:09 +00:00
frosch
3ce8d2ce70 (svn r24846) -Add: Advanced settings to disable certain sound effects. 2012-12-23 21:09:09 +00:00
frosch
2aa43d6c8b (svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead. 2012-05-26 14:16:03 +00:00
frosch
a8c88f43b6 (svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead. 2012-05-26 14:16:03 +00:00
frosch
6f35cf016b (svn r24281) -Cleanup: Merge all company news subtypes into a single one; they all behave the same. 2012-05-26 14:15:46 +00:00
frosch
c796801c4d (svn r24281) -Cleanup: Merge all company news subtypes into a single one; they all behave the same. 2012-05-26 14:15:46 +00:00
michi_cc
07f32df363 (svn r24134) -Add: Configurable limits for tree planting. 2012-04-17 19:43:52 +00:00
michi_cc
f3e295b4ec (svn r24134) -Add: Configurable limits for tree planting. 2012-04-17 19:43:52 +00:00
rubidium
1d098d8ce2 (svn r23822) -Fix-ish: when replaying make sure companies get created even if their creating client doesn't exist during the replay 2012-01-17 21:13:02 +00:00
rubidium
a66debfadd (svn r23822) -Fix-ish: when replaying make sure companies get created even if their creating client doesn't exist during the replay 2012-01-17 21:13:02 +00:00
rubidium
3481ca0f57 (svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on 2012-01-03 21:47:01 +00:00
rubidium
d8d2f74559 (svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on 2012-01-03 21:47:01 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
rubidium
6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
truebrain
ff1db1a6c8 (svn r23728) -Fix [#FS4942-ish]: when cheating into another company, the SignList was not updated 2012-01-03 10:27:14 +00:00
truebrain
9a05d03e2c (svn r23728) -Fix [#FS4942-ish]: when cheating into another company, the SignList was not updated 2012-01-03 10:27:14 +00:00
truebrain
8faa8f2342 (svn r23648) -Revert (r23646): partial revert; nobody has to know about my local changes and attempts 2011-12-21 12:28:02 +00:00