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

100 Commits

Author SHA1 Message Date
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
frosch
a2e53d5ab4 (svn r27733) -Codechange: Pass NPF user data as void* instead of as array of integers. 2017-01-15 13:59:46 +00:00
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
0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs. 
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
 2016-09-18 20:06:39 +01:00
Jonathan G Rennison
d08b162119 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
 2016-02-21 12:16:11 +00:00
Jonathan G Rennison
a25ac7a161 Enable signals on bridges/tunnels to work with PBS. 2016-02-20 23:34:06 +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
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
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
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
5386558459 (svn r24481) -Feature [FS#5127]: Make the pathfinder decide whether ships shall leave depots towards north or south. 2012-08-18 11:37:47 +00:00
frosch
c7ad5b9ac0 (svn r24479) -Fix: Trains were unable to reverse in stations when using NPF. 2012-08-18 11:37:03 +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
aa1a0053b0 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 2011-12-20 17:57:56 +00:00
truebrain
d6e042c735 (svn r23376) -Remove: on popular demand, remove my (revoked) name from comments in the code. It was silly to name me like that to begin with ;) (based on patch by HackaLittleBit) 2011-11-30 01:22:18 +00:00
rubidium
de980ef0f9 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 2011-11-04 10:18:13 +00:00
frosch
398ed7ebb8 (svn r22881) -Fix (r22875): GCC warnings on 64bit systems. 2011-09-03 12:45:45 +00:00
michi_cc
dcef62040f (svn r22875) -Codechange: Add some asserts and checks to better prevent overflow of the argument to malloc. (monoid) 2011-09-02 20:54:51 +00:00
alberth
9222a30173 (svn r22145) -Codechange: Do explicit test for non-bool values. 2011-02-25 22:04:38 +00:00
rubidium
701bd8848a (svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h 2011-02-07 22:29:47 +00:00
michi_cc
789dd1470f (svn r21524) -Fix [FS#4302]: Do not apply the last signal red pathfinder penalty when the signal is a path signal. 2010-12-15 14:33:24 +00:00
terkhen
47c9189002 (svn r21516) -Codechange: Add IsGroundVehicle function to the Vehicle class. 2010-12-14 21:26:03 +00:00
rubidium
facaef9e33 (svn r21511) -Feature: vehicle lost message for ships 2010-12-13 21:56:40 +00:00
rubidium
acf7613433 (svn r21510) -Feature [FS#1956]: vehicle lost message for road vehicles 2010-12-13 21:56:25 +00:00
rubidium
3390b98958 (svn r21509) -Codechange: rename the rail pathfinders "path_not_found" parameter to "path_found" and remove the ! where the variables are set / read 2010-12-13 21:55:59 +00:00
yexo
aa744c5308 (svn r21372) -Cleanup: remove some broken npf debug code 2010-12-02 23:05:48 +00:00
alberth
9f3845227e (svn r21273) -Codechange: Return values should start at the same line. 2010-11-20 15:44:24 +00:00
smatz
c34618a11c (svn r20948) -Fix (r20880): compiler warning 2010-10-16 17:37:48 +00:00
alberth
14cd6bbbf9 (svn r20890) -Doc: Make documentation accessible to doxygen. 2010-10-02 19:55:13 +00:00
alberth
5afeeaf5d8 (svn r20889) -Codechange: Make ClosedListHash, OpenListQueue, and OpenListHash data protected, and rename for coding style. 2010-10-02 19:53:20 +00:00
alberth
a112f10386 (svn r20888) -Codechange: Make Hash_FindNode a method. 2010-10-02 19:48:45 +00:00
alberth
6be18d6b37 (svn r20887) -Codechange: Make stat_Hash a method. 2010-10-02 19:47:21 +00:00
alberth
6c31c357d6 (svn r20886) -Codechange: Make init_Hash a method. 2010-10-02 19:46:24 +00:00
alberth
67f4b8ab83 (svn r20885) -Codechange: Make delete_Hash a method. 2010-10-02 19:44:54 +00:00
alberth
0612dc2e86 (svn r20884) -Codechange: Make clear_Hash a method. 2010-10-02 19:43:29 +00:00
alberth
5cd812aafc (svn r20883) -Codechange: Make Hash_Delete a method. 2010-10-02 19:42:42 +00:00
alberth
8da98a516f (svn r20882) -Codechange: Make Hash_Set a method. 2010-10-02 19:41:25 +00:00
alberth
7b2f563727 (svn r20881) -Codechange: Make Hash_Get a method. 2010-10-02 19:39:34 +00:00
alberth
e4a5940251 (svn r20880) -Codechange: Make Hash_Size a method. 2010-10-02 19:38:22 +00:00
alberth
16b959676f (svn r20879) -Codechange: Make AyStarMain_ClosedList_IsInList a method. 2010-10-02 19:34:32 +00:00
alberth
04b0671343 (svn r20878) -Codechange: Make AyStarMain_ClosedList_Add a method. 2010-10-02 19:33:23 +00:00
alberth
b06c08cfc4 (svn r20877) -Codechange: Make AyStarMain_OpenList_IsInList a method. 2010-10-02 19:32:21 +00:00
alberth
a71d4cae11 (svn r20876) -Codechange: Make AyStarMain_OpenList_Pop a method. 2010-10-02 19:31:24 +00:00
alberth
7ed89d50d3 (svn r20875) -Codechange: Make AyStarMain_OpenList_Add a method. 2010-10-02 19:30:24 +00:00
alberth
230537d7c9 (svn r20874) -Codechange: Make init_AyStar a method. 2010-10-02 19:29:00 +00:00
alberth
cc8370a866 (svn r20868) -Codechange: Make AyStarMain_Main() a method. 2010-10-02 10:00:05 +00:00
alberth
253fca9876 (svn r20867) -Codechange: Make AyStarMain_AddStartNode() a method. 2010-10-02 09:58:32 +00:00
alberth
f509a0a922 (svn r20866) -Codechange: CheckTile() always returns the same (ignored) value. 2010-10-02 09:55:58 +00:00