dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,333 Commits 1 Branch 0 Tags
f02d04fa1244c5cbab8fa8665023535d3d89df6f
Commit Graph

1771 Commits

Author SHA1 Message Date
innocenat
0b8f0e64ec Scheduled Dispatch feature 
Code is tested and run well on small-ish train network. Not tested extensively.
 2017-05-30 01:37:08 +07:00
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +01:00
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
 2017-04-05 19:00:24 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
peter1138
19d56a33e8 (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
peter1138
0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
Jonathan G Rennison
9d5f34fea6 Replace various uses of std::set/map with btree containers. 2017-02-08 00:18:09 +00:00
Jonathan G Rennison
1e1fcc471b Replace leftover debug print from veh repair fix with scope info fmt. 
Fixes c6b1decaf
 2017-01-30 19:45:53 +00:00
Jonathan G Rennison
c6b1decafd Do not pay for repair cost when vehicle is being auto-replaced. 2017-01-15 01:00:37 +00:00
Jonathan G Rennison
c600ffe6d5 Fix go to nearest depot and halt orders, not halting. 2017-01-11 23:49:23 +00:00
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.
 2017-01-02 20:21:58 +00:00
Jonathan G Rennison
51d4a6b14d Merge branch 'improved_breakdowns' into jgrpp 2017-01-02 19:28:11 +00:00
Jonathan G Rennison
5ba666883b Fix double/inconsistent updating of variables when servicing vehicle. 2017-01-02 19:27:39 +00:00
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 2017-01-02 18:13:45 +00:00
Jonathan G Rennison
0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/clear_cmd.cpp
 2016-12-26 15:35:01 +00:00
Jonathan G Rennison
09188e30f9 Exclude virtual/template vehicles from vehicle ageing and news messages. 2016-12-18 00:47:11 +00:00
Jonathan G Rennison
55e57fd07d Add shift-clicking on vehicle depot button to select specific depot. 2016-11-28 20:17:53 +00:00
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
 2016-11-01 23:00:48 +00:00
Jonathan G Rennison
d204062300 Merge branch 'master' into template_train_replacement 2016-11-01 19:43:35 +00:00
frosch
117e73751c (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
ba566e9126 (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
c175067ed9 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00
frosch
a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00
frosch
d2393b4f6c (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
frosch
f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
Jonathan G Rennison
16ce37ad14 Show vehicle route markers when cargo load by type window focused. 2016-09-22 00:38:44 +01:00
Jonathan G Rennison
e844b82d9e Use vector instead of list for Station::loading_vehicles. 2016-09-13 22:58:00 +01:00
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
 2016-09-10 00:57:05 +01:00
Jonathan G Rennison
f7774415f2 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	src/stdafx.h
 2016-09-08 19:36:00 +01:00
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
 2016-09-08 00:12:48 +01:00
cirdan
ca98e78c69 Remove unused Vehicle capacity methods 
Remove unused methods Vehicle::GetConsistFreeCapacities and
Vehicle::GetConsistTotalCapacity.

(cherry picked from commit d97442878f9856c253a3bf976b6a3e114faebefe)
 2016-09-07 21:32:27 +01:00
Jonathan G Rennison
6031cca2d7 Refactor Link Refresher cargo mask handling. 
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
 2016-09-06 22:16:29 +01:00
Jonathan G Rennison
3507b51d9e Initial LinkRefresher support for cargo-specific links. 2016-09-05 00:12:48 +01:00
Jonathan G Rennison
23a1c07378 Merge branch 'master' into template_train_replacement 
Fix Template creation window vehicle drag cursor.
 2016-08-26 00:00:20 +01:00
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.
 2016-07-08 19:07:25 +01:00
Jonathan G Rennison
5b7eb46fe4 Merge branch 'improved_breakdowns-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2016-06-05 23:21:55 +01:00
Jonathan G Rennison
60d5bbc0e7 Fix improved breakdowns aircraft speed-reductions. 
Breakdown speed was wrong and possibly 0 for planes with
GRF-defined speed limits.
 2016-06-05 22:28:17 +01:00
Jonathan G Rennison
655b329142 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
 2016-06-02 19:25:23 +01:00
frosch
dac94c7cbc (svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment. 2016-05-29 13:33:20 +00:00
frosch
a66e0ff1f4 (svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment. 2016-05-29 13:33:20 +00:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00
Jonathan G Rennison
13c88dcef2 Merge branch 'template_train_replacement-sx' into jgrpp 2016-03-21 21:19:46 +00:00
Jonathan G Rennison
bdca33ee80 Merge branch 'crashlog_improvements' into jgrpp 2016-03-21 20:47:16 +00:00
Jonathan G Rennison
5359c43ec1 Add scope logging for Vehicle::PreDestructor. 2016-03-21 20:33:55 +00:00
Jonathan G Rennison
330a7327d6 Minor changes to avoid undefined behaviour warnings. 
Avoid creating a reference from a nullptr.
Avoid trying a malloc and memcpy into a 0 length buffer.
Virtual trains should never be drawn.
 2016-03-21 20:22:01 +00:00
Jonathan G Rennison
6741c98f6b TBTR: Fix virtual trains being created at load using wrong company. 
Fix virtual trains showing up in company engine counts.
 2016-03-21 18:22:29 +00:00
Jonathan G Rennison
4722c81e88 Merge branch 'crashlog_improvements' into jgrpp 2016-02-25 22:27:55 +00:00
Jonathan G Rennison
0062881a46 Avoid using malloc in scope guard logger. 
Use a temporary object with its own buffer, which lives on the stack.

Reformat SCOPE_INFO_FMT to not be all on one line.
Other minor reformatting.
 2016-02-25 00:20:31 +00:00
Jonathan G Rennison
1e9ab8e64e Template replacement usage of scope guard logging. 2016-02-17 22:56:36 +00:00