dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,837 Commits 1 Branch 0 Tags
361758b5165ac28b5b991b284f6501e4d2e68da8
Commit Graph

679 Commits

Author SHA1 Message Date
Jonathan G Rennison
255b6adfc9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/vehicle_cmd.cpp
 2019-01-31 02:04:02 +00:00
Peter Nelson
e982b9131e Fix #7142: Missing map bounds check when building long roads. 2019-01-30 17:08:36 +00:00
Jonathan G Rennison
e3d167f9f0 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2019-01-14 00:01:44 +00:00
Joan Josep
9aecbac2b4 Codechange: Define INVALID_TOWN as a TownID (#7044) 2019-01-12 23:20:10 +00:00
Jonathan G Rennison
df92a056df Fix #6875: Depot building cost does not include foundation build cost (#6883) 2018-08-14 22:05:47 +02:00
Jonathan G Rennison
bdf155e60c Fix: Depot building cost does not include foundation build cost (#6875) 2018-08-11 01:32:32 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Jonathan G Rennison
f3dde49ff8 Prevent AIs/scripts from creating road custom bridge heads. 2017-06-22 19:02:46 +01:00
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +01:00
Jonathan G Rennison
0d4bf16f57 Merge branch 'custom_bridgeheads' into jgrpp 2017-03-23 20:15:45 +00:00
Jonathan G Rennison
57a5f08687 Fix handling of custom bridge heads on steep slopes. 2017-03-23 20:15:37 +00:00
Jonathan G Rennison
091c30e254 Merge branch 'custom_bridgeheads' into jgrpp 2017-02-22 02:54:01 +00:00
Jonathan G Rennison
3278051913 Fix crash when removing secondary road type from tunnel. 2017-02-22 02:53:38 +00:00
frosch
7f1c176706 (svn r27746) -Fix [FS#6538]: PR_CLEAR_ROAD refers to cost per roadbit. Removing secondary roadtypes from bridges was too cheap. (JGR) 2017-02-12 12:03:07 +00:00
Jonathan G Rennison
072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
 2017-02-05 20:43:56 +00:00
Jonathan G Rennison
079a5a66da Custom bridge heads: Relax ownership checks to be similar to plain roads. 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
da177d063f Custom bridge heads: Initial implementation 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
478ff2538e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
 2016-12-09 23:42:54 +00:00
frosch
10293c5fb1 (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
frosch
4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
Jonathan G Rennison
10ae23d3b9 Merge branch 'departure-boards' into jgrpp 
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
 2016-11-11 18:46:15 +00:00
frosch
d9bfe88261 (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 2016-11-05 11:53:03 +00:00
frosch
616c02c42e (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 2016-11-05 11:53:03 +00:00
Jonathan G Rennison
f0bcec77fb Import patch for random town road reconstruction. 
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438

Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
 2016-09-19 23:07:09 +01:00
Jonathan G Rennison
d733955d33 Add road vehicle state to UpdateViewport()->GetImage() var whitelist. 
Minor refactoring of var check.
 2016-09-10 01:03:48 +01:00
Jonathan G Rennison
7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
 2015-08-05 21:54:11 +01:00
Jonathan G Rennison
e24839ed65 Merge branch 'master' into enhanced_viewport_overlay 
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
 2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch 
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
 2015-08-05 21:24:30 +01:00
patch-import
4117808b9d Import adjacent crossings patch (v3.1) 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=836749#p836749
 2015-08-02 17:12:15 +01:00
frosch
d4db9cb109 (svn r27312) -Fix-ish [FS#6317]: Preserve town ownership of bridges when removing road from a road+tram bridge. (marcole) 2015-06-21 09:31:50 +00:00
frosch
eb909f2785 (svn r27312) -Fix-ish [FS#6317]: Preserve town ownership of bridges when removing road from a road+tram bridge. (marcole) 2015-06-21 09:31:50 +00:00
frosch
c0015d6a7c (svn r27311) -Fix: Mark infrastructure window dirty in more cases. (marcole) 2015-06-21 09:19:27 +00:00
frosch
62bc57db77 (svn r27311) -Fix: Mark infrastructure window dirty in more cases. (marcole) 2015-06-21 09:19:27 +00:00
frosch
07b83b8869 (svn r27308) -Fix [FS#6283]: Prevent breaking of tram-reversal points by adding more road pieces. (adf88) 2015-06-20 13:11:09 +00:00
frosch
904688c00a (svn r27308) -Fix [FS#6283]: Prevent breaking of tram-reversal points by adding more road pieces. (adf88) 2015-06-20 13:11:09 +00:00
michi_cc
ab048fdcd1 (svn r27186) -Codechange: Rename AlwaysDrawUnpavedRoads() to better reflect what it does. 2015-03-14 14:27:07 +00:00
michi_cc
67242d2269 (svn r27186) -Codechange: Rename AlwaysDrawUnpavedRoads() to better reflect what it does. 2015-03-14 14:27:07 +00:00
frosch
bd3a8bf9e4 (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 2015-02-22 14:01:24 +00:00
frosch
e8e49e5dda (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 2015-02-22 14:01:24 +00:00
rubidium
67991b70f0 (svn r26955) -Fix [FS#6126]: owner of road depot road types were not properly changed upon bankruptcy causing crashes when trying to remove the depot in certain situations 2014-10-04 19:23:43 +00:00
rubidium
4978ece6ee (svn r26955) -Fix [FS#6126]: owner of road depot road types were not properly changed upon bankruptcy causing crashes when trying to remove the depot in certain situations 2014-10-04 19:23:43 +00:00
peter1138
4f63bbedc1 (svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level. 2014-09-22 08:01:25 +00:00
peter1138
51fe741987 (svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level. 2014-09-22 08:01:25 +00:00
rubidium
dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
9daf7e749c (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +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
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 2012-12-23 21:09:09 +00:00