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
|
2 years ago |
|
Jonathan G Rennison
|
377fb5ec30
|
CheckCaches: Check town cache fields individually
Do not compare viewport sign cache
|
2 years ago |
Charles Pigott
|
9059215b3b
|
Fix #10073: Stop truncating output of list_ai and friends commands
|
2 years ago |
|
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
|
2 years ago |
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.
|
2 years ago |
|
Jonathan G Rennison
|
2ff11017dc
|
Fix #432: Fix false positive warning in CheckCaches with very old saves
|
2 years ago |
|
Jonathan G Rennison
|
bd2593ca48
|
Add function to enqueue a DoCommandP call
|
2 years ago |
|
Jonathan G Rennison
|
3d857333c8
|
Reduce delays with company bankrupcty/sale processing at high day lengths
|
2 years ago |
dP
|
ca23e8abcf
|
Add step console command to advance n ticks
Cherry-picked from https://github.com/citymania-org/cmclient
Commit: 5ce2d21223a96934a83b8da43434c7a81f001ef0
|
2 years ago |
|
Jonathan G Rennison
|
7c78b22c48
|
Show failure reason in message box when network savegame load fails
See: #412
|
2 years ago |
|
Jonathan G Rennison
|
1d08572cfa
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/english_AU.txt
# src/openttd.cpp
# src/viewport_sprite_sorter_sse4.cpp
|
2 years ago |
Niels Martin Hansen
|
c6953f13e4
|
Fix #9940: Print debuglevel parse errors to console when changed from console
|
2 years ago |
|
Jonathan G Rennison
|
752e46dfcb
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/station_cmd.cpp
|
2 years ago |
|
Jonathan G Rennison
|
c6ae82b611
|
Fix 9ff161e4 boosting lookahead braking stats but not actual brake forces
|
2 years ago |
|
Jonathan G Rennison
|
04da11b668
|
Store signal style GRF to local map in savegame
Update existing signal style IDs as necessary
|
2 years ago |
|
Jonathan G Rennison
|
7ae06124ae
|
Add signal style flag for no aspect increase behaviour (banner repeater)
|
2 years ago |
|
Jonathan G Rennison
|
6e4c4b35e7
|
Initial implementation of NewGRF custom signal styles
|
2 years ago |
|
Niels Martin Hansen
|
470c902bdc
|
Fix #9918: Reset industy last production year on scenario start
|
2 years ago |
|
Niels Martin Hansen
|
2cdb0cb084
|
Codechange: Factor out OnStartScenario function
|
2 years ago |
|
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 |
|
Niels Martin Hansen
|
0dce7bf85d
|
Add: Commandline option to skip NewGRF scanning
|
2 years ago |
Tyler Trahan
|
ec90fb4c99
|
Fix #6544: Don't join AI company when loading network game in singleplayer
|
2 years ago |
|
Jonathan G Rennison
|
a54416afbc
|
Add GRF variable to use extra station names even when default names remain
|
2 years ago |
|
Jonathan G Rennison
|
dacdb1137a
|
Add extended feature array with static current version values
|
2 years ago |
Michael Lutz
|
13528bfcd0
|
Codechange: Un-bitstuff all remaining commands.
|
2 years ago |
|
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.
|
2 years ago |
|
Michael Lutz
|
549caca39c
|
Codechange: Move command arguments to the back of the networked command function calls.
|
2 years ago |
|
Jonathan G Rennison
|
7953a1f8d1
|
Allow setting autosave interval to a custom number of real-time minutes
|
2 years ago |
|
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
|
3 years ago |
|
Jonathan G Rennison
|
54b7aa3d1b
|
Add chicken bit for periodic signal infra total check
Set automatically if server detects signal infra mismatch
|
3 years ago |
|
Jonathan G Rennison
|
3cff5e53e4
|
Add train cached_curve_speed_mod to VENC, cache checks and debug window
|
3 years ago |
|
Jonathan G Rennison
|
faf32200cf
|
Merge tag '12.0-beta1' into jgrpp-beta
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
|
3 years ago |
|
Jonathan G Rennison
|
f764fcfb1f
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/console_cmds.cpp
# src/debug.cpp
# src/lang/vietnamese.txt
# src/network/core/address.cpp
# src/network/core/address.h
# src/network/core/config.h
# src/network/core/os_abstraction.cpp
# src/network/core/os_abstraction.h
# src/network/core/tcp_listen.h
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_gamelist.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf.cpp
# src/openttd.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings/network_settings.ini
|
3 years ago |
|
Jonathan G Rennison
|
61cc60099a
|
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
|
3 years ago |
|
Jonathan G Rennison
|
da282c3ecc
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/misc_gui.cpp
# src/newgrf.cpp
|
3 years ago |
|
Jonathan G Rennison
|
b58ff65c5c
|
Debug: Fix company money state checksum being logged with wrong company
|
3 years ago |
|
Jonathan G Rennison
|
4042480806
|
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
|
3 years ago |
Patric Stout
|
563884105f
|
Change: by default, make "unload all" leave stations empty (#9301)
(cherry picked from commit 7648483364)
|
3 years ago |
|
Jonathan G Rennison
|
6f16655e6e
|
Add "special events" log. Add console command, include in crash logs.
|
3 years ago |
|
Jonathan G Rennison
|
2e022d5194
|
Move game events to new event_logs header/cpp files
|
3 years ago |
|
Jonathan G Rennison
|
6b250c203c
|
Add chicken bit to control CheckCaches periodic/post-command flags
|
3 years ago |
|
Jonathan G Rennison
|
24fdc8331b
|
Add CheckCaches mode to emit a log/save/screenshot on detected issue
|
3 years ago |
|
Jonathan G Rennison
|
5ed7aee8d3
|
Add flags field to CheckCaches for which checks to run
Add header file for CheckCaches
|
3 years ago |
|
Jonathan G Rennison
|
d4d54c9b90
|
Add a chicken bit setting to enable periodic CheckCaches
|
3 years ago |
|
Jonathan G Rennison
|
fd605e3cf3
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
|
3 years ago |
|
Jonathan G Rennison
|
0b0d154788
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
|
3 years ago |
|
Jonathan G Rennison
|
da1ac73c02
|
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
# Conflicts:
# src/lang/estonian.txt
# src/lang/hungarian.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/packet.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/string_func.h
|
3 years ago |
|
Jonathan G Rennison
|
2bd535e834
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/engine_base.h
# src/gfxinit.cpp
# src/graph_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/network/core/address.cpp
# src/network/core/game_info.h
# src/network/core/os_abstraction.h
# src/network/core/udp.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_internal.h
# src/newgrf_engine.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/string_func.h
# src/town_gui.cpp
# src/video/video_driver.cpp
# src/widget_type.h
|
3 years ago |
Rubidium
|
92559e6f3a
|
Fix #9388: thread unsafe use of NetworkAdminConsole/IConsolePrint
|
3 years ago |
|
Jonathan G Rennison
|
58a290d8e9
|
Include version label in output of -q switch
|
3 years ago |