dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,949 Commits 1 Branch 0 Tags
bdd55aad0768bbce67007ff2e453882bd92f5d25
Commit Graph

75 Commits

Author SHA1 Message Date
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
d3e0c3787f Merge branch 'master' into jgrpp-nrt 
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
 2019-07-13 20:34:52 +01:00
Jonathan G Rennison
36eb4165b8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
 2019-07-08 16:19:07 +01:00
Charles Pigott
119ea7a195 Codechange: Remove StationHadVehicleOfTypeByte type 2019-04-29 17:40:22 +01:00
Charles Pigott
fb6ae81415 Codechange: Remove StationFacilityByte type 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
290471c70f Use btree_set for IndustryList and StationList 2019-03-13 03:39:11 +00:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp 
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
 2019-03-13 03:38:26 +00:00
peter1138
ed6084523d Codechange: Convert StationList from SmallVector to std::set. 2019-03-09 16:33:47 +00:00
Jonathan G Rennison
635ee89b86 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/economy.cpp
 2019-02-22 01:00:38 +00:00
peter1138
5ab1a73a8a Codechange: Remove never-used StationIDList. 2019-02-21 17:45:47 +01:00
keldorkatarn
1d3cf59d8a Allow building multiple docks per station. 
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
 2017-09-20 19:11:48 +01:00
Jonathan G Rennison
735fc1fc68 Increase maximum permitted depot and station name lengths. 2017-06-01 21:33:36 +01:00
fonsinchen
b908128ffb (svn r25890) -Codechange: define a smallstack for station IDs 2013-10-20 13:47:11 +00:00
fonsinchen
dffc4d411e (svn r25890) -Codechange: define a smallstack for station IDs 2013-10-20 13:47:11 +00:00
fonsinchen
f022550df9 (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 2013-06-09 13:03:48 +00:00
fonsinchen
04e3eb6fab (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 2013-06-09 13:03:48 +00:00
rubidium
3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
df16ebd730 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
terkhen
a88fe7c2aa (svn r22343) -Change: Remove pixel limiter for query strings. 2011-04-17 18:42:17 +00:00
terkhen
10caf391a1 (svn r22343) -Change: Remove pixel limiter for query strings. 2011-04-17 18:42:17 +00:00
rubidium
05199a641a (svn r21890) -Cleanup: remove some unneeded includes 2011-01-22 14:52:20 +00:00
rubidium
7eba2bf4d3 (svn r21890) -Cleanup: remove some unneeded includes 2011-01-22 14:52:20 +00:00
rubidium
623ed581e3 (svn r21797) -Fix/Change: unify the size (in characters) of the string inputs with eachother and TTD to prevent crashes/asserts with e.g. signs that are too long 2011-01-14 22:08:40 +00:00
rubidium
6b86ee9888 (svn r21797) -Fix/Change: unify the size (in characters) of the string inputs with eachother and TTD to prevent crashes/asserts with e.g. signs that are too long 2011-01-14 22:08:40 +00:00
rubidium
7267a4de2c (svn r21415) -Codechange: limit station/waypoint name by amount of characters, not bytes 2010-12-05 22:25:36 +00:00
rubidium
44d1c55347 (svn r21415) -Codechange: limit station/waypoint name by amount of characters, not bytes 2010-12-05 22:25:36 +00:00
rubidium
f09a74a996 (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 2010-05-13 09:44:44 +00:00
rubidium
398418b8fa (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 2010-05-13 09:44:44 +00:00
smatz
d2e99657fa (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
smatz
53aaabe6e9 (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
rubidium
9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
e202a26990 (svn r18715) -Codechange: make StationFinder a subclass of TileArea 2010-01-04 18:12:10 +00:00
rubidium
31b325baaf (svn r18715) -Codechange: make StationFinder a subclass of TileArea 2010-01-04 18:12:10 +00:00
rubidium
82a96c3e35 (svn r18714) -Codechange: move the TileArea struct to it's own header 2010-01-04 18:05:14 +00:00
rubidium
8b88bb0c9b (svn r18714) -Codechange: move the TileArea struct to it's own header 2010-01-04 18:05:14 +00:00
rubidium
0f7cee89d8 (svn r18377) -Codechange: add 'cache' of the tile area of truck and bus stops. 2009-12-02 16:20:44 +00:00
rubidium
81062163a2 (svn r18377) -Codechange: add 'cache' of the tile area of truck and bus stops. 2009-12-02 16:20:44 +00:00
smatz
2c63d0d323 (svn r18110) -Codechange [FS#3316]: search for stations nearby only once per producer (instead of once pre produced cargo type) (fonsinchen) 2009-11-15 21:06:13 +00:00
smatz
47660b984b (svn r18110) -Codechange [FS#3316]: search for stations nearby only once per producer (instead of once pre produced cargo type) (fonsinchen) 2009-11-15 21:06:13 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
edf7b21e18 (svn r16976) -Codechange: remove WaypointID and MAX_LENGTH constants in favour of their Station variants 2009-07-28 21:06:38 +00:00
rubidium
e473e69ba4 (svn r16976) -Codechange: remove WaypointID and MAX_LENGTH constants in favour of their Station variants 2009-07-28 21:06:38 +00:00
rubidium
3321f45246 (svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code. 2009-07-26 21:07:03 +00:00
rubidium
47a37b6093 (svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code. 2009-07-26 21:07:03 +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
rubidium
68ead6b84f (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
rubidium
196dd0974f (svn r16876) -Codechange: add helper functions to cast to Station/Waypoint with some extra checks. 2009-07-18 18:39:17 +00:00