18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
1 week ago
d90c540f9e
Enable economy day length scaling in wallclock timekeeping mode
2 weeks ago
98dc6c3c81
Fix NewGRF byte order when using -q
4 weeks ago
a3cfd23cf9
Codechange: rename byte to uint8_t ( #12308 )
2 months ago
041e71ec05
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/crashlog.cpp
# src/gfx.cpp
# src/network/network_client.cpp
# src/openttd.cpp
# src/openttd.h
# src/saveload/saveload.cpp
# src/survey.cpp
2 months ago
3e625b5b1a
Add: track savegame size to report with survey ( #12304 )
2 months ago
c7d3e291d2
Fix divide by zero when autosave uses real time and autosave both disabled
...
See: #666
2 months ago
bab5a8a787
Codechange: use std::source_location over __FILE__ and __LINE__ for Backup
2 months ago
55410152a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/openttd.cpp
# src/script/api/script_text.cpp
# src/settings_type.h
3 months ago
e775ef2b70
Fix: initialize _switch_mode_time so crash-logs before first game have a realistic time ( #12184 )
3 months ago
79388e4207
Include dates and tick counters in state checksum
3 months ago
8581808952
Merge tag '14.0-beta2' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
3 months ago
fdd666f66a
Merge tag '14.0-beta1' into jgrpp
...
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
3 months ago
838b166726
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_base.h
# src/debug.cpp
# src/debug.h
# src/economy.cpp
# src/engine_type.h
# src/graph_gui.cpp
# src/misc_cmd.cpp
# src/misc_cmd.h
# src/network/core/os_abstraction.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings_type.h
# src/ship_cmd.cpp
# src/stdafx.h
# src/tests/bitmath_func.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
3 months ago
86a6f63e2f
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
3 months ago
58f8971f17
Add console command to get version information
...
See: #652
3 months ago
1f5b35fac4
Change link graph join and compression times to use scaled tick counter
3 months ago
7ce06e22b8
Split date types into calendar and economy dates
...
See: 735abfe1
3 months ago
7234cdd9fd
Advance state ticks in the title menu game
3 months ago
2f1d2a9f4b
Survey: Don't transmit invalid realtime duration
3 months ago
903adceab5
Maintain map of targeted road vehicles to small UFO disaster vehicle
3 months ago
516e8defb5
Add wrappers to get and update the current effective day length factor
3 months ago
cfebbfac8c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/autoreplace_cmd.cpp
# src/company_base.h
# src/company_gui.cpp
# src/cpu.cpp
# src/debug.h
# src/group.h
# src/group_cmd.cpp
# src/house.h
# src/industry.h
# src/newgrf_house.cpp
# src/news_type.h
# src/openttd.cpp
# src/saveload/company_sl.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/story.cpp
# src/table/town_land.h
# src/viewport.cpp
3 months ago
9aa8059c79
Include elapsed state ticks since load in crash/failure logs
...
Consolidate game load date/time variables
3 months ago
d39236d50c
Store state ticks directly in savegame instead of the offset
...
Initialise the state ticks value to a constant for new games,
instead of using an implicit offset of 0
3 months ago
0ea57528c9
Rename DateTicksScaled to StateTicks
...
Rename various other related/derived types and variables
3 months ago
4b372b6050
Codechange: use std::shared_ptr to manage saveload filters instead of manually trying to avoid double frees
3 months ago
0dfba564ab
Add: "restart current" console command to regenerate the map based on current settings ( #11963 )
3 months ago
a0c480c4e4
Change: "restart" now uses your newgame settings, where "reload" uses the current settings ( #11962 )
3 months ago
7acf78964f
Remove: "generation_seed" from config, as it was a write-only value ( #11927 )
4 months ago
4024bb5554
Fix #11910 : use economy timer for dmp_cmds files ( #11925 )
4 months ago
2e93daf93b
Advance _scaled_date_ticks in scenario editor
...
For timetables and train speed adaptation
4 months ago
b721dbf850
Revert #6923 : start_date parameter is no longer in use
...
There was an issue with the start_date parameter for AIs. It did not let Random AIs to have their configure button clickable once the game has started, and this was due to the start_date not being pushed into the config.
But now that start_date is no longer in use since #10653 , this workaround can be safely removed.
(cherry picked from commit 6588680ccc
4 months ago
28716548d2
Feature: Setting to automatically restart server based on hours played ( #11142 )
4 months ago
822ecae85d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cargotype.h
# src/core/CMakeLists.txt
# src/core/span_type.hpp
# src/fileio.cpp
# src/fios.cpp
# src/misc/endian_buffer.hpp
# src/misc_gui.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/settings.cpp
# src/settings_internal.h
# src/stdafx.h
# src/string_func.h
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
4 months ago
df9fc6d1cf
Use comparison operator for NewGRFCache instead of memcmp
4 months ago
21581b6ab3
Feature: Setting for minutes per calendar year ( #11428 )
4 months ago
090616b4c9
Add: allow loading heightmaps from command-line ( #11870 )
...
If you want to load a file from tar, you have to give the file
inside the tar in order for it to work:
<tar-file>/<dir-in-tar>/<file>.png
4 months ago
11d4f1b2bd
Fix d3b2a576: LOAD_HEIGHTMAP / LOAD_SCENARIO are Scenario Editor modes ( #11868 )
4 months ago
d3b2a576de
Feature: Plugin framework for Social Integration with Steam, Discord, GOG, etc ( #11628 )
4 months ago
735abfe111
Codechange: Split dates and timers into Economy and Calendar time ( #10700 )
4 months ago
6588680ccc
Revert #6923 : start_date parameter is no longer in use
...
There was an issue with the start_date parameter for AIs. It did not let Random AIs to have their configure button clickable once the game has started, and this was due to the start_date not being pushed into the config.
But now that start_date is no longer in use since #10653 , this workaround can be safely removed.
4 months ago
c0ab436077
Codechange: Store Colours in Colours type. ( #11625 )
...
This reduces casts, some magic numbers, and introduces a bit of type-safety.
4 months ago
3d87cfeca5
Plans: Cache whether any plans are currently visible
4 months ago
2d77cf9c80
Codechange: replace StrStartsWith/StrEndsWith with starts_with and ends_with
4 months ago
d7b75614bb
Merge branch 'master' into jgrpp
...
# Conflicts:
# media/baseset/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console.cpp
# src/debug.cpp
# src/fontcache/freetypefontcache.cpp
# src/network/network.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/windows/font_win32.cpp
# src/settings_gui.cpp
# src/video/sdl2_v.cpp
# src/widgets/settings_widget.h
# src/window_gui.h
4 months ago
3af99bd2dc
Rename ShowInfo to ShowInfoI, add ShowInfo fmt macro
4 months ago
564441e822
Remove: Debug redirect over network
...
It does not work for dedicated servers because upon starting the process to
resolve the address to redirect to gets killed. Also with all the async going
on in the network code, the debug redirection will start very late in the
process.
4 months ago
b45b8e77f3
Add cache checking of water regions
4 months ago
5e2ac22ef5
Assert: Add more assert macros for using a simple string as the extra text
4 months ago
Jonathan G Rennison
Patric Stout
Rubidium
SamuXarick
Tyler Trahan
Peter Nelson