Commit Graph

785 Commits (bb6b8d8cd60c3c1761267233ed1227d8576226db)

Author SHA1 Message Date
Jonathan G Rennison d730cfd51d Cache sprite sequence bounds for vehicles 7 years ago
Jonathan G Rennison dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
7 years ago
Jonathan G Rennison 0a80aec634 Implement critical breakdown speed reduction for road vehicles 7 years ago
Jonathan G Rennison 218085c535 Timetable: Implement autofill/automate for taken conditional orders.
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
7 years ago
Jonathan G Rennison 6df5cac0df Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/vehicle.cpp
7 years ago
Jonathan G Rennison 2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/smallmap_gui.cpp
7 years ago
Jonathan G Rennison add9be20a0 Merge branch 'enhanced_viewport_overlay' into jgrpp 7 years ago
Jonathan G Rennison d3a1e8060d Fix vehicle draw flickering, particularly in viewport map mode
Incorrect bounds check in ViewportAddVehicles/ViewportMapDrawVehicles
7 years ago
adf88 dbf7ed502a (svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window 7 years ago
Jonathan G Rennison ac016eae5e Add client setting to enable shared order group window for single vehicles 7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
Jonathan G Rennison 2d66f25f6c Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/vehicle.cpp
7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison 965938c0f5 Merge branch 'scheduled-dispatch-sx' into jgrpp 7 years ago
Jonathan G Rennison bbd2e6f2f5 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
7 years ago
Jonathan G Rennison 350c2bb24f Make trains break down after collision with road vehicle. 7 years ago
Jonathan G Rennison 44fa555c6d Merge branch 'save_ext' into improved_breakdowns 7 years ago
innocenat 0b8f0e64ec Scheduled Dispatch feature
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
Jonathan G Rennison 0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 7 years ago
Jonathan G Rennison b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
7 years ago
Jonathan G Rennison 6417fb16c3 Initial implementation of trace restrict slots 7 years ago
peter1138 0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 7 years ago
Jonathan G Rennison 9d5f34fea6 Replace various uses of std::set/map with btree containers. 7 years ago
Jonathan G Rennison 1e1fcc471b Replace leftover debug print from veh repair fix with scope info fmt.
Fixes c6b1decaf
8 years ago
Jonathan G Rennison c6b1decafd Do not pay for repair cost when vehicle is being auto-replaced. 8 years ago
Jonathan G Rennison c600ffe6d5 Fix go to nearest depot and halt orders, not halting. 8 years ago
Jonathan G Rennison 7ecdebddb3 Change and simplify algorithm for vehicle repair cost.
This is due to absurdly high repair costs for old vehicles with
old algorithm, due to implicit exponential increases.
Get rid of variable in vehicle struct.
8 years ago
Jonathan G Rennison 51d4a6b14d Merge branch 'improved_breakdowns' into jgrpp 8 years ago
Jonathan G Rennison 5ba666883b Fix double/inconsistent updating of variables when servicing vehicle. 8 years ago
Jonathan G Rennison dcbde21f18 Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/train_cmd.cpp
8 years ago
Jonathan G Rennison 0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
Jonathan G Rennison 09188e30f9 Exclude virtual/template vehicles from vehicle ageing and news messages. 8 years ago
Jonathan G Rennison 55e57fd07d Add shift-clicking on vehicle depot button to select specific depot. 8 years ago
Jonathan G Rennison 7f10d83a4a Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
8 years ago
Jonathan G Rennison d204062300 Merge branch 'master' into template_train_replacement 8 years ago
frosch ba566e9126 (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 8 years ago
frosch a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 8 years ago
frosch f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 8 years ago
Jonathan G Rennison 16ce37ad14 Show vehicle route markers when cargo load by type window focused. 8 years ago
Jonathan G Rennison e844b82d9e Use vector instead of list for Station::loading_vehicles. 8 years ago
Jonathan G Rennison c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
8 years ago
Jonathan G Rennison 9ea018abc5 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
8 years ago
cirdan ca98e78c69 Remove unused Vehicle capacity methods
Remove unused methods Vehicle::GetConsistFreeCapacities and
Vehicle::GetConsistTotalCapacity.

(cherry picked from commit d97442878f9856c253a3bf976b6a3e114faebefe)
8 years ago
Jonathan G Rennison 6031cca2d7 Refactor Link Refresher cargo mask handling.
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
8 years ago
Jonathan G Rennison 3507b51d9e Initial LinkRefresher support for cargo-specific links. 8 years ago
Jonathan G Rennison 23a1c07378 Merge branch 'master' into template_train_replacement
Fix Template creation window vehicle drag cursor.
8 years ago
Jonathan G Rennison 3ac94e97c8 Cache the result of GetImage() in Vehicle::UpdateViewport() where possible.
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
8 years ago
Jonathan G Rennison 5b7eb46fe4 Merge branch 'improved_breakdowns-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison 60d5bbc0e7 Fix improved breakdowns aircraft speed-reductions.
Breakdown speed was wrong and possibly 0 for planes with
GRF-defined speed limits.
8 years ago
Jonathan G Rennison 655b329142 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
8 years ago