dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,433 Commits 1 Branch 0 Tags
2d71ec1c5a7d19760ca91ef608ba232dff6eeeb3
Commit Graph

317 Commits

Author SHA1 Message Date
Jonathan G Rennison
6187517429 Add whole-map savegame chunk 
This is to avoid haveing to do many passes to save/load map
 2018-05-29 00:24:27 +01:00
Jonathan G Rennison
cecbf257bc Merge branch 'save_ext' into template_train_replacement 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/vehicle_gui.cpp
 2018-05-25 19:12:10 +01:00
Jonathan G Rennison
a60eff174d Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2018-05-13 15:01:29 +01:00
Jonathan G Rennison
5877cd0f9b TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes 
Slight code, GUI layout, and savegame format tidying
 2018-05-13 15:00:26 +01:00
keldorkatarn
78588d8ce5 First implementation of conditional order checking slot occupancy 
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)

Some code adjustments: serialisation/storage, formatting

See: #40
 2018-04-22 15:03:16 +01:00
Jonathan G Rennison
2e4ac325e2 Add extra data fields to Order extended data 2018-04-22 12:58:50 +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
52edafab5e Add savegame support for 32 bit Train::flags field 2018-03-26 19:50:34 +01:00
Jonathan G Rennison
09ca051ff8 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train.h
 2018-03-26 18:42:23 +01:00
Jonathan G Rennison
def3a3933b Move dual-use of load_unload_ticks for bridge/tun signals to new field 2018-03-26 18:40:05 +01: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
Jonathan G Rennison
8c0c9274ea Merge branch 'infrastructure_sharing' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/misc.cpp
#	src/openttd.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-01-26 18:47:08 +00:00
Jonathan G Rennison
9000d74f3c Pay all cargo payment incomes when cargo finally delivered 2018-01-26 18:28:57 +00:00
Jonathan G Rennison
093bd804cd Merge branch 'save_ext' into infrastructure_sharing 2018-01-26 18:18:46 +00:00
Jonathan G Rennison
3a2a316588 Merge branch 'day_length' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/vehicle_sl.cpp
 2018-01-12 01:23:28 +00:00
Jonathan G Rennison
5db5581684 Merge branch 'save_ext' into jgrpp 2018-01-12 01:14:12 +00:00
Jonathan G Rennison
15fea054fb Add function pointer mode to SlXvFeatureTest 2018-01-12 01:13:49 +00:00
Jonathan G Rennison
7b567c9d26 Extend vehicle running ticks to 16 bits to avoid overflow at day length > 3 2018-01-12 00:03:15 +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
be37aad470 Update multiple docks to use savegame framework, fix merge conflicts 2017-09-20 19:50:53 +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
36a712a579 Add very and extremely slow options to town growth rate setting 2017-08-20 11:14:43 +01:00
Jonathan G Rennison
9077d6f4d2 Add support for loading SpringPP v2.3, v2.4 savegames 2017-06-14 00:26:52 +01: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
bfb8f6f32e Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2017-04-11 23:42:14 +01:00
Jonathan G Rennison
c44141bad6 Add conditional to test slot occupancy state. 
Bump tracerestrict version.
 2017-04-10 19:00:52 +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
f50a9fef4f Add TRRS tracerestrict slot chunk to SLXI header. 2017-04-04 18:47:21 +01:00
Jonathan G Rennison
9d0f0967f9 Enabled loading non-SLXI version 2002 tracerestrict savegames. 2017-03-30 22:52:14 +01:00
Jonathan G Rennison
19e5964b31 Bump tracerestrict version due to wait at PBS and slot features. 2017-03-30 22:49:27 +01:00
Jonathan G Rennison
58d8a791e4 Merge branch 'save_ext' into tracerestrict-sx 2017-03-20 19:18:34 +00:00
Jonathan G Rennison
0690dbb8bf Merge branch 'jgrpp' into chunnel 2017-03-05 15:30:27 +00:00
Jonathan G Rennison
fa044852d5 Merge branch 'day_length' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
 2017-03-05 15:29:45 +00:00
Jonathan G Rennison
11906f24c5 Merge branch 'save_ext' into day_length 2017-03-05 15:05:13 +00:00
Jonathan G Rennison
79439925c8 Clear discardable chunk IDs in SlXvResetState. 2017-03-04 20:09:42 +00:00
Jonathan G Rennison
75410ddae4 Chunnel: Save/load changes 2017-03-04 12:39:32 +00:00
Jonathan G Rennison
072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
 2017-02-05 20:43:56 +00:00
Jonathan G Rennison
1f727e9029 Custom bridge heads: Add savegame version and setting. 2017-02-05 18:01:31 +00:00
Jonathan G Rennison
24b3424ca3 Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
 2017-01-21 01:44:05 +00:00
Jonathan G Rennison
d4157b3662 TBTR: Handle leftover template vehicles without owners in old saves. 2017-01-21 01:40:26 +00:00
Jonathan G Rennison
d25daebf2f Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2017-01-17 19:25:55 +00:00
Jonathan G Rennison
82152d8605 Merge branch 'tracerestrict' into tracerestrict-sx 
# Conflicts:
#	src/saveload/saveload.cpp
 2017-01-17 19:23:33 +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