dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,733 Commits 1 Branch 0 Tags
dd16145b03b0b4980921ee47f302c75e05697d14
Commit Graph

490 Commits

Author SHA1 Message Date
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
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
737ced9f50 Merge branch 'master' into jgrpp 2020-07-07 17:28:19 +01:00
TechGeekNZ
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.
 2020-07-03 09:08:46 +02:00
Jonathan G Rennison
610f8b9eca Crashlog: Unix: Fix getting symbols using BFD 2020-06-30 23:53:51 +01:00
TechGeekNZ
cf8ea74733 Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 2020-06-28 21:56:43 +01:00
Patric Stout
4d04009d12 Codechange: remove #ifdef from .cpp files to exclude features 
With CMake, these files are simply not compiled to start with.
 2020-06-05 19:36:05 +02:00
Patric Stout
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.
 2020-06-05 19:36:05 +02:00
Jonathan G Rennison
677940cfc6 Merge branch 'master' into jgrpp 2020-06-01 20:39:46 +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
glx
b3ddf2c907 Fix: [Win32] Crash message not fitting in crash dialog 2020-06-01 14:09:58 +02:00
glx
b5ca2161d9 Fix #7970: [Win32] Disable event loop on crash to prevent recursive faults 2020-06-01 14:09:58 +02:00
Jonathan G Rennison
07c9621fcf Merge branch 'master' into jgrpp 2020-05-07 20:57:47 +01:00
glx
e0d20a44d2 Codechange: Use a dynamic copyright year 2020-05-06 09:54:36 +01:00
Jonathan G Rennison
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
 2020-04-30 23:59:06 +01:00
Jonathan G Rennison
669b68d140 Crashlog: Suffix crash file names with date/time 2020-04-27 17:31:35 +01:00
Jonathan G Rennison
eef6ad7b2a Crash log: Save config file in new crash save chunk 2020-04-21 18:17:13 +01:00
Michael Lutz
e9294ce4e3 Cleanup: [OSX] Mop up some remaining stuff catering to compiling with very old SDK versions. 2020-04-12 18:44:43 +02:00
Michael Lutz
9d7ad67c1d Codechange: [OSX] Allow compiling with SDK version pre 10.9. 2020-04-12 18:44:43 +02: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
b96e7f78fb Merge branch 'master' into jgrpp 2020-02-21 21:18:01 +00:00
LCD 47
7f693ce497 Fix: [SDL2] support pasting from clipboard on Linux 2020-02-15 19:38:25 +00:00
Jonathan G Rennison
babe98cdb1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
 2020-02-09 15:43:47 +00:00
glx
2f264f2c92 Change: Heading for 1.11 now 2020-02-08 23:38:49 +01:00
Jonathan G Rennison
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
 2020-01-20 18:36:55 +00:00
glx
dbbd0f5ddc Fix: [OSX] Don't show a crash/assertion message box for a GUI-less video driver. 2020-01-12 22:02:10 +01:00
Jonathan G Rennison
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
 2020-01-06 18:45:51 +00:00
Michał Janiszewski
c7ead8388c Codechange: Improve MSVC ARM64 support 2019-12-24 13:14:11 +00:00
Jonathan G Rennison
0e82365938 Windows: Crash log: Add more exception details 2019-12-10 02:26:16 +00:00
Jonathan G Rennison
8b9c9e93f8 Win32: Load AddVectoredExceptionHandler function at run time 
See: #116
 2019-11-17 21:47:20 +00: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
ca3c72438e Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
 2019-11-06 17:49:00 +00:00
Jonathan G Rennison
a7404a88bd OSX: Remove use of sigaltstack 2019-11-05 17:57:58 +00:00
Jonathan G Rennison
47629d6ed9 Windows: Attempt to log stack overflow and heap corruption exceptions 2019-11-04 03:30:42 +00:00
Michael Lutz
d5a9bd404a Codechange: [OSX] Use std::unique_ptr with a custom deleter to simply memory management of Core Foundation types. 2019-11-01 22:32:53 +01:00
Jonathan G Rennison
6c21c93192 Add command line switch -Z to write detailed version information 2019-10-08 00:05:44 +01:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
 2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Michael Lutz
61d6fa97cc Fix: [OSX] Wrong allocator usage for creating a CFString. 2019-09-29 20:31:48 +02:00
Jonathan G Rennison
1f535915d1 Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	config.lib
#	src/core/bitmath_func.hpp
#	src/lang/korean.txt
#	src/main_gui.cpp
#	src/order_gui.cpp
#	src/script/api/script_object.cpp
#	src/station_cmd.cpp
#	src/video/cocoa/wnd_quartz.mm
 2019-09-18 01:18:28 +01:00
Jonathan G Rennison
a30638bc4a Merge branch 'jgrpp' into jgrpp-nrt 2019-09-16 22:28:35 +01:00
Jonathan G Rennison
4116ccd578 Windows: Do not output crash.dmp files for non-developers 2019-09-07 02:16:36 +01:00
uvealonso
ead772324e Fix #7704: [OSX] Handle malformed UTF8 strings 2019-09-01 14:01:52 +02:00
Jonathan G Rennison
04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
 2019-08-24 10:41:08 +01:00
Jonathan G Rennison
459a49cb24 Add flags for mismatch type to client desync log 2019-08-20 22:52:03 +01:00
Jonathan G Rennison
dbc5f1baed Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
 2019-07-11 20:03:23 +01:00
Jonathan G Rennison
97baff6fd8 Add client desync log to server desync log output 2019-05-23 22:53:17 +01:00
Jonathan G Rennison
5a9790a196 Store crash/desync logs in crash/desync savegame 
Add console command to dump loaded debug log
 2019-05-23 22:53:17 +01:00
Jonathan G Rennison
951a50ddd9 Include crash/desync log contents in PNG screenshots 2019-05-22 07:27:51 +01:00