86e1f58bc0
Avoid unused variable warning when not using threads
...
See: #307
3 years ago
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
544da99102
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/cargopacket.h
# src/lang/korean.txt
# src/linkgraph/linkgraph.h
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.h
# src/network/network_admin.h
# src/network/network_func.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/order_base.h
# src/rail_cmd.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/economy_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/signs_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/subsidy_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_object.cpp
# src/settings.cpp
# src/string.cpp
# src/string_func.h
# src/table/CMakeLists.txt
# src/table/settings/settings.ini
# src/viewport_sprite_sorter_sse4.cpp
3 years ago
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
24fdc8331b
Add CheckCaches mode to emit a log/save/screenshot on detected issue
3 years ago
2df744db79
OSX: Fix CoreTextFontCache not setting font_height_cache
...
See: #323
3 years ago
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
753b1d7e15
Feature: Add selected toolbar buttons to MacBook Pro Touch Bar
3 years ago
eca73a810c
Change: rebrand 1.12.0 to 12.0
...
One question that keeps popping up: "when do we release 2.0?".
NewGRF will force that at least 1.16 will be 2.0, but to not wait
for this, let's drop the "1." and be for ever done with that
conversation.
We are following in the footstep of giants here.
3 years ago
16abdd5254
Change: [Win32] Set the console codepage to UTF-8
3 years ago
0d5d3083bd
Codechange: [OSX] Use more exact enum names where introduced with the 10.12 SDK.
...
The enum values still have the exact same numerical values, but the 10.12
SDK introduced more explicit names (e.g. like NSEventTypeApplicationDefined
instead of NSApplicationDefined) for several enum constants.
Use them when available.
3 years ago
87948d8029
Thread: Adjust checks for whether current thread is the game thread
3 years ago
f904aef176
Cleanup: use nullptr instead of 0 or NULL
3 years ago
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
3 years ago
1002c6d9d2
Fix various compiler warnings
...
See: #267
3 years ago
744a9e4745
Codechange: [WIN32] Add a wrapper around GetProcAddress()
3 years ago
15f66329c2
Fix: [MinGW] Silence 2 cast warnings
3 years ago
b7250a42e1
Fix: [MinGW32] Linking error
3 years ago
3ca0239985
Fix: [MinGW32] SHGFP_TYPE_CURRENT is now present in win32api
3 years ago
5d05c4919b
Codechange: [WIN32] Reduce manual dynamic loading as WinXP is the minimum version
3 years ago
f4c7d5577e
Codechange: [WIN32] Use VersionHelpers where appropriate
3 years ago
bcd7a7aafe
Codechange: rename _SQ64 into POINTER_IS_64BIT ( #9313 )
3 years ago
ca9a7df752
Codechange: rename str_validate to StrMakeValid(InPlace) ( #9304 )
...
This to be more explicit the function changes the value, and not
returns yes/no.
3 years ago
77330d09fd
Codechange: move font settings to std::string
3 years ago
9d72eb02f5
Cleanup: Remove old FiosList helper methods. ( #9139 )
...
(cherry-picked from commit f018471b36
3 years ago
f018471b36
Cleanup: Remove old FiosList helper methods. ( #9139 )
3 years ago
253772e9af
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
4 years ago
d4f0b6f434
Fix: [CMake] Auto-fill version details in rev.cpp and ottres.rc ( #9066 )
4 years ago
cb08d56add
MinGW32: Fix 13011e00: wrong safe esp variable in asm block
4 years ago
272e583478
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/korean.txt
# src/settings.cpp
4 years ago
56f982fa7f
Fix #9015 : Don't set free space value if not requested. ( #9016 )
4 years ago
227041008f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/lang/russian.txt
# src/misc_gui.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_cmd.cpp
# src/window_gui.h
4 years ago
045de24c9c
Revert "Windows: Use TLS to avoid sharing buffers for FS2OTTD, OTTD2FS, GetCurrentLocale"
...
This reverts commit 0a61671ff1
4 years ago
c800dcaff8
Fix: [Win32] Font glyphs of certain widths broke
...
Font glyphs between 33 and 39 pixels wide, in the Win32 font system, used wrong alignment and caused glyphs to appear broken.
When in the 33 to 39 pixel range, glyphs without AA were rounded down to 32 pixel pitch, instead of up to 64 pixel pitch.
4 years ago
5233fd2751
Change: [win32] Use user UI language for initial language selection ( #8973 ) ( #8974 )
4 years ago
746f1ca11a
Codechange: Remove the now meaningless console_cp parameter from OTTD2FS
4 years ago
e0561dbded
Fix #8713 : Change OTTD2FS and FS2OTTD to return string objects instead of static buffers
4 years ago
63ddf7f587
Crashlog: Update thread/lock handling to match GameLoop changes
4 years ago
5e14b54a0c
Merge branch 'master' into jgrpp
4 years ago
13011e00c6
Fix #8860 : [Win32] Crashlog window wasn't reliably shown for crashes not on the main thread.
4 years ago
883e19f2c6
Windows: Fix wrong stack pointer for crash log window on non-main thread
4 years ago
f53697ce76
Windows: Call SetThreadStackGuarantee for all threads, not just main thread
4 years ago
f4e29071be
Merge tag '1.11.0-beta2' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
4 years ago
44d786d8ce
MinGW: Fix define fallback for missing SHGFP_TYPE_CURRENT
4 years ago
cc465efa67
Change: [Win32] Use more modern way of getting free disk space
4 years ago
b427ddce88
Codechange: Switch to explicit wide strings
4 years ago
beeb9e0a1b
Remove: [Win32] Last pretenses of being able to build for Windows 95
4 years ago
6776229047
Codechange: Make the simple Malloc sprite allocator globally usable.
4 years ago
70aa3b4011
Codechange: Give sprite encoders a hint which colour components of a sprite are filled with useful information.
4 years ago
ef478ade64
Add: [Win32] Video driver that uses OpenGL to transfer the video buffer to the screen.
4 years ago
e95216b59d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
4 years ago
b66e977acd
Change: [OSX] When auto-detecting a font, try for sans-serif first.
...
On a display, especially with small fonts or low pixel sizes, sans-serif
fonts are usually easier to read than serif fonts.
4 years ago
6755ff63e1
Add: [OSX] Native font rendering without using FreeType.
4 years ago
21a2cd7bc3
Codechange: Replace magic numbers by constants.
4 years ago
23389e9491
Remove: [OSX] Startup splash screen.
...
It wasn't displayed anyway as it was never copied to the bundle.
4 years ago
63ed3f3575
Codechange: Move Fontconfig-specific code to a seperate file.
4 years ago
f2294851e6
Codechange: [OSX] Move OSX-specific font code to a separate file.
4 years ago
c6af8f16f6
Codechange: [Win32] Move Win32-specific font code to a seperate file.
4 years ago
5ad1640984
Codechange: Make OS font handle of the FontCache read-only.
4 years ago
348f322df1
Fix f1f281b31: [Win32] MinGW doesn't know timeapi.h
4 years ago
f1f281b318
Fix: [Win32] Set minimum resolution for timers to 1ms. ( #8660 )
4 years ago
6c8f2227cd
Fix: [Emscripten] open links in browser ( #8655 )
4 years ago
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
4 years ago
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
4 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
6ad5489d01
Codechange: [OSX] Silence some annoying warnings.
4 years ago
9ccef816f9
Codechange: [OSX] Re-arrange the OSX video driver code by combining all drawing code and moving the window/event handling to a different file.
...
This is just a code move/rename, not a functionality change.
4 years ago
ab7da117e0
Add: always set PERSONAL_DIR "/content_download" in search path ( #8481 )
...
This means that if you start OpenTTD with "-c" to indicate another
location to store files, it can still read the content you already
downloaded from your PERSONAL_DIR. This folder is, however,
read-only.
This is useful for situations where you downloaded OpenGFX via
the content-service, but want to run the regression or want to
run with a clean configuration. With this change, you no longer
need to download OpenGFX again.
4 years ago
8c24b2b6ce
Fix: [OSX] Fonts loaded directly from a file have to be registered with CoreText for proper text layout.
4 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
f3326d34e7
Codechange: Use std::string in FIO search path handling.
4 years ago
0c6e8a8123
Codechange: Store file search paths as std::string.
4 years ago
dd138fc460
Codechange: Stringify config file paths.
4 years ago
b7851e51ad
Fix: set SP_WORKING_DIR earlier with '-c'
...
On Windows, relative folders don't work so well. So we need to
lookup the full path. This is best done in DetermineBasePaths()
and as a bonus that only sets SP_WORKING_DIR once.
4 years ago
737ced9f50
Merge branch 'master' into jgrpp
4 years ago
716c883737
Fix: Globally apply preprocessor directive coding style
...
Global; except for the 32-bit SSE blitter, which has some #DEFINEs
in not-very-nice places.
4 years ago
610f8b9eca
Crashlog: Unix: Fix getting symbols using BFD
4 years ago
cf8ea74733
Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake
4 years ago
4d04009d12
Codechange: remove #ifdef from .cpp files to exclude features
...
With CMake, these files are simply not compiled to start with.
4 years ago
56d54cf60e
Add: introduce CMake for project management
...
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.
Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.
This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.
Addtiionally, this heavily improves our detection of libraries, etc.
4 years ago
677940cfc6
Merge branch 'master' into jgrpp
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
b3ddf2c907
Fix: [Win32] Crash message not fitting in crash dialog
4 years ago
b5ca2161d9
Fix #7970 : [Win32] Disable event loop on crash to prevent recursive faults
4 years ago
07c9621fcf
Merge branch 'master' into jgrpp
4 years ago
e0d20a44d2
Codechange: Use a dynamic copyright year
4 years ago
74b6981d97
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/os/macosx/macos.mm
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/fullscreen.mm
# src/video/cocoa/wnd_quartz.mm
# src/video/cocoa/wnd_quickdraw.mm
4 years ago
669b68d140
Crashlog: Suffix crash file names with date/time
5 years ago
eef6ad7b2a
Crash log: Save config file in new crash save chunk
5 years ago
e9294ce4e3
Cleanup: [OSX] Mop up some remaining stuff catering to compiling with very old SDK versions.
5 years ago
9d7ad67c1d
Codechange: [OSX] Allow compiling with SDK version pre 10.9.
5 years ago
0a61671ff1
Windows: Use TLS to avoid sharing buffers for FS2OTTD, OTTD2FS, GetCurrentLocale
5 years ago
b96e7f78fb
Merge branch 'master' into jgrpp
5 years ago
7f693ce497
Fix: [SDL2] support pasting from clipboard on Linux
5 years ago
babe98cdb1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network_server.h
# src/pathfinder/yapf/yapf_road.cpp
# src/viewport.cpp
5 years ago
2f264f2c92
Change: Heading for 1.11 now
5 years ago
dd99fd646d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_station_base.h
# src/industry.h
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/station_cmd.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
5 years ago
dbbd0f5ddc
Fix: [OSX] Don't show a crash/assertion message box for a GUI-less video driver.
5 years ago
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
5 years ago
c7ead8388c
Codechange: Improve MSVC ARM64 support
5 years ago
Jonathan G Rennison
Danny de Bruijne
Patric Stout
glx22
Michael Lutz
Rubidium
PeterN
Loïc Guilloux
Niels Martin Hansen
Wim Leflere
embeddedt
Charles Pigott
TechGeekNZ
LCD 47
Michał Janiszewski