dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,457 Commits 1 Branch 0 Tags
b6e9817edbea4d23cf9480f9958ded45b86ff41f
Commit Graph

227 Commits

Author SHA1 Message Date
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
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
e1a841aa05 Fix loading of signals on bridges/tunnels from SpringPP savegames. 
Reg/green states were incorrect.
 2016-11-25 23:42:26 +00:00
Jonathan G Rennison
ddae95addb Rescale town cargo adj setting by 10x, for finer adjustment. 
Use DECIMAL1 instead of an integer.
 2016-11-25 23:24:41 +00:00
Jonathan G Rennison
37a58fd11d Add setting to increase station catchment radius. 
Update acceptance and refresh screen when catchment settings change.
 2016-11-20 01:49:10 +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
92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 2016-11-01 20:27:30 +00:00
Jonathan G Rennison
55e98d1182 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2016-10-11 19:02:03 +01:00
Jonathan G Rennison
4c74bda0af Fix extended order info not being saved for vehicle current order. 
This fixes desync and related issues when loading savegames where
extended order info is used.
 2016-10-11 19:01:16 +01:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs. 
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
 2016-09-18 20:06:39 +01:00
Jonathan G Rennison
161f70eb4a Merge branch 'save_ext' into signal_tunnels_bridges 2016-09-18 13:53:01 +01:00
Jonathan G Rennison
021b72490f Mark SpringPP imports as fake extended savegame versions. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
ae8e19cf9a Merge branch 'save_ext' into jgrpp 2016-09-13 22:57:08 +01:00
Jonathan G Rennison
d124089d29 Add extended version tag and feature versions to output of -q. 2016-09-13 22:56:17 +01:00
Jonathan G Rennison
db026ec8b0 No longer truncate savegame version in gamelog. 
Add an extended feature for changed savegame format.
 2016-09-08 21:22:39 +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
Jonathan G Rennison
5e67582a64 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
 2016-09-07 22:02:57 +01:00
Jonathan G Rennison
c8942219bd Merge branch 'save_ext' into day_length 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-07 21:49:28 +01:00
Jonathan G Rennison
72a386abe5 Merge branch 'save_ext' into cargo_type_order 2016-09-06 22:09:50 +01:00
Jonathan G Rennison
162e495cc9 Merge branch 'save_ext' into tracerestrict-sx 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
 2016-09-05 23:33:33 +01:00
Jonathan G Rennison
a3d0fc5817 Remove an unused extern declaration, update comment. 2016-09-05 23:31:34 +01:00
Jonathan G Rennison
871d26098e Move Order::cargo_type_flags into a separately allocated object. 
Change savegame format, add a new chunk for cargo_type_flags.
 2016-09-05 00:12:48 +01:00
Jonathan G Rennison
c1c983ea16 Import cargo type orders patch 
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
 2016-09-04 23:00:10 +01:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-06-30 20:25:22 +01:00
Jonathan G Rennison
71aa4c75cb Bump tracerestrict version due to weight/power/TE conditionals. 2016-06-30 20:17:45 +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
0d20a54606 Fix broken-down aircraft stuck at 0 speed on load. 
Bump improved breakdowns version.
 2016-06-05 23:20:25 +01:00
Jonathan G Rennison
d8a083b666 Allow timetable start dates to be set with full precision. 
This avoids rounding of start dates when using minutes and
day length > 1.
 2016-05-11 21:31:31 +01: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
keldorkatarn
5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array. 
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
 2016-04-08 20:38:31 +01:00
Jonathan G Rennison
0d26da998b Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-04-05 20:12:09 +01:00
Jonathan G Rennison
faf8dab12a Bump tracerestrict version due to group conditional. 2016-04-05 19:45:01 +01:00
Jonathan G Rennison
d08b162119 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
 2016-02-21 12:16:11 +00:00
Jonathan G Rennison
83f6463a6f Bump version, set semaphore/pbs/exit sig state on upgrade. 2016-02-21 12:11:25 +00:00
Jonathan G Rennison
580b2f7584 Merge branch 'template_train_replacement-sx' into jgrpp 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
 2016-02-14 17:55:51 +00:00
Jonathan G Rennison
99509acd1d Extended version info for TBTR. 2016-02-14 17:42:10 +00:00
Jonathan G Rennison
31a5baf555 Merge branch 'improved_breakdowns-sx' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
 2016-02-02 23:09:29 +00:00