b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
3 years ago
760b0cdc11
Change: change console command "restart" and add "reload"
...
The current "restart" command is now called "reload", as that is
what it does.
The old "restart" command is now called "restart", as that is what
it did.
As this has not been in any official release yet, this shouldn't
harm any kitten.
3 years ago
483ed2f468
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/openttd.cpp
4 years ago
5fe5884613
Debug: Add experimental command to switch baseset
4 years ago
0c5dc5d41e
Change: [Linkgraph] Pause the game when linkgraph jobs lag ( #6470 )
...
Check if the job is still running two date fract ticks before it is due
to join, and if so pause the game until its done.
When loading a game, check if the game would block immediately due to
a job which is scheduled to be joined within two date fract ticks,
and if so pause the game until its done.
This avoids the main thread being blocked on a thread join, which appears
to the user as if the game is unresponsive, as the UI does not repaint
and cannot be interacted with.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
4 years ago
c66bd18a10
Add: save openttd.cfg immediately on changing a setting ( #8358 )
...
Formally it was only done on exit. This means that if it crashes
changes in settings were not stored. This is often rather
frustrating. Additionally, targets (like emscripten) where people
are unlike to use "Exit Game", will never see their configuration
stored.
The drawback is that on every setting change there is some minor
I/O of writing the ini file to disk again.
4 years ago
63d3f33fd2
Add display setting for income/cost text effects
4 years ago
d85a529f87
Merge branch 'master' into jgrpp
4 years ago
8f3d1ec970
Feature: Improve restart command
...
When the restart command is issued, a normal map is always spawned.
This improvement takes into account the current state of _file_to_saveload to check if a savegame/scenario/heightmap was previously loaded, and loads the same resource again.
4 years ago
52e0d44c8a
Revert "Fix recursive faults in Window crash logger due to message box event loop."
...
This reverts commit 2b1b7f8b135968cb88d8e65fcb89cdff8d203838.
Replaced by b5ca2161d9
4 years ago
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
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
89a6cc3e03
Add game event flag for virtual train creation
5 years ago
942dd35380
Add game events for industry create/destroy
5 years ago
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
1d5ba98932
Show time and in game date of game load in desync/crash logs
5 years ago
c7a9950269
Add game event for train crash
5 years ago
e2251999ce
Add game event flag for disaster vehicles
5 years ago
5b7d1f7f80
Add game event for TBTR replacement attempt
5 years ago
ec1e848a7f
Add log of game events since last load and overall
...
Add console command
Add to crashlog
5 years ago
327ff89808
Codechange: Remove PauseModeByte
5 years ago
064a36b319
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
102405e082
Fix recursive faults in Window crash logger due to message box event loop.
7 years ago
c6854afcef
Pause the game instead of blocking when link graph jobs lag.
...
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
9 years ago
17951f57a5
(svn r25506) -Document: a function, and name it slightly better
11 years ago
5b2a5ac790
(svn r25506) -Document: a function, and name it slightly better
11 years ago
3a799f1145
(svn r23618) -Add: ScriptGame::Pause, ScriptGame::Unpause, and ScriptGame::GetLandscape (GameScript only)
13 years ago
55de5d336c
(svn r23618) -Add: ScriptGame::Pause, ScriptGame::Unpause, and ScriptGame::GetLandscape (GameScript only)
13 years ago
daba7e588a
(svn r23470) -Codechange: move declaration of SwitchToMode to a header instead of declaring it in 6 other files
13 years ago
b231e80125
(svn r23470) -Codechange: move declaration of SwitchToMode to a header instead of declaring it in 6 other files
13 years ago
4509f814b3
(svn r23244) -Feature: if the installation is ananas, try to get the b without b installed
13 years ago
02b884d923
(svn r23244) -Feature: if the installation is ananas, try to get the b without b installed
13 years ago
3e5d60ea2e
(svn r22708) -Feature [FS#4701]: Display option to hide competitors' signs and station names (Zuu)
13 years ago
3fb66890ee
(svn r22708) -Feature [FS#4701]: Display option to hide competitors' signs and station names (Zuu)
13 years ago
cae2d84af3
(svn r22512) -Add: Save heightmap.
13 years ago
f1cae9960f
(svn r22512) -Add: Save heightmap.
13 years ago
b833c08459
(svn r22507) -Doc: Document SwitchMode.
13 years ago
c8cbc8ef97
(svn r22507) -Doc: Document SwitchMode.
13 years ago
3ae756f85f
(svn r22460) -Doc: Semantic documentation fixes, and doxygen additions (partly by planetmaker).
13 years ago
990ec6f0a9
(svn r22460) -Doc: Semantic documentation fixes, and doxygen additions (partly by planetmaker).
13 years ago
6d031d0867
(svn r22080) -Doc: Add doxygen comments to a few functions and improve a few existing comments
14 years ago
914f8e9f1d
(svn r22080) -Doc: Add doxygen comments to a few functions and improve a few existing comments
14 years ago
81484efcfb
(svn r22014) -Codechange: move some more functions out of functions.h
14 years ago
ec9e0690eb
(svn r22014) -Codechange: move some more functions out of functions.h
14 years ago
f775da140c
(svn r21894) -Cleanup: get rid of the unused SM_START_SCENARIO
14 years ago
7eadf07e44
(svn r21894) -Cleanup: get rid of the unused SM_START_SCENARIO
14 years ago
f09a74a996
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
398418b8fa
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
d2e99657fa
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
53aaabe6e9
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
Jonathan G Rennison
Patric Stout
Berbe
S. D. Cloudt
Charles Pigott
rubidium
planetmaker
alberth
smatz