dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,695 Commits 1 Branch 0 Tags
045de24c9ce6458c31477103688beb143b2636c2
Commit Graph

116 Commits

Author SHA1 Message Date
Jonathan G Rennison
045de24c9c Revert "Windows: Use TLS to avoid sharing buffers for FS2OTTD, OTTD2FS, GetCurrentLocale" 
This reverts commit 0a61671ff1.

# Conflicts:
#	src/os/windows/win32.cpp
 2021-04-11 02:44:53 +01:00
Jonathan G Rennison
63ddf7f587 Crashlog: Update thread/lock handling to match GameLoop changes 2021-04-06 18:43:50 +01:00
Jonathan G Rennison
f53697ce76 Windows: Call SetThreadStackGuarantee for all threads, not just main thread 2021-03-12 17:30:40 +00:00
Jonathan G Rennison
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
 2021-03-02 11:59:03 +00:00
Niels Martin Hansen
cc465efa67 Change: [Win32] Use more modern way of getting free disk space 2021-02-23 11:25:39 +01:00
Niels Martin Hansen
b427ddce88 Codechange: Switch to explicit wide strings 2021-02-23 11:25:39 +01:00
Niels Martin Hansen
beeb9e0a1b Remove: [Win32] Last pretenses of being able to build for Windows 95 2021-02-23 11:25:39 +01:00
Michael Lutz
ef478ade64 Add: [Win32] Video driver that uses OpenGL to transfer the video buffer to the screen. 2021-02-22 22:16:07 +01:00
Jonathan G Rennison
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
 2021-02-19 15:38:34 +00:00
glx22
348f322df1 Fix f1f281b31: [Win32] MinGW doesn't know timeapi.h 2021-02-13 19:07:42 +01:00
Loïc Guilloux
f1f281b318 Fix: [Win32] Set minimum resolution for timers to 1ms. (#8660) 2021-02-09 21:21:57 +01:00
Jonathan G Rennison
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
 2021-01-31 01:08:35 +00:00
Patric Stout
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.
 2021-01-03 11:10:56 +01:00
Jonathan G Rennison
483ed2f468 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/openttd.cpp
 2020-12-27 20:16:16 +00:00
Michael Lutz
f3326d34e7 Codechange: Use std::string in FIO search path handling. 2020-12-27 13:19:25 +01:00
Michael Lutz
0c6e8a8123 Codechange: Store file search paths as std::string. 2020-12-27 13:19:25 +01:00
Michael Lutz
dd138fc460 Codechange: Stringify config file paths. 2020-12-27 13:19:25 +01:00
Patric Stout
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.
 2020-12-13 22:45:50 +01:00
Jonathan G Rennison
52e0d44c8a Revert "Fix recursive faults in Window crash logger due to message box event loop." 
This reverts commit 2b1b7f8b135968cb88d8e65fcb89cdff8d203838.

Replaced by b5ca2161d9.
 2020-06-01 19:39:37 +01:00
Jonathan G Rennison
0a61671ff1 Windows: Use TLS to avoid sharing buffers for FS2OTTD, OTTD2FS, GetCurrentLocale 2020-04-12 01:42:09 +01: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
f887b12be2 Add 3rd party mingw-std-threads headers to fix MinGW compilation 2019-04-10 17:35:43 +01:00
Jonathan G Rennison
d5ee9d34da Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	Makefile.src.in
#	projects/determineversion.vbs
#	source.list
#	src/crashlog.cpp
#	src/misc.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rev.h
#	src/thread/thread.h
#	src/thread/thread_morphos.cpp
#	src/thread/thread_none.cpp
#	src/thread/thread_os2.cpp
#	src/thread/thread_pthread.cpp
#	src/thread/thread_win32.cpp
 2019-04-09 19:21:39 +01:00
glx22
3e608afa6c Fix: [Windows] OpenTTD window may be inactive when an error happens (#7482) 2019-04-07 21:52:30 +02:00
Michael Lutz
967b27a2c1 Codechange: C++11 STL has a function for getting the number of CPU cores. 2019-04-06 11:27:39 +02:00
Michael Lutz
ae748166d0 Codechange: Use platform independent C++11 function for sleeping on a thread. 2019-04-06 11:27:39 +02:00
Michael Lutz
05bc2ed7cb Codechange: Replace custom thread code with C++11 thread objects. 
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
 2019-04-06 11:27:39 +02:00
Charles Pigott
fe8c24e081 Codechange: Remove unnecessarily defined functions under MinGW 2019-01-17 21:55:15 +00:00
Charles Pigott
2d981a4b2c Fix: A few minor compile warnings under MinGW 2019-01-17 21:55:15 +00:00
glx
92d3358db5 Fix: [Win32] don't mess with std[out|err|in] if we can't allocate a console 2019-01-05 18:10:14 +01:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
9490f33a6c Merge branch 'master' into crashlog_improvements 
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
 2018-07-26 20:01:08 +01:00
Charles Pigott
63898f61b0 Codechange: Rearrange struct packing defines and make MinGW use _Pragma pack style 2018-07-19 20:24:17 +02:00
Michael Lutz
f4394debdc Add: [Win32] Native natural sort implementation. 2018-06-06 21:37:09 +02:00
Patric Stout
aef69443e7 Remove: WinCE support 2018-04-29 15:32:16 +02:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	config.lib
 2017-09-04 01:22:54 +01:00
Jonathan G Rennison
102405e082 Fix recursive faults in Window crash logger due to message box event loop. 2017-02-19 12:56:56 +00:00
michi_cc
c83306391e (svn r27673) -Add: [Win32] Thread names for windows debuggers. 2016-10-30 18:22:55 +00:00
michi_cc
36cbb54a9d (svn r27673) -Add: [Win32] Thread names for windows debuggers. 2016-10-30 18:22:55 +00:00
alberth
95bb103a23 (svn r27643) -Codechange: FiosGetDrives function also takes a destination file list. 2016-09-04 12:54:30 +00:00
alberth
f618c0d0a5 (svn r27643) -Codechange: FiosGetDrives function also takes a destination file list. 2016-09-04 12:54:30 +00:00
michi_cc
be689517f6 (svn r27481) -Fix: [Win32] Stdin/out/err need to be re-assigned differently if the runtime lib of MSVC2015 is used. 2015-12-28 13:16:41 +00:00
michi_cc
4445809dd9 (svn r27481) -Fix: [Win32] Stdin/out/err need to be re-assigned differently if the runtime lib of MSVC2015 is used. 2015-12-28 13:16:41 +00:00
rubidium
8b1f9399bc (svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library 2015-08-13 18:13:24 +00:00
rubidium
3b8aabdd9e (svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library 2015-08-13 18:13:24 +00:00
rubidium
10466746b4 (svn r27290) -Fix: sanitize the command line arguments before doing anything complex with them 2015-05-20 18:18:26 +00:00
rubidium
dde669e6d3 (svn r27290) -Fix: sanitize the command line arguments before doing anything complex with them 2015-05-20 18:18:26 +00:00