062d57eadb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/openttd.cpp
# src/video/dedicated_v.cpp
1 year ago
24b5033a06
Fix #10568 : "can savegame be loaded check" failed in dedicated server
...
* If loading fails, it usually returns SL_REINIT which doesn't trigger check
* If savegame has NewGRFs, it complains NewGRFs are not allowed in intro game
1 year ago
3657db3b23
Fix 6aa8997e: Type mismatch for _sl_xv_upstream_version variable
1 year ago
6aa8997eee
Saveload: Add corresponding upstream version to SLXI chunk
1 year ago
633450f620
Add cast to clarify slicing of TimeSettings from _settings_client.gui
1 year ago
ae9b416684
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/ai/ai_instance.cpp
# src/console_cmds.cpp
# src/engine_type.h
# src/game/game_gui.cpp
# src/game/game_instance.cpp
# src/goal.cpp
# src/goal_cmd.h
# src/lang/english.txt
# src/lang/estonian.txt
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_generic.h
# src/openttd.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_map.h
# src/strings.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/gui_settings.ini
# src/tbtr_template_gui_main.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/water_cmd.cpp
1 year ago
483e3172af
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/strong_typedef_type.hpp
# src/gfx.cpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/map_func.h
# src/newgrf_debug_gui.cpp
# src/order_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/tile_type.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
1 year ago
05ec32f577
Run water flooding at constant speed at day lengths >= 4
...
See: #482
1 year ago
4e65ec1dc4
Codechange: do not declare functions in blocks
1 year ago
6ba55e663e
Codechange: do not hide variables with other variables
1 year ago
3877bb31ef
Changing day length or date no longer changes time in minutes
...
Add offset variables for scaled date ticks.
Adjust offset when changing day length or date, such that scaled
date ticks remain the same.
Store _scaled_tick_counter and scaled date ticks offset in the savagame.
2 years ago
b1051fa131
Move GRF global var init to common function
2 years ago
351090ae7f
Fix crash when launching game with non-default GUI scale in config
...
See: #459
2 years ago
6d4474b84e
Merge tag '13.0-beta2' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2 years ago
1e769d050f
Leave PLYP chunk unchanged when loading/saving server saves in non-MP
2 years ago
6f963a1268
Include company infrastructure totals in state checksum
2 years ago
9666e46739
Feature: Variable GUI scale.
...
GUI scale is now variable from 100% to 500%, and no longer restricted to
powers-of-2.
2 years ago
0fae0599b7
Fix: Data race on effect volume setting with mixer thread
2 years ago
07b752fe69
Add a generic worker thread pool job executor mechanism
2 years ago
e8463a15c3
Fix: Data race on effect volume setting with mixer thread
2 years ago
6459e62fff
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/map_type.h
# src/network/network_command.cpp
# src/object_cmd.cpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/settings_gui.cpp
# src/string.cpp
# src/table/road_land.h
# src/table/settings/game_settings.ini
# src/table/settings/world_settings.ini
# src/tbtr_template_gui_main.h
# src/train_cmd.cpp
2 years ago
21cea308f9
Codechange: Move Sound Driver parameter name listings ( #10127 )
2 years ago
29a1e49c28
Change various asserts to not be included in release builds
2 years ago
0a9c44d1a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/airport_gui.cpp
# src/blitter/32bpp_anim_sse4.cpp
# src/console_cmds.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/newgrf_object.h
# src/road_gui.cpp
# src/widgets/road_widget.h
# src/window.cpp
2 years ago
377fb5ec30
CheckCaches: Check town cache fields individually
...
Do not compare viewport sign cache
2 years ago
9059215b3b
Fix #10073 : Stop truncating output of list_ai and friends commands
2 years ago
23b974fb39
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fontcache.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/font_win32.cpp
# src/strings.cpp
2 years ago
f6ad8e1c9c
Change: Rename some freetype things to fontcache.
...
The font cache supports more than just FreeType as a font provider, but still used freetype in some naming.
This now uses more suitable terms.
2 years ago
2ff11017dc
Fix #432 : Fix false positive warning in CheckCaches with very old saves
2 years ago
bd2593ca48
Add function to enqueue a DoCommandP call
2 years ago
3d857333c8
Reduce delays with company bankrupcty/sale processing at high day lengths
2 years ago
ca23e8abcf
Add step console command to advance n ticks
...
Cherry-picked from https://github.com/citymania-org/cmclient
Commit: 5ce2d21223a96934a83b8da43434c7a81f001ef0
2 years ago
7c78b22c48
Show failure reason in message box when network savegame load fails
...
See: #412
2 years ago
1d08572cfa
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/english_AU.txt
# src/openttd.cpp
# src/viewport_sprite_sorter_sse4.cpp
2 years ago
c6953f13e4
Fix #9940 : Print debuglevel parse errors to console when changed from console
2 years ago
752e46dfcb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/station_cmd.cpp
2 years ago
c6ae82b611
Fix 9ff161e4 boosting lookahead braking stats but not actual brake forces
2 years ago
04da11b668
Store signal style GRF to local map in savegame
...
Update existing signal style IDs as necessary
2 years ago
7ae06124ae
Add signal style flag for no aspect increase behaviour (banner repeater)
2 years ago
6e4c4b35e7
Initial implementation of NewGRF custom signal styles
2 years ago
470c902bdc
Fix #9918 : Reset industy last production year on scenario start
2 years ago
2cdb0cb084
Codechange: Factor out OnStartScenario function
2 years ago
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
0dce7bf85d
Add: Commandline option to skip NewGRF scanning
2 years ago
ec90fb4c99
Fix #6544 : Don't join AI company when loading network game in singleplayer
2 years ago
a54416afbc
Add GRF variable to use extra station names even when default names remain
2 years ago
dacdb1137a
Add extended feature array with static current version values
2 years ago
13528bfcd0
Codechange: Un-bitstuff all remaining commands.
3 years ago
0f64ee5ce1
Codechange: Template DoCommandP to automagically reflect the parameters of the command proc.
...
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
3 years ago
549caca39c
Codechange: Move command arguments to the back of the networked command function calls.
3 years ago
Jonathan G Rennison
Rubidium
Peter Nelson
krysclarke
Charles Pigott
dP
Niels Martin Hansen
Tyler Trahan
Michael Lutz