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

117 Commits

Author SHA1 Message Date
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
375b069f82 Replace day length scaled tick macros with global variables. 
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
 2016-09-10 01:03:48 +01: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
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
fonsinchen
97a9908b0e (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
rubidium
d5eeab43b7 (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
rubidium
41223c8bc9 (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
smatz
c85e1c3089 (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
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
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
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
e68cf6bd81 (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
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
2ab8035604 (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
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
42d7f30dcc (svn r18608) -Change: add the concept of music sets 2009-12-22 21:40:29 +00:00
rubidium
da30e736ca (svn r18330) -Cleanup: remove some unneeded includes 2009-11-28 20:35:25 +00:00
rubidium
8563406757 (svn r18207) -Fix [FS#3324] (r11961): [NewGRF] When starting a new game the values of action D variable 13 were incorrect 2009-11-21 16:39:36 +00:00
rubidium
982b8ee5fc (svn r17693) -Cleanup: remove some unneeded includes 2009-10-04 17:16:41 +00:00
frosch
64f5f1d02c (svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately. 
Note: Savegame conversion computes the inflation from max loan. Prices from modified savegames will get lost. TTO savegames will also behave slightly different.
-Change: NewGRF price modifiers now take effect everytime when loading NewGRFs instead of once on gamestart.
 2009-09-06 18:53:57 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
93493827b6 (svn r17139) -Change: add the concept of sound sets 2009-08-09 19:50:44 +00:00
rubidium
e918be12f2 (svn r17097) -Fix [FS#3092] (r13256): make restart command work again and make the help show how it works and how it doesn't work 2009-08-06 22:00:32 +00:00
smatz
4a39f236fa (svn r17084) -Codechange: _age_cargo_skip_counter is common to all vehicle types 2009-08-06 12:33:13 +00:00
rubidium
100cb17fa8 (svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types. 
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
 2009-07-22 08:59:57 +00:00
smatz
cb13cf2543 (svn r16852) -Codechange: use FOR_ALL_CARGOSPECS for iterating over all valid CargoSpecs 2009-07-16 20:40:06 +00:00
smatz
8718babe90 (svn r16849) -Codechange: replace GetCargo() by CargoSpec::Get() 2009-07-16 19:00:13 +00:00
smatz
93557ba4e9 (svn r16714) -Codechange: use pool-like accessors for Subsidy 2009-07-01 18:45:05 +00:00
smatz
61a42f42c1 (svn r16640) -Codechange: move roadstop stuff to separate files 2009-06-23 21:44:48 +00:00
rubidium
241af768f0 (svn r16242) -Codechange: rework pausing 
-Fix [FS#2864]: autopause and manual pausing conflict with eachother
-Fix: new game + pause on new game + autopause make the game not unpause on the first join
 2009-05-06 15:06:57 +00:00
rubidium
e88cb7f70f (svn r16088) -Codechange: merge HighLightStyle and ViewportHighlightMode as they are basically the same thing 2009-04-19 10:31:30 +00:00