Jonathan G Rennison
|
5b7db9d849
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/command.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/crashlog.cpp
# src/economy.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/misc_gui.cpp
# src/newgrf_config.cpp
# src/openttd.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/table/settings/gui_settings.ini
|
2 years ago |
benda
|
6540948ace
|
Fix: Company values do not properly account for shares (#9770)
Co-authored-by: Charles Pigott <charlespigott@googlemail.com>
|
2 years ago |
Rubidium
|
c73f578e8c
|
Codechange: replace magic numbers and C-style arrays with C++-style array for share owners
|
2 years ago |
|
Jonathan G Rennison
|
d1f1a6942a
|
Add support for loading trunk savegames versions 293 - 299 (12.0)
Use modified upstream saveload implementation for these versions
Re-arrange headers to support multiple saveload implementations
|
3 years ago |
|
Jonathan G Rennison
|
ec8512e2ea
|
When declining to buy a company, ask the next company immediately
|
3 years ago |
Patric Stout
|
af43fc3d62
|
Codechange: use SLE_STRUCT(LIST) for Company chunks
|
3 years ago |
|
Jonathan G Rennison
|
2d350d26db
|
Add rate limit for object construction
|
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
|
63ccb36ef3
|
Codechange: Use std::string for most of the user-settable custom names.
|
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
|
4 years ago |
glx
|
3a14cea068
|
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
|
4 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
|
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
|
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 |
peter1138
|
c02ef3e456
|
Feature: Add NotRoadTypes (NRT)
|
5 years ago |
Charles Pigott
|
5b34c8019f
|
Codechange: Remove Company/OwnerByte types
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Jonathan G Rennison
|
46b1ea81e4
|
Add company rate limit for land area purchasing
|
6 years ago |
|
Jonathan G Rennison
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
6 years ago |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
|
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
|
6 years ago |
|
Charles Pigott
|
e1b9187e9b
|
Codechange: Add initialisation values for all CompanyProperty attributes
|
6 years ago |
|
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
|
6 years ago |
PeterN
|
42b43c9983
|
Change: Available railtypes is always calculated on load, so no need to load value for old savegames (#6782)
|
6 years ago |
|
Jonathan G Rennison
|
a6168dd2f0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/company_sl.cpp
|
7 years ago |
frosch
|
fc4c4d080c
|
(svn r27757) -Change: Make StringID 32bit.
|
7 years ago |
|
frosch
|
0c1fcc02ec
|
(svn r27757) -Change: Make StringID 32bit.
|
7 years ago |
|
Jonathan G Rennison
|
3813b3ca09
|
Dump infrastructure totals when mismatch detected in CheckCaches.
|
7 years ago |
michi_cc
|
2b8bb12d62
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
9 years ago |
|
michi_cc
|
44918010df
|
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
|
9 years ago |
|
rubidium
|
6fb28d8719
|
(svn r26081) -Fix [FS#5815]: memset with virtual functions doesn't quite work. Upon further review CompanyProperties doesn't need to be virtual in the current code base
|
11 years ago |
|
rubidium
|
388e8e2d97
|
(svn r26081) -Fix [FS#5815]: memset with virtual functions doesn't quite work. Upon further review CompanyProperties doesn't need to be virtual in the current code base
|
11 years ago |
|
rubidium
|
83a76c73c7
|
(svn r26052) -Fix: missing virtual destructor could cause some memory to be not freed
|
11 years ago |
|
rubidium
|
d8cd229ef7
|
(svn r26052) -Fix: missing virtual destructor could cause some memory to be not freed
|
11 years ago |
planetmaker
|
f2e94237fc
|
(svn r24619) -Change: Check for bankruptcy on a monthly basis (ZxBioHazardZx)
|
12 years ago |
|
planetmaker
|
f46b2fd4b3
|
(svn r24619) -Change: Check for bankruptcy on a monthly basis (ZxBioHazardZx)
|
12 years ago |
|
michi_cc
|
f3e295b4ec
|
(svn r24134) -Add: Configurable limits for tree planting.
|
12 years ago |
|
michi_cc
|
07f32df363
|
(svn r24134) -Add: Configurable limits for tree planting.
|
12 years ago |
|
michi_cc
|
0542e26460
|
(svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type.
|
12 years ago |
|
michi_cc
|
7f06f392f7
|
(svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type.
|
12 years ago |
|
rubidium
|
70c7fbd90e
|
(svn r23826) -Fix [FS#4972]: the detailed performance rating window showed the cargo count of the current quarter instead of the last quarter like the tooltip says
|
12 years ago |
|
rubidium
|
464d51905a
|
(svn r23826) -Fix [FS#4972]: the detailed performance rating window showed the cargo count of the current quarter instead of the last quarter like the tooltip says
|
12 years ago |
|
rubidium
|
e40eb8177a
|
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
|
13 years ago |
|
rubidium
|
0cfe86cead
|
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
|
13 years ago |
|
truebrain
|
1c9bec1999
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |
|
truebrain
|
aa1a0053b0
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |
|
michi_cc
|
6083d6ffb4
|
(svn r23410) -Add: A window with a detailed overview over the infrastructure of a company.
|
13 years ago |
|
michi_cc
|
b68ced52c4
|
(svn r23410) -Add: A window with a detailed overview over the infrastructure of a company.
|
13 years ago |