Jonathan G Rennison
|
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
|
2021-02-01 17:07:34 +00:00 |
|
glx22
|
1fb4ed8eef
|
Fix: Use realtime for error message and console backlog timeouts
|
2021-01-10 14:07:17 +01:00 |
|
Jonathan G Rennison
|
d85a529f87
|
Merge branch 'master' into jgrpp
|
2020-10-14 17:38:23 +01:00 |
|
dP
|
0110fa12da
|
Feature: Make news and errors close hotkeys configurable
|
2020-09-24 19:23:12 +02:00 |
|
Jonathan G Rennison
|
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
|
2019-11-12 18:43:10 +00:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Jonathan G Rennison
|
989577d40c
|
Add support for adding a third error line to the error GUI
Add support for a second error string ID to CommandCost
|
2018-11-19 18:59:25 +00:00 |
|
frosch
|
7b238142b8
|
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
|
2014-01-12 18:00:39 +00:00 |
|
frosch
|
ba1779b978
|
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
|
2014-01-12 18:00:39 +00:00 |
|
frosch
|
25adefca23
|
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
|
2013-05-26 19:23:42 +00:00 |
|
frosch
|
56e4a8c4d6
|
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
|
2013-05-26 19:23:42 +00:00 |
|
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
frosch
|
7ae3b0d332
|
(svn r24388) -Fix [FS#5233]: Do not consider not finding a particular base set critical; just load a different one and display an in-game error later on.
|
2012-07-08 18:41:50 +00:00 |
|
frosch
|
73706925d1
|
(svn r24388) -Fix [FS#5233]: Do not consider not finding a particular base set critical; just load a different one and display an in-game error later on.
|
2012-07-08 18:41:50 +00:00 |
|
frosch
|
b77bb699da
|
(svn r24250) -Fix [FS#5154]: Do not immediately display error messages from parsing the cfg file, but schedule them for displaying after the GUI is prepared for it.
|
2012-05-14 21:04:49 +00:00 |
|
frosch
|
c6ed8c01b3
|
(svn r24250) -Fix [FS#5154]: Do not immediately display error messages from parsing the cfg file, but schedule them for displaying after the GUI is prepared for it.
|
2012-05-14 21:04:49 +00:00 |
|
frosch
|
d8ac06522d
|
(svn r24249) -Codechange: Split the extraction of current DParams from the ErrorMessageData constructor into a separate function.
|
2012-05-14 21:01:54 +00:00 |
|
frosch
|
1ba36d07cf
|
(svn r24249) -Codechange: Split the extraction of current DParams from the ErrorMessageData constructor into a separate function.
|
2012-05-14 21:01:54 +00:00 |
|
frosch
|
8aa131f31b
|
(svn r24248) -Codechange: Move ErrorMessageData class definition to header file.
|
2012-05-14 20:58:59 +00:00 |
|
frosch
|
fd6f92a4e8
|
(svn r24248) -Codechange: Move ErrorMessageData class definition to header file.
|
2012-05-14 20:58:59 +00:00 |
|
rubidium
|
56f37d9386
|
(svn r23476) -Codechange: use the error queue to replace switch mode error strings, again making it possible to return multiple errors
|
2011-12-10 15:16:58 +00:00 |
|
rubidium
|
2bf0fc3c5c
|
(svn r23476) -Codechange: use the error queue to replace switch mode error strings, again making it possible to return multiple errors
|
2011-12-10 15:16:58 +00:00 |
|
rubidium
|
43e78a88ca
|
(svn r23475) -Codechange: queue critical error messages, so when multiple happen you won't miss any
|
2011-12-10 15:14:11 +00:00 |
|
rubidium
|
420d358fef
|
(svn r23475) -Codechange: queue critical error messages, so when multiple happen you won't miss any
|
2011-12-10 15:14:11 +00:00 |
|
rubidium
|
9aab2dc861
|
(svn r23474) -Codechange: move the declaration error related functions to error.h
|
2011-12-10 13:54:10 +00:00 |
|
rubidium
|
58423b26d1
|
(svn r23474) -Codechange: move the declaration error related functions to error.h
|
2011-12-10 13:54:10 +00:00 |
|