dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,925 Commits 1 Branch 0 Tags
5e2ac22ef5f5104c1a113645197f95473e873156
Commit Graph

1516 Commits

Author SHA1 Message Date
Jonathan G Rennison
6aa8997eee Saveload: Add corresponding upstream version to SLXI chunk 2023-03-07 18:40:53 +00:00
Jonathan G Rennison
633450f620 Add cast to clarify slicing of TimeSettings from _settings_client.gui 2023-02-15 23:25:23 +00:00
Jonathan G Rennison
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
 2023-02-11 23:05:22 +00:00
Jonathan G Rennison
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
 2023-02-10 17:19:35 +00:00
Jonathan G Rennison
05ec32f577 Run water flooding at constant speed at day lengths >= 4 
See: #482
 2023-02-09 21:39:04 +00:00
Rubidium
4e65ec1dc4 Codechange: do not declare functions in blocks 2023-01-29 20:28:45 +01:00
rubidium42
6ba55e663e Codechange: do not hide variables with other variables 2023-01-29 07:21:34 +01:00
Jonathan G Rennison
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.
 2022-12-16 19:15:46 +00:00
Jonathan G Rennison
b1051fa131 Move GRF global var init to common function 2022-12-12 21:40:46 +00:00
Jonathan G Rennison
351090ae7f Fix crash when launching game with non-default GUI scale in config 
See: #459
 2022-12-06 18:29:55 +00:00
Jonathan G Rennison
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
 2022-12-04 20:43:11 +00:00
Jonathan G Rennison
1e769d050f Leave PLYP chunk unchanged when loading/saving server saves in non-MP 2022-11-17 00:40:12 +00:00
Jonathan G Rennison
6f963a1268 Include company infrastructure totals in state checksum 2022-11-13 11:53:16 +00:00
Peter Nelson
9666e46739 Feature: Variable GUI scale. 
GUI scale is now variable from 100% to 500%, and no longer restricted to
powers-of-2.
 2022-11-12 18:28:39 +00:00
Jonathan G Rennison
0fae0599b7 Fix: Data race on effect volume setting with mixer thread 2022-11-11 23:48:24 +01:00
Jonathan G Rennison
07b752fe69 Add a generic worker thread pool job executor mechanism 2022-11-09 21:57:05 +00:00
Jonathan G Rennison
e8463a15c3 Fix: Data race on effect volume setting with mixer thread 2022-11-08 01:21:06 +00:00
Jonathan G Rennison
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
 2022-11-05 19:24:44 +00:00
krysclarke
21cea308f9 Codechange: Move Sound Driver parameter name listings (#10127) 2022-11-05 15:42:20 +01:00
Jonathan G Rennison
29a1e49c28 Change various asserts to not be included in release builds 2022-10-22 12:34:54 +01:00
Jonathan G Rennison
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
 2022-10-16 20:14:13 +01:00
Jonathan G Rennison
377fb5ec30 CheckCaches: Check town cache fields individually 
Do not compare viewport sign cache
 2022-10-15 17:02:30 +01:00
Charles Pigott
9059215b3b Fix #10073: Stop truncating output of list_ai and friends commands 2022-10-10 13:42:07 +01:00
Jonathan G Rennison
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
 2022-10-03 20:32:26 +01:00
Peter Nelson
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.
 2022-09-25 18:34:24 +01:00
Jonathan G Rennison
2ff11017dc Fix #432: Fix false positive warning in CheckCaches with very old saves 2022-09-16 20:30:14 +01:00
Jonathan G Rennison
bd2593ca48 Add function to enqueue a DoCommandP call 2022-09-14 21:55:28 +01:00
Jonathan G Rennison
3d857333c8 Reduce delays with company bankrupcty/sale processing at high day lengths 2022-09-02 18:14:35 +01:00
dP
ca23e8abcf Add step console command to advance n ticks 
Cherry-picked from https://github.com/citymania-org/cmclient
Commit: 5ce2d21223a96934a83b8da43434c7a81f001ef0
 2022-08-29 18:17:35 +01:00
Jonathan G Rennison
7c78b22c48 Show failure reason in message box when network savegame load fails 
See: #412
 2022-08-27 22:34:28 +01:00
Jonathan G Rennison
1d08572cfa Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/english_AU.txt
#	src/openttd.cpp
#	src/viewport_sprite_sorter_sse4.cpp
 2022-08-27 15:50:50 +01:00
Niels Martin Hansen
c6953f13e4 Fix #9940: Print debuglevel parse errors to console when changed from console 2022-08-27 09:17:09 +02:00
Jonathan G Rennison
752e46dfcb Merge branch 'master' into jgrpp 
# Conflicts:
#	src/station_cmd.cpp
 2022-07-03 17:42:54 +01:00
Jonathan G Rennison
c6ae82b611 Fix 9ff161e4 boosting lookahead braking stats but not actual brake forces 2022-07-01 23:39:02 +01:00
Jonathan G Rennison
04da11b668 Store signal style GRF to local map in savegame 
Update existing signal style IDs as necessary
 2022-06-25 14:33:47 +01:00
Jonathan G Rennison
7ae06124ae Add signal style flag for no aspect increase behaviour (banner repeater) 2022-06-19 02:08:38 +01:00
Jonathan G Rennison
6e4c4b35e7 Initial implementation of NewGRF custom signal styles 2022-06-19 02:08:38 +01:00
Niels Martin Hansen
470c902bdc Fix #9918: Reset industy last production year on scenario start 2022-06-09 23:03:25 +02:00
Niels Martin Hansen
2cdb0cb084 Codechange: Factor out OnStartScenario function 2022-06-09 23:03:25 +02:00
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
 2022-05-15 13:54:13 +01:00
Niels Martin Hansen
0dce7bf85d Add: Commandline option to skip NewGRF scanning 2022-05-07 10:17:26 +02:00
Tyler Trahan
ec90fb4c99 Fix #6544: Don't join AI company when loading network game in singleplayer 2022-04-30 19:36:09 +02:00
Jonathan G Rennison
a54416afbc Add GRF variable to use extra station names even when default names remain 2022-04-18 20:06:21 +01:00
Jonathan G Rennison
dacdb1137a Add extended feature array with static current version values 2022-02-04 21:29:25 +00:00
Michael Lutz
13528bfcd0 Codechange: Un-bitstuff all remaining commands. 2021-12-16 22:28:32 +01:00
Michael Lutz
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.
 2021-12-16 22:28:32 +01:00
Michael Lutz
549caca39c Codechange: Move command arguments to the back of the networked command function calls. 2021-12-16 22:28:32 +01:00
Jonathan G Rennison
7953a1f8d1 Allow setting autosave interval to a custom number of real-time minutes 2021-12-14 18:48:57 +00:00
Jonathan G Rennison
69b6b388d6 On dedicated servers, save copy of last autosave on crash 
This is to avoid all autosaves being overwritten when the server
is auto-restarted with a new map
 2021-12-09 17:40:15 +00:00
Jonathan G Rennison
54b7aa3d1b Add chicken bit for periodic signal infra total check 
Set automatically if server detects signal infra mismatch
 2021-12-06 01:58:03 +00:00