Commit Graph

265 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
54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
2016-04-13 21:14:47 +01:00
patch-import
01cf154f51 Import polyline rail tool patch v10b
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
2016-04-13 21:03:51 +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
8cc6bddc24 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
Conflicts:
	src/misc.cpp
2015-11-11 19:20:36 +00:00
Jonathan G Rennison
919057a5e6 Cache tunnel info in viewport map mode, to prevent render flicker.
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
2015-11-11 19:18:32 +00:00
Jonathan G Rennison
3089068e1a Merge branch 'progsig-sx' into jgrpp 2015-10-01 20:58:34 +01:00
Jonathan G Rennison
ad4f4525f3 Fix programmable signal programs not being cleared in InitializeGame.
This could leave dangling signal programs in subsequent games
which can cause crashes during saving.
2015-10-01 20:56:38 +01:00
Jonathan G Rennison
9565e5b9b1 Merge branch 'day_length-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/timetable_cmd.cpp
2015-08-09 13:51:36 +01:00
patch-import
d86a56cbef Import day length patch
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
2015-08-09 11:23:15 +01:00
Jonathan G Rennison
5f1b148cf9 Initial minimal working tracerestrict implementation.
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
2015-07-28 01:36:52 +01: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
fonsinchen
97a9908b0e (svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes 2013-06-09 12:58:37 +00:00
fonsinchen
c32eea02dd (svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes 2013-06-09 12:58:37 +00:00
michi_cc
2eae02db59 (svn r24132) -Change [FS#4713]: Improve randomness of tile order in the tile loop. (monoid) 2012-04-17 19:43:43 +00:00
michi_cc
6f9668330e (svn r24132) -Change [FS#4713]: Improve randomness of tile order in the tile loop. (monoid) 2012-04-17 19:43:43 +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
f66f27d249 (svn r23604) -Add: initial support for GameScripts 2011-12-19 20:50:54 +00:00
truebrain
12aa5b6a58 (svn r23604) -Add: initial support for GameScripts 2011-12-19 20:50:54 +00:00
rubidium
41223c8bc9 (svn r23084) -Codechange: get rid of a redundant variable 2011-11-03 22:49:03 +00:00
rubidium
47c5d30b5d (svn r23084) -Codechange: get rid of a redundant variable 2011-11-03 22:49:03 +00:00
frosch
31ad03e4d2 (svn r22693) -Fix [FS#4691]: The override managers were not reset in some cases like creating a new scenario. 2011-07-29 22:23:17 +00:00
frosch
c9e920f1eb (svn r22693) -Fix [FS#4691]: The override managers were not reset in some cases like creating a new scenario. 2011-07-29 22:23:17 +00:00
smatz
c85e1c3089 (svn r22116) -Codechange: use PoolBase::Clean() at more places 2011-02-19 23:05:47 +00:00
smatz
756cc6cf65 (svn r22116) -Codechange: use PoolBase::Clean() at more places 2011-02-19 23:05:47 +00:00
terkhen
789da3ffa3 (svn r21733) -Codechange: Clarify the update owner legend code.
-Fix: Prevent crashes caused by deleted companies.
2011-01-05 11:04:29 +00:00
terkhen
03088dadda (svn r21733) -Codechange: Clarify the update owner legend code.
-Fix: Prevent crashes caused by deleted companies.
2011-01-05 11:04:29 +00:00
terkhen
ec8f087a0b (svn r21730) -Fix (r21718): The smallmap owner legend would not be properly initialized in games without companies. 2011-01-04 22:59:42 +00:00
terkhen
b890bcb840 (svn r21730) -Fix (r21718): The smallmap owner legend would not be properly initialized in games without companies. 2011-01-04 22:59:42 +00:00
rubidium
0c509c7b48 (svn r20670) -Add: support for action F
-Add: a window to select (NewGRF) objects
2010-08-28 19:43:41 +00:00
rubidium
7b16c7650b (svn r20670) -Add: support for action F
-Add: a window to select (NewGRF) objects
2010-08-28 19:43:41 +00:00
rubidium
0318ddc279 (svn r20591) -Codechange: make sure _date_fract is set when SetDate is called. Some places wouldn't reset _date_fract correctly at all 2010-08-22 09:18:01 +00:00
rubidium
56a263070f (svn r20591) -Codechange: make sure _date_fract is set when SetDate is called. Some places wouldn't reset _date_fract correctly at all 2010-08-22 09:18:01 +00:00
rubidium
e68cf6bd81 (svn r20539) -Codechange: make order backups more self-contained. 2010-08-18 15:15:59 +00:00
rubidium
38ca44594f (svn r20539) -Codechange: make order backups more self-contained. 2010-08-18 15:15:59 +00:00
rubidium
f336f61104 (svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns 2010-08-13 12:45:26 +00:00
rubidium
89b2b9370a (svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns 2010-08-13 12:45:26 +00:00
rubidium
9fd2afb147 (svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :) 2010-07-19 17:28:27 +00:00
rubidium
b8487afe54 (svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :) 2010-07-19 17:28:27 +00:00
rubidium
2ab8035604 (svn r20186) -Codechange: remove VARDEF from _realtime_tick and _rightclick_emulate 2010-07-19 16:21:49 +00:00
rubidium
34764feac2 (svn r20186) -Codechange: remove VARDEF from _realtime_tick and _rightclick_emulate 2010-07-19 16:21:49 +00:00
rubidium
7ba01a1874 (svn r19426) -Fix: compilation with AIs disabled 2010-03-15 11:45:15 +00:00
rubidium
ede670918a (svn r19426) -Fix: compilation with AIs disabled 2010-03-15 11:45:15 +00:00
rubidium
1ebaa68cd2 (svn r19388) -Fix [FS#3666]: [NoAI] When reloading a savegame, an AI failing to compile could trigger (trying) to read the not yet loaded information of another AI via the AI Debug window and its "open with the most recently used AI" feature 2010-03-11 21:55:37 +00:00
rubidium
e3fb793a8a (svn r19388) -Fix [FS#3666]: [NoAI] When reloading a savegame, an AI failing to compile could trigger (trying) to read the not yet loaded information of another AI via the AI Debug window and its "open with the most recently used AI" feature 2010-03-11 21:55:37 +00:00
rubidium
42d7f30dcc (svn r18608) -Change: add the concept of music sets 2009-12-22 21:40:29 +00:00