dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,315 Commits 1 Branch 0 Tags
2b4741b97da65abcab86f3232e2ba27263efee12
Commit Graph

1605 Commits

Author SHA1 Message Date
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
Jonathan G Rennison
f42cc19aad Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
 2018-04-27 00:33:44 +01:00
Jonathan G Rennison
53dd010f3b Add way to mass cancel vehicle go to depot/service 2018-03-29 19:37:16 +01:00
Jonathan G Rennison
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
Jonathan G Rennison
864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
 2018-03-11 22:16:19 +00:00
frosch
5558899621 (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. 2018-03-11 13:23:26 +00:00
frosch
6b088d37bf (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. 2018-03-11 13:23:26 +00:00
Jonathan G Rennison
ec661d7ae9 Merge branch 'template_train_replacement' into jgrpp 2018-01-30 18:58:34 +00:00
Jonathan G Rennison
4a9df57665 TBTR: Enable autorenew when template replacement active 2018-01-30 18:58:09 +00:00
Jonathan G Rennison
06a2457efc Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/vehicle.cpp
 2018-01-29 22:09:40 +00:00
Jonathan G Rennison
64d9f88802 TBTR: Fix bugs when both autoreplace and template replacement active on same vehicle 2018-01-29 22:08:26 +00:00
Jonathan G Rennison
233b0f8e9e TBTR: Add sanity check assertions 2018-01-29 22:05:55 +00:00
Jonathan G Rennison
d730cfd51d Cache sprite sequence bounds for vehicles 2018-01-19 19:13:01 +00:00
Jonathan G Rennison
dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp 
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2018-01-04 19:47:46 +00:00
Jonathan G Rennison
0a80aec634 Implement critical breakdown speed reduction for road vehicles 2018-01-04 19:18:24 +00:00
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.
 2017-12-18 01:26:27 +00:00
Jonathan G Rennison
6df5cac0df Merge branch 'enhanced_viewport_overlay' into jgrpp 
# Conflicts:
#	src/vehicle.cpp
 2017-09-04 01:24:10 +01:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	config.lib
 2017-09-04 01:22:54 +01:00
Jonathan G Rennison
2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/smallmap_gui.cpp
 2017-09-04 01:04:04 +01:00
Jonathan G Rennison
add9be20a0 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-08-31 20:23:54 +01:00
Jonathan G Rennison
d3a1e8060d Fix vehicle draw flickering, particularly in viewport map mode 
Incorrect bounds check in ViewportAddVehicles/ViewportMapDrawVehicles
 2017-08-31 20:23:32 +01:00
adf88
88726f71b6 (svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window 2017-08-31 06:47:17 +00:00
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 2017-08-31 06:47:17 +00:00
Jonathan G Rennison
ac016eae5e Add client setting to enable shared order group window for single vehicles 2017-08-18 01:49:21 +01:00
Jonathan G Rennison
ba33754993 Merge branch 'save_ext' into tracerestrict-sx 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:28:30 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
Jonathan G Rennison
2d66f25f6c Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/vehicle.cpp
 2017-08-15 19:17:12 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
965938c0f5 Merge branch 'scheduled-dispatch-sx' into jgrpp 2017-06-08 23:27:33 +01:00
Jonathan G Rennison
bbd2e6f2f5 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
 2017-06-06 21:08:37 +01:00
Jonathan G Rennison
350c2bb24f Make trains break down after collision with road vehicle. 2017-06-06 20:20:33 +01:00
Jonathan G Rennison
44fa555c6d Merge branch 'save_ext' into improved_breakdowns 2017-06-06 18:41:01 +01:00
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