dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,280 Commits 1 Branch 0 Tags
2e20da40eda562bbd4ed575fa8a332cbacd6d0c1
Commit Graph

2213 Commits

Author SHA1 Message Date
Jonathan G Rennison
27b92c3526 Fix #159: Incorrect display date on load for savegame versions < 31 2020-06-24 17:14:28 +01:00
Jonathan G Rennison
f5e9805b10 Store time display settings both in savegame and client, add setting 2020-06-23 21:05:21 +01:00
Jonathan G Rennison
e6f3e15c32 Fix 63ccb36e: Incorrect string type for OrderBackup::name save/load 
In 63ccb36e BaseConsist::name was changed from a malloced char*
to a std::string.
OrderBackup inherits from BaseConsist.
The saveload of OrderBackup::name was not updated.
 2020-06-22 08:02:42 +02:00
Patric Stout
56d54cf60e Add: introduce CMake for project management 
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.

Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.

This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.

Addtiionally, this heavily improves our detection of libraries, etc.
 2020-06-05 19:36:05 +02:00
Jonathan G Rennison
5243cfd6d0 Use TinyString for custom name fields which are almost always empty 2020-05-22 00:10:09 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
 2020-05-21 22:24:01 +01:00
Michael Lutz
63ccb36ef3 Codechange: Use std::string for most of the user-settable custom names. 2020-05-21 20:02:34 +02:00
Michael Lutz
9b6f5e3bb8 Codechange: Store GS lang texts in std::strings. 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
ea06a0670d Add rail ground type support for rail custom bridge heads 
See: #146
 2020-05-19 00:41:35 +01:00
Jonathan G Rennison
77673b731c Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_cmd.cpp
#	src/openttd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
 2020-05-13 11:17:09 +01:00
glx22
cca613e3b8 Fix #8142, 5aa6351: Buoy owner and tile owner can be different (#8143) 2020-05-12 15:22:58 +02:00
Jonathan G Rennison
763a2826b6 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/gamelog.cpp
 2020-05-11 00:45:24 +01:00
Jonathan G Rennison
0202211514 Conditional orders: Add slot acquire modes to train in slot conditional 2020-05-10 21:06:09 +01:00
glx
5aa6351042 Fix #8132: Corrupted savegame crashing OpenTTD on load 2020-05-10 20:03:41 +01:00
glx
0ed00ae111 Fix: Stop any gamelog action when recovering from SlError() 2020-05-10 20:02:55 +01:00
Jonathan G Rennison
0100ea4e32 Conditional orders: Add mode to check waiting station cargo via next node 2020-05-10 15:32:12 +01:00
Jonathan G Rennison
07c9621fcf Merge branch 'master' into jgrpp 2020-05-07 20:57:47 +01:00
glx
bc8333723c Fix #8021: limit savegame range for docking tiles fixing 2020-05-06 23:12:59 +02:00
Yexo
64278fd598 Fix: reset roadtype/streetcartype info for non-road bridges 2020-05-06 22:10:08 +02:00
Yexo
19dc31e0b3 Fix #8108: always update tile_hash after updating v->tile 2020-05-04 23:26:50 +02:00
SamuXarick
8edbb42fe8 Fix c01a2e2: crash on loading old savegames with invalid animated tile information 2020-05-04 21:21:06 +02:00
SamuXarick
c01803cd42 Fix #8108: possible crash on loading TTD savegames with phantom oil rigs 2020-05-04 21:21:06 +02:00
Jonathan G Rennison
eef6ad7b2a Crash log: Save config file in new crash save chunk 2020-04-21 18:17:13 +01:00
Jonathan G Rennison
1506479f56 Cheat: Add cheats to set inflation income and cost factors 
See: #124
 2020-04-18 10:53:49 +01:00
Jonathan G Rennison
3e7618f519 Save/load: Add extra cheats savegame chunk 2020-04-18 10:51:02 +01:00
Jonathan G Rennison
d210bc4d14 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp

Recalculate docking tile cache due to 57553cd8
 2020-04-01 00:32:45 +01:00
SamuXarick
57553cd809 Fix #8020: Add missing docking tiles around industry neutral stations 2020-03-30 08:21:40 +02:00
Jonathan G Rennison
ba65a79d09 Enable allowing/disallowing supply to a station, per cargo 
Ctrl-click station cargo rating
 2020-03-22 13:49:22 +00:00
Jonathan G Rennison
8956b1ab02 Improve performance of tunnel rendering in viewport map mode 2020-03-03 06:57:50 +00:00
Jonathan G Rennison
b96e7f78fb Merge branch 'master' into jgrpp 2020-02-21 21:18:01 +00:00
glx
9116b22386 Fix #8011, f5381798: Dock tile in TTD savegame was only 2 bytes 2020-02-19 17:45:42 +01:00
Jonathan G Rennison
babe98cdb1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
 2020-02-09 15:43:47 +00:00
glx
2f264f2c92 Change: Heading for 1.11 now 2020-02-08 23:38:49 +01:00
Johannes E. Krause
107283748a Feature: SLF_HEX to print hexadecimal numbers in the config file 2020-02-06 21:00:30 +00:00
Jonathan G Rennison
76f68c48f5 Cache whether vehicle is currently drawn: Vehicle::IsDrawn() 2020-02-03 18:58:19 +00:00
Jonathan G Rennison
dd99fd646d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
 2020-01-20 18:36:55 +00:00
Jonathan G Rennison
09b13dd484 Add conditional orders for cargo load percentage and waiting cargo amount 
See: #90
 2020-01-18 20:32:42 +00:00
Jonathan G Rennison
bb363695fc YAPF: Prevent user for configuring signal penalties to negative values 
Warn if signal penalty polynomial goes negative, and clamp to non-negative
 2020-01-17 19:23:03 +00:00
Jonathan G Rennison
424813446f TBTR: Avoid unnecessary iterations of template replacement pool 2020-01-16 01:16:08 +00:00
Jonathan G Rennison
c3223903ed Codechange: Cache resolved town, station and industry name strings 2020-01-12 19:37:43 +00:00
frosch
a4be4514c9 Fix #7925: Reset temporary saveload data at the start of loading a savegame instead of at the end. 
Otherwise temporary data may be passed from an aborted load action to the next load action.
 2020-01-12 19:08:38 +01:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2020-01-06 18:45:51 +00:00
Charles Pigott
d1cead7f25 Fix: When loading old timetabled saves, also reset cached timetable duration 2020-01-05 20:51:26 +00:00
Charles Pigott
cddb8a4605 Fix #7587: Crash when loading saves with waypoints with invalid locations 2020-01-05 20:51:26 +00:00
Jonathan G Rennison
6f75d9119d ChillPP: Add support for loading compatible linkgraph settings 2020-01-03 18:54:44 +00:00
Jonathan G Rennison
c681a9d5de Fix vehicle timetable automate flag from ChillPP v8 savegames 2020-01-03 13:02:35 +00:00
Jonathan G Rennison
b8b84a9a0b Fix leftover PBS reservation on signalled tunnel/bridge entrances in ChillPP savegames 2020-01-03 12:43:03 +00:00
Jonathan G Rennison
4936b3ba51 Add support for loading ChillPP v8 savegames 2020-01-03 00:08:33 +00:00
Jonathan G Rennison
5dc1027c6b Add initial support for loading ChillPP v14.7 savegames 2020-01-01 23:14:00 +00:00
Jonathan G Rennison
b4453fac23 Saveload: Log chunk sizes when load fails due to chunk size mismatch 2020-01-01 17:13:17 +00:00