Commit Graph

172 Commits (f5747bf753258574c1bd40aa205b5c250bc30408)

Author SHA1 Message Date
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
6 years ago
Henry Wilson c01a2e2a81 Codechange: Removed SmallVector completely 6 years ago
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
Jonathan G Rennison 77362b829a Initial support for rail custom bridge heads 6 years ago
Jonathan G Rennison 0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 8 years ago
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
9 years ago
rubidium ac269a3f08 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 10 years ago
rubidium 6c2abf0930 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 10 years ago
rubidium a498a56573 (svn r26130) -Codechange: add some guards against using invalid image indices 11 years ago
rubidium d2ba772f6a (svn r26130) -Codechange: add some guards against using invalid image indices 11 years ago
rubidium afa894ba3e (svn r24996) -Change: Apply default service interval changes to vehicles without custom interval (peter1138) 12 years ago
rubidium ef8d491d8f (svn r24996) -Change: Apply default service interval changes to vehicles without custom interval (peter1138) 12 years ago
rubidium 8539c04192 (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 12 years ago
rubidium 369a6f9d1b (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 12 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
truebrain 92c60447dc (svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible 13 years ago
truebrain 0d929e877f (svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible 13 years ago
truebrain 5f65e056e1 (svn r23712) -Codechange: rename the two vehicle hashes we have to names that make clear where they differ in 13 years ago
truebrain 19004a77f8 (svn r23712) -Codechange: rename the two vehicle hashes we have to names that make clear where they differ in 13 years ago
rubidium 304156a297 (svn r23683) -Fix [FS#4912]-ish: when fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing 13 years ago
rubidium 8d125a60ce (svn r23683) -Fix [FS#4912]-ish: when fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing 13 years ago
frosch e83fa1da5b (svn r23487) -Change/Fix: Make autoreplace, autorenew, cloning and autorefit check all articulated parts of a vehicle to find a shared cargo subtype. 13 years ago
frosch 2fe8e89a45 (svn r23487) -Change/Fix: Make autoreplace, autorenew, cloning and autorefit check all articulated parts of a vehicle to find a shared cargo subtype. 13 years ago
frosch 3178814a00 (svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity(). 13 years ago
frosch 026317bb44 (svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity(). 13 years ago
michi_cc 1497efbd5d (svn r23112) -Codechange: Check if vehicle chain lengths stays constant when auto-refitting. 13 years ago
michi_cc a3e6e113fe (svn r23112) -Codechange: Check if vehicle chain lengths stays constant when auto-refitting. 13 years ago
michi_cc 2b64009657 (svn r23111) -Fix: Keep subtype when automatically choosing the cargo for auto-refitting. 13 years ago
michi_cc ad2fdd8d6f (svn r23111) -Fix: Keep subtype when automatically choosing the cargo for auto-refitting. 13 years ago
frosch f9f257ce4a (svn r22984) -Feature: Display profit icons for groups in the group GUI. 13 years ago
frosch 23a2f23eb3 (svn r22984) -Feature: Display profit icons for groups in the group GUI. 13 years ago
frosch a80d20fdb1 (svn r22982) -Cleanup: Remove CountCompanyVehicles() and use ALL_GROUP statistics instead. 13 years ago
frosch 1a12008fcf (svn r22982) -Cleanup: Remove CountCompanyVehicles() and use ALL_GROUP statistics instead. 13 years ago
michi_cc d25840978c (svn r22713) -Feature: [NewGRF] Per vehicle custom cargo ageing period. 13 years ago
michi_cc 08b7981f37 (svn r22713) -Feature: [NewGRF] Per vehicle custom cargo ageing period. 13 years ago
rubidium 05199a641a (svn r21890) -Cleanup: remove some unneeded includes 14 years ago
rubidium 7eba2bf4d3 (svn r21890) -Cleanup: remove some unneeded includes 14 years ago
rubidium 3dd1cf6049 (svn r21843) -Codechange: move documentation towards the code to make it more likely to be updates [t-z]. 14 years ago
rubidium d89095b3ec (svn r21843) -Codechange: move documentation towards the code to make it more likely to be updates [t-z]. 14 years ago
smatz 6d9789fed8 (svn r21804) -Remove [FS#4409]: the 'stopall' console command, as its functionality was broken. Group start/stop commands can be used instead 14 years ago
smatz 0ab078158e (svn r21804) -Remove [FS#4409]: the 'stopall' console command, as its functionality was broken. Group start/stop commands can be used instead 14 years ago
smatz e98fe27c5d (svn r21802) -Cleanup (r2600): remove unused _vehicle_id_ctr_day 14 years ago
smatz 2709454040 (svn r21802) -Cleanup (r2600): remove unused _vehicle_id_ctr_day 14 years ago
terkhen d3dd1b0e2f (svn r21561) -Change: Allow to specify the number of vehicles to refit in the refit vehicle command. 14 years ago
terkhen a1ff6859c5 (svn r21561) -Change: Allow to specify the number of vehicles to refit in the refit vehicle command. 14 years ago
terkhen b4c22e854f (svn r21214) -Add: Display mail capacity when refitting an aircraft to passengers. 14 years ago
terkhen c96cb9ce37 (svn r21214) -Add: Display mail capacity when refitting an aircraft to passengers. 14 years ago