Commit Graph

612 Commits (7e79c6b34bd733564e0d00f70f432770a4a27fff)

Author SHA1 Message Date
Jonathan G Rennison fbfbaa118a Remove use of gmtime and asctime 1 year ago
Jonathan G Rennison 1bfd96c7f2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/fmt/core.h
#	src/command_type.h
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/landscape.cpp
#	src/network/network.cpp
#	src/newgrf_object.h
#	src/object_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/script/api/script_object.hpp
#	src/script/api/script_town.cpp
#	src/table/object_land.h
#	src/timetable_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
2 years ago
Peter Nelson 8149ba338f Change: Check glyph size before trying to render it.
This change of order ensures that the "Font glyph is foot large" occurs
even if the glyph is too large for an alloca() allocation.
2 years ago
Peter Nelson fa0c67b10a Change: Remove guess-work from calls to GetGlyphOutline().
This API method is intended to be called twice, so don't attempt to guess
the required size.
2 years ago
Peter Nelson 5370e910d3 Change: Use std::vector for fallback font list. 2 years ago
Jonathan G Rennison 5b490b243d Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
#	src/landscape.cpp
#	src/object_cmd.cpp
#	src/rail_cmd.cpp
#	src/script/api/script_tile.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/world_settings.ini
#	src/terraform_cmd.cpp
#	src/tilearea_type.h
#	src/tree_cmd.cpp
#	src/tree_cmd.h
#	src/tree_gui.cpp
#	src/water_cmd.cpp
2 years ago
Rubidium b951332def Codechange: use smart pointers when creating StringIterators 2 years ago
Jonathan G Rennison 0310fb0cdc Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/czech.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/order_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship.h
#	src/vehicle.cpp
2 years ago
Rubidium 752cd5c0da Cleanup 84b71f7: remove G5 detector as it's not referenced anymore
The last supported Mac OS X for G5 is 10.5.8 and support for < 10.7 has already been removed.
2 years ago
Jonathan G Rennison 5e76e6fb07 MacOS: Add workaround for std::variant 2 years ago
Jonathan G Rennison 58d841486e Merge branch 'master' into jgrpp
# Conflicts:
#	src/os/windows/font_win32.cpp
#	src/script/api/script_object.hpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
2 years ago
glx22 e6c857cdba Codechange: [windows] cache the actually loaded font name 2 years ago
glx22 af3df959c2 Codechange: reduce code duplication 2 years ago
Jonathan G Rennison c6e5776cc4 Crashlog: Windows: Fix sign error for symbol offsets in crashlog 2 years ago
Jonathan G Rennison 9e33153df9 Merge branch 'master' into jgrpp
# Conflicts:
#	src/os/macosx/string_osx.cpp
2 years ago
Jonathan G Rennison 16a3e0ef59 Windows: Crashlog: Fix printf format warnings 2 years ago
Peter Nelson daaa058493 Change: Vertically centre sprite font relative to TrueType font. 2 years ago
Peter Nelson 8599041ce4 Fix: GetDefaultFontHeight() is static, don't use -> 2 years ago
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
2 years ago
Jonathan G Rennison e97781608f Crashlog: Windows: Show some memory stats for out of memory crashes 2 years ago
Peter Nelson 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
Peter Nelson 062ea68422 Change: Scale position of font shadow. 2 years ago
Jonathan G Rennison 652d6c8181 Crashlog: Windows: Handle negative address offsets from BFD symbol 2 years ago
Jonathan G Rennison 60ed858707 Fix handling of printf format specifiers on MinGW
See: #446
2 years ago
Jonathan G Rennison 5cc56a6145 Crashlog: Limit iterations of calls to bfd_find_inliner_info 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 2cdd8b7429 Change: Separate fontcache implementations. 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
Peter Nelson 273988551d Fix: font_win32.cpp compile failure with WITH_FREETYPE 2 years ago
Jonathan G Rennison a8d5e56696 Crashlog: Only output dump files for MSVC builds 2 years ago
Jonathan G Rennison 4049cb1407 MacOS: Use _exit instead of exit on execvp failure in crashlog 2 years ago
Jonathan G Rennison e64427d034 Crashlog: Unix: Add BFD inline info support 2 years ago
Jonathan G Rennison ad1e4ca334 Crashlog: Windows: Add BFD inline info support 2 years ago
Jonathan G Rennison 3d39e439f6 Unix: Use _exit instead of exit on execvp failure in crashlog 2 years ago
Jonathan G Rennison 0811990d4a Unix: Try using addr2line for crash log backtrace symbol resolution 2 years ago
Jonathan G Rennison 0ed30d0200 Avoid maybe unintialised warning in struct UniscribeRun
See: #394
2 years ago
Jonathan G Rennison 1518e4621b Fix unused function warning in crash logger on Emscripten 2 years ago
Jonathan G Rennison 220390ed3e Crashlog: Support gdb read when /dev/null is missing 2 years ago
Jonathan G Rennison d83f0d0cda Crashlog: Use a temp file instead of a pipe to read from gdb/lldb 2 years ago
Jonathan G Rennison 4a0fa0cc75 Crashlog: Do not try to read from other executables if /dev/null is missing 2 years ago
glx22 b6c5f49379 Change: add a timestamp in name of crash files 2 years ago
Jonathan G Rennison ed80a39b30 MacOSX: Mark CrashLogOSX::context as maybe_unused 2 years ago
Jonathan G Rennison 027a792cbd Crash log: On OSX allocate crash log buffer using mmap if possible
Otherwise use conservatively sized stack buffer
3 years ago
Jonathan G Rennison 4543803823 Crash log: Increase crash log length limit on Unix
Allocate buffer using mmap if possible
3 years ago
Jonathan G Rennison 2b8018f5d6 MinGW: Avoid function cast warnings with GetProcAddress 3 years ago
Jonathan G Rennison 9e946d4c5d Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
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 62afd94b47 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp
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