Commit Graph

243 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison 6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
6 years ago
frosch 00b422712e (svn r27687) -Fix: RailtypeInfo::alternate_labels leaked when reloading NewGRF. (adf88) 8 years ago
frosch 3ee06b036e (svn r27687) -Fix: RailtypeInfo::alternate_labels leaked when reloading NewGRF. (adf88) 8 years ago
frosch ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 9 years ago
frosch 2d636266f5 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 9 years ago
frosch 13a726b18f (svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side. 9 years ago
frosch 74e61a1806 (svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side. 9 years ago
alberth 48c5bb4dc0 (svn r26803) -Doc: Document some fields in the build vehicle gui, and the rail definition struct. 10 years ago
alberth dcc67681ad (svn r26803) -Doc: Document some fields in the build vehicle gui, and the rail definition struct. 10 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
michi_cc bcac892dd7 (svn r24367) -Feature: [NewGRF] Customisable signals for rail types. 12 years ago
michi_cc b0d21d2fad (svn r24367) -Feature: [NewGRF] Customisable signals for rail types. 12 years ago
michi_cc ff73fdb4b0 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 12 years ago
michi_cc 9101d2e2d2 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 12 years ago
michi_cc 7f06f392f7 (svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type. 12 years ago
michi_cc 0542e26460 (svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type. 12 years ago
michi_cc 64b7bc557f (svn r23758) -Feature: [NewGRF] Alternate rail type label list. 13 years ago
michi_cc ee0fcb2567 (svn r23758) -Feature: [NewGRF] Alternate rail type label list. 13 years ago
rubidium 0cfe86cead (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 13 years ago
rubidium e40eb8177a (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 13 years ago
michi_cc fc8633e1ac (svn r23415) -Feature: Infrastructure maintenance costs. 13 years ago
michi_cc d3b7b89493 (svn r23415) -Feature: Infrastructure maintenance costs. 13 years ago
michi_cc 23bf62c77a (svn r23129) -Add: [NewGRF] Property for the rail type name. 13 years ago
michi_cc fe574b7e0c (svn r23129) -Add: [NewGRF] Property for the rail type name. 13 years ago
frosch 74fbbc2f38 (svn r22633) -Fix: Implement variables 25 and 7F for railtypes. 13 years ago
frosch d2b236802c (svn r22633) -Fix: Implement variables 25 and 7F for railtypes. 13 years ago
frosch fb72295945 (svn r22436) -Fix (r18969): Apply railtype property 12 (station graphics) also to station groundsprites from action 1. 13 years ago
frosch 76c7cbff70 (svn r22436) -Fix (r18969): Apply railtype property 12 (station graphics) also to station groundsprites from action 1. 13 years ago
planetmaker 182d351959 (svn r21919) -Fix: Converting an expensive rail type to a cheap one could give more money than removing and rebuilding cost 14 years ago
planetmaker 5e82fee690 (svn r21919) -Fix: Converting an expensive rail type to a cheap one could give more money than removing and rebuilding cost 14 years ago
rubidium 95e0695e02 (svn r21866) -Feature [FS#4394]: [NewGRF] Rail type property to influence sorting of rail types in the drop down list 14 years ago
rubidium 2f6c840ebf (svn r21866) -Feature [FS#4394]: [NewGRF] Rail type property to influence sorting of rail types in the drop down list 14 years ago
rubidium 0cf2ef83f0 (svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s]. 14 years ago
rubidium 9ca4b629cd (svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s]. 14 years ago
rubidium abc1828d30 (svn r21842) -Feature [FS#4393]: [NewGRF] Introduction dates/required types for rail types; e.g. introduce a particular rail type in 1960 (or when a vehicle using it is introduced), but also allow limiting its introduction to only happen when the required railtypes are available 14 years ago
rubidium b8c9988d9f (svn r21842) -Feature [FS#4393]: [NewGRF] Introduction dates/required types for rail types; e.g. introduce a particular rail type in 1960 (or when a vehicle using it is introduced), but also allow limiting its introduction to only happen when the required railtypes are available 14 years ago
rubidium dc94c94599 (svn r21841) -Feature: [NewGRF] Allow to define other railtypes that should be introduced if a particular rail type is introduced, e.g. to make sure slow rail is introduced when fast rail gets introduced 14 years ago
rubidium 6371b75bcc (svn r21841) -Feature: [NewGRF] Allow to define other railtypes that should be introduced if a particular rail type is introduced, e.g. to make sure slow rail is introduced when fast rail gets introduced 14 years ago
frosch c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 14 years ago
frosch 4bd32799f1 (svn r20286) -Codechange: Unify end of doxygen comments. 14 years ago
frosch 5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
michi_cc e94f75095a (svn r20049) -Feature: [NewGRF] Add a railtype flag to disallow level crossings per railtype. 14 years ago
michi_cc 34f32cbbf4 (svn r20049) -Feature: [NewGRF] Add a railtype flag to disallow level crossings per railtype. 14 years ago
smatz d2e99657fa (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 14 years ago
smatz 53aaabe6e9 (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 14 years ago
peter1138 369975964a (svn r19433) -Codechange: Limit rail clearance earnings to 3/4s of rail build cost, to avoid money making loophole when rail build cost is less than rail removal earnings. 14 years ago
peter1138 0dd8110484 (svn r19433) -Codechange: Limit rail clearance earnings to 3/4s of rail build cost, to avoid money making loophole when rail build cost is less than rail removal earnings. 14 years ago
alberth 19dff3a6b2 (svn r19414) -Doc: Several doxygen additions and corrections. 14 years ago
alberth 777123c228 (svn r19414) -Doc: Several doxygen additions and corrections. 14 years ago
alberth 130f9f96b3 (svn r19413) -Codechange: Merging RailtypeFlag enum (a bit number) with RailTypeFlags enum (had values only). 14 years ago
alberth b8d6e893cb (svn r19413) -Codechange: Merging RailtypeFlag enum (a bit number) with RailTypeFlags enum (had values only). 14 years ago
alberth 014f651e65 (svn r19365) -Codechange: Move EnsureNoTrainOnTrackProc() to src/vehicle.cpp. 14 years ago
alberth 29b79e03e8 (svn r19365) -Codechange: Move EnsureNoTrainOnTrackProc() to src/vehicle.cpp. 14 years ago
peter1138 73fdfa40e0 (svn r19307) -Add: Let railtypes specify their own smallmap colour. No legend support yet. 14 years ago
peter1138 1025d003b3 (svn r19307) -Add: Let railtypes specify their own smallmap colour. No legend support yet. 14 years ago
peter1138 82f09c6ed8 (svn r19306) -Change: Railtype cost factor from byte to word value 14 years ago
peter1138 c3d3e7d383 (svn r19306) -Change: Railtype cost factor from byte to word value 14 years ago
peter1138 7cc76dcbda (svn r19056) -Add: [NewGRF] Action 3/2/1 (i.e. new graphics) support for rail types. (To be documented...) 15 years ago
peter1138 898e879bd9 (svn r19056) -Add: [NewGRF] Action 3/2/1 (i.e. new graphics) support for rail types. (To be documented...) 15 years ago
peter1138 8ef348311d (svn r18972) -Add: [NewGRF] Per-rail type speed limits. 15 years ago
peter1138 2b820780a1 (svn r18972) -Add: [NewGRF] Per-rail type speed limits. 15 years ago
peter1138 91c42bb596 (svn r18969) -Add: [NewGRF] NewGRF-settable rail type properties. 15 years ago
peter1138 32ef582c37 (svn r18969) -Add: [NewGRF] NewGRF-settable rail type properties. 15 years ago
rubidium 9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
peter1138 8651144bee (svn r18766) -Codechange: Make train acceleration type (rail/elrail/monorail vs maglev) a rail type property 15 years ago
peter1138 1382964fa0 (svn r18766) -Codechange: Make train acceleration type (rail/elrail/monorail vs maglev) a rail type property 15 years ago
peter1138 10753a6199 (svn r18509) -Codechange (r2515,r2753): Data for drawing single_x/y rail pieces was inverted. 15 years ago
peter1138 7b136d1fdd (svn r18509) -Codechange (r2515,r2753): Data for drawing single_x/y rail pieces was inverted. 15 years ago
rubidium 224f4e0197 (svn r18028) -Codechange: unglobalise some functions 15 years ago
rubidium 860b9b1cea (svn r18028) -Codechange: unglobalise some functions 15 years ago
frosch 040404c5d3 (svn r18005) -Codechange: Convert the Prices struct into an array and an enum. 15 years ago
frosch ba1fc280e3 (svn r18005) -Codechange: Convert the Prices struct into an array and an enum. 15 years ago
rubidium 310465da07 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 15 years ago
rubidium e8ddf001c8 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium a78751ee9a (svn r16869) -Codechange: make drawing waypoints a tiny bit more like drawing stations 15 years ago
rubidium 861a2163f6 (svn r16869) -Codechange: make drawing waypoints a tiny bit more like drawing stations 15 years ago
smatz f6a4d61cca (svn r16643) -Codechange: replace GetStationByTile() by Station::GetByTile() 15 years ago
smatz 8343340acb (svn r16643) -Codechange: replace GetStationByTile() by Station::GetByTile() 15 years ago
rubidium 4c0542c17f (svn r16393) -Codechange: move VehicleRail to Train. 15 years ago
rubidium da5661a0c8 (svn r16393) -Codechange: move VehicleRail to Train. 15 years ago
peter1138 793eabf61e (svn r15417) -Codechange: Add default rail type labels and support for per-GRF translation table. 16 years ago
peter1138 a68e0ee42f (svn r15417) -Codechange: Add default rail type labels and support for per-GRF translation table. 16 years ago
peter1138 f382c2381b (svn r15050) -Codechange: Use one absolute SpriteID with offsets to draw track fences. 16 years ago
peter1138 56b91b582e (svn r15050) -Codechange: Use one absolute SpriteID with offsets to draw track fences. 16 years ago
smatz b2852f88fb (svn r14448) -Codechange [FS#2328]: rename a few variables (based on a patch by planetmaker) 16 years ago
smatz 1906aa2bbb (svn r14448) -Codechange [FS#2328]: rename a few variables (based on a patch by planetmaker) 16 years ago
rubidium f56e630e5c (svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with. 16 years ago
rubidium 3b798599b6 (svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with. 16 years ago
peter1138 e3fad31f31 (svn r14162) -Fix: Allow rail type conversion if the rail type cost multipliers are the same. 16 years ago
peter1138 6e4d8a273e (svn r14162) -Fix: Allow rail type conversion if the rail type cost multipliers are the same. 16 years ago
peter1138 2ea575e36c (svn r14160) -Codechange: Move _railtype_cost_multipliers into the rail type information struct. 16 years ago
peter1138 b45ced35ee (svn r14160) -Codechange: Move _railtype_cost_multipliers into the rail type information struct. 16 years ago
peter1138 e999f189e6 (svn r14158) -Codechange: Initialization of rail type data from static source, so data can be changed. 16 years ago