dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,000 Commits 1 Branch 0 Tags
a6596a6e34d974dbd06c69aa670c4abf2a1eb844
Commit Graph

1477 Commits

Author SHA1 Message Date
Jonathan G Rennison
f59535c0b7 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 2018-08-16 05:45:30 +01:00
Jonathan G Rennison
60cc1a48ac Refresh trace restrict slots window as with the train list window 2018-08-15 19:38:56 +01:00
Jonathan G Rennison
1c41cff322 Add GV flags and reversing distance to DumpVehicleFlags 2018-08-15 03:43:57 +01:00
Jonathan G Rennison
6578d94e63 Add support for timetabled wait times at waypoints 2018-08-14 12:35:05 +01:00
Jonathan G Rennison
5344ec1931 Add a "leave early" order timetable flag 
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
 2018-08-13 01:40:17 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
 2018-07-24 18:30:42 +01:00
Niels Martin Hansen
2a868b9f3b Feature: Framerate display window (#6822) 
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
 2018-07-19 21:17:07 +02:00
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
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
 2018-07-02 21:04:06 +01:00
Jonathan G Rennison
00b1fe6246 Cargo type orders: Add support for 64 cargo types 2018-07-02 21:03:53 +01:00
Jonathan G Rennison
0ae32838ea Merge branch 'save_ext' into cargo_type_order 
# Conflicts:
#	src/core/smallstack_type.hpp
 2018-07-02 18:52:22 +01:00
Jonathan G Rennison
ef0a458ab6 Add go to depot and sell vehicle orders 
Controlled by a setting (default off)
 2018-06-21 23:28:19 +01:00
Jonathan G Rennison
b5dea7f236 Fix undefined behaviour in Vehicle destructor 2018-06-06 18:38:18 +01:00
Jonathan G Rennison
58ccafbf1d Debug: Add vehicle_flags and cargo_payment to veh flags dump 2018-06-05 19:28:04 +01:00
Jonathan G Rennison
943f4fdabb Debug: Add train and RV flags to scope info dump 
Move flag dumping to separate function
 2018-06-05 18:54:59 +01:00
Jonathan G Rennison
016f0bdfaf Through load: Fix getting and checking station veh/tile when leaving station 2018-06-02 00:34:30 +01:00
Jonathan G Rennison
ec8ad55bb5 Clear all VF_CARGO_UNLOADING flags when leaving station 2018-06-01 19:33:17 +01:00
Jonathan G Rennison
4aa211e454 Merge branch 'crashlog_improvements' into jgrpp 2018-05-31 23:04:47 +01:00
Jonathan G Rennison
bb8c18b017 Add scope info logging to LoadUnloadStation 2018-05-31 23:04:24 +01:00
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
 2018-05-25 18:29:17 +01:00
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