Jonathan G Rennison
|
4763f441f6
|
On load, use previous local company or first usable company
Instead of always using the first company slot
|
4 years ago |
|
Jonathan G Rennison
|
e2de103d82
|
Skip GRF compatibility check when using -K/-q switches
|
4 years ago |
|
Jonathan G Rennison
|
3adeff1883
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
|
4 years ago |
|
Jonathan G Rennison
|
f5e9805b10
|
Store time display settings both in savegame and client, add setting
|
4 years ago |
|
Jonathan G Rennison
|
1917a3e0f8
|
Station: Add field for number of station tiles
|
4 years ago |
|
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
|
4 years ago |
Michael Lutz
|
c972a63c8c
|
Codechange: Store info about the dedicated server log file in globals with automatic destruction to simplify control flow in openttd_main.
|
4 years ago |
|
Michael Lutz
|
37bc2f8064
|
Codechange: Use std::string in the driver and blitter selection code.
|
4 years ago |
|
Michael Lutz
|
a49fdb7ebb
|
Codechange: Store base set related texts in std::strings.
|
4 years ago |
|
Jonathan G Rennison
|
d37d08ebb3
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/industry_cmd.cpp
# src/station_cmd.cpp
# src/station_func.h
|
4 years ago |
glx22
|
d15c7dbdeb
|
Add: stations_near and industries_near cache check (#8139)
|
4 years ago |
|
Jonathan G Rennison
|
07c9621fcf
|
Merge branch 'master' into jgrpp
|
4 years ago |
|
glx22
|
86e9326b7f
|
Add: docking tiles cache check (#8120)
|
4 years ago |
|
Jonathan G Rennison
|
eef6ad7b2a
|
Crash log: Save config file in new crash save chunk
|
4 years ago |
|
Jonathan G Rennison
|
4c59dfb6b1
|
Fix data race during palette animation with threaded blitters
|
4 years ago |
|
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
|
5 years ago |
Niels Martin Hansen
|
0e78393774
|
Fix: Reference correct section in README file for baseset info
|
5 years ago |
glx
|
ee7a8eebca
|
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
|
5 years ago |
|
glx
|
b91abd3af9
|
Codechange: Replace FOR_ALL_ROADSTOPS with range-based for loops
|
5 years ago |
|
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
5 years ago |
|
glx
|
ddabfed1cd
|
Codechange: Replace station related FOR_ALL with range-based for loops
|
5 years ago |
|
glx
|
3a14cea068
|
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
|
5 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
6c21c93192
|
Add command line switch -Z to write detailed version information
|
5 years ago |
|
Jonathan G Rennison
|
ef9f6f769e
|
Improve logging of vehicle details in CheckCaches
|
5 years ago |
|
Jonathan G Rennison
|
a30638bc4a
|
Merge branch 'jgrpp' into jgrpp-nrt
|
5 years ago |
|
Jonathan G Rennison
|
57337b76bd
|
Fix false positives in order destination refcount mismatch check
|
5 years ago |
|
Jonathan G Rennison
|
eb8ef65a0b
|
CheckCaches: Indicate incorrect fields in vehicle cache mismatch message
|
5 years ago |
|
Jonathan G Rennison
|
6792495705
|
Add -K switch to write savegame debug data and exit
|
5 years ago |
|
Jonathan G Rennison
|
dd13f24804
|
Merge branch 'save_ext' into jgrpp
|
5 years ago |
|
Jonathan G Rennison
|
c83dc67767
|
Fix -q switch error path failing as language data not yet loaded
|
5 years ago |
|
Jonathan G Rennison
|
1e059d1a48
|
Increase text buffer size in WriteSavegameInfo
|
5 years ago |
|
Jonathan G Rennison
|
04ef407ddf
|
Merge branch 'jgrpp' into jgrpp-nrt
# Conflicts:
# .ottdrev-vc
# README.md
# jgrpp-changelog.md
# src/ship_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
942da75dd4
|
Fix commit 4cf60613 suppressing critical error message windows
|
5 years ago |
|
Jonathan G Rennison
|
a1d36b02f0
|
Network: Add state checksum which is check in network sync
|
5 years ago |
|
Jonathan G Rennison
|
f5badfefd1
|
Check order destination refcount maps in CheckCaches
|
5 years ago |
|
Jonathan G Rennison
|
7ed86e7488
|
Merge branch 'jgrpp' into jgrpp-nrt
|
5 years ago |
|
Jonathan G Rennison
|
89a6cc3e03
|
Add game event flag for virtual train creation
|
5 years ago |
|
Jonathan G Rennison
|
942dd35380
|
Add game events for industry create/destroy
|
5 years ago |
|
Jonathan G Rennison
|
1365600bed
|
Merge branch 'jgrpp' into jgrpp-nrt
|
5 years ago |
|
Jonathan G Rennison
|
ba8ed880c1
|
Merge branch 'master' into jgrpp-nrt
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
4cf60613df
|
Delete windows before switching to GM_MENU mode in LoadIntroGame
See: https://github.com/OpenTTD/OpenTTD/issues/7635
|
5 years ago |
|
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
|
Jonathan G Rennison
|
d02928c56a
|
Check industry neutral stations_near in CheckCaches
|
5 years ago |
|
Jonathan G Rennison
|
92c48d6897
|
Fix padded tile area being used for industries in FindStationsAroundTiles
|
5 years ago |
|
Jonathan G Rennison
|
c4d9404d79
|
Check industry FindStationsAroundTiles in CheckCaches
|
5 years ago |
|
Jonathan G Rennison
|
1d5ba98932
|
Show time and in game date of game load in desync/crash logs
|
5 years ago |
|
Jonathan G Rennison
|
5e9dd1ff35
|
Update cache mismatch logging in CheckCaches
|
5 years ago |
|
Jonathan G Rennison
|
c7a9950269
|
Add game event for train crash
|
5 years ago |