dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f8d6e781bae9d64c5cc76451abc88feca7697e7b
openttd/projects
History
Jonathan G Rennison f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
..
basesets_vs140.vcxproj
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs140.vcxproj.filters
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs140.vcxproj.filters.in
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs140.vcxproj.in
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs141.vcxproj
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs141.vcxproj.filters
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs141.vcxproj.filters.in
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs141.vcxproj.in
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
basesets_vs142.vcxproj
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
basesets_vs142.vcxproj.filters
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
basesets_vs142.vcxproj.filters.in
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
basesets_vs142.vcxproj.in
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
determineversion.vbs
Merge branch 'master' into jgrpp
2020-05-07 20:57:47 +01:00
dpi_aware.manifest
Fix: enable DPI-awareness for MINGW builds
2019-01-25 16:59:41 +01:00
gen-kdev4.sh
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
generate
Merge branch 'master' into jgrpp
2019-11-12 18:43:10 +00:00
generate_vs140.vcxproj
Cleanup: remove useless and outdated 'generate' projects outputs
2019-01-17 23:02:11 +00:00
generate_vs141.vcxproj
Cleanup: remove useless and outdated 'generate' projects outputs
2019-01-17 23:02:11 +00:00
generate_vs142.vcxproj
Fix: [MSVC] don't force SDK version (#7474)
2019-04-05 21:07:06 +02:00
generate.vbs
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
langs_vs140.vcxproj
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs140.vcxproj.filters
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs140.vcxproj.filters.in
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
langs_vs140.vcxproj.in
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
2017-09-24 17:38:03 +00:00
langs_vs141.vcxproj
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs141.vcxproj.filters
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs141.vcxproj.filters.in
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
langs_vs141.vcxproj.in
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
2017-09-24 17:38:03 +00:00
langs_vs142.vcxproj
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
langs_vs142.vcxproj.filters
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
langs_vs142.vcxproj.filters.in
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
langs_vs142.vcxproj.in
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
openttd_vs140.sln
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
openttd_vs140.vcxproj
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
openttd_vs140.vcxproj.filters
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
openttd_vs140.vcxproj.filters.in
Cleanup: Use new filename for README file. (#6738)
2018-04-21 11:05:38 +02:00
openttd_vs140.vcxproj.in
Add: [Win32] GDI engine for font glyph rendering as a replacement for including FreeType.
2019-05-14 11:21:36 +01:00
openttd_vs141.sln
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
openttd_vs141.vcxproj
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
openttd_vs141.vcxproj.filters
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
openttd_vs141.vcxproj.filters.in
Cleanup: Use new filename for README file. (#6738)
2018-04-21 11:05:38 +02:00
openttd_vs141.vcxproj.in
Add: [Win32] GDI engine for font glyph rendering as a replacement for including FreeType.
2019-05-14 11:21:36 +01:00
openttd_vs142.sln
Update: Visual Studio 2019 solution file version upgrade (#7135)
2019-01-29 17:18:12 +01:00
openttd_vs142.vcxproj
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
openttd_vs142.vcxproj.filters
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
openttd_vs142.vcxproj.filters.in
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
openttd_vs142.vcxproj.in
Add: Optional implementation of std::optional for pre-C++17 compilers.
2020-05-21 20:02:34 +02:00
os_versions.manifest
Fix: enable DPI-awareness for MINGW builds
2019-01-25 16:59:41 +01:00
regression_vs140.vcxproj
Add: [Win32] regression project files
2019-01-05 18:10:14 +01:00
regression_vs141.vcxproj
Add: [Win32] regression project files
2019-01-05 18:10:14 +01:00
regression_vs142.vcxproj
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
regression.bat
Add: [Win32] regression project files
2019-01-05 18:10:14 +01:00
settings_vs140.vcxproj
Fix 7f54c59a6: use some consistency for project dependencies determination
2019-01-17 23:02:11 +00:00
settings_vs140.vcxproj.filters
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
settings_vs140.vcxproj.filters.in
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
settings_vs140.vcxproj.in
Fix 7f54c59a6: use some consistency for project dependencies determination
2019-01-17 23:02:11 +00:00
settings_vs141.vcxproj
Fix 7f54c59a6: use some consistency for project dependencies determination
2019-01-17 23:02:11 +00:00
settings_vs141.vcxproj.filters
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
settings_vs141.vcxproj.filters.in
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
settings_vs141.vcxproj.in
Fix 7f54c59a6: use some consistency for project dependencies determination
2019-01-17 23:02:11 +00:00
settings_vs142.vcxproj
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
settings_vs142.vcxproj.filters
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
settings_vs142.vcxproj.filters.in
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
settings_vs142.vcxproj.in
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
settingsgen_vs140.vcxproj
Update: Add missing newline at end of some project files
2018-11-18 19:51:51 +01:00
settingsgen_vs140.vcxproj.filters
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
settingsgen_vs141.vcxproj
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
settingsgen_vs141.vcxproj.filters
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
settingsgen_vs142.vcxproj
Add: Optional implementation of std::optional for pre-C++17 compilers.
2020-05-21 20:02:34 +02:00
settingsgen_vs142.vcxproj.filters
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
strgen_vs140.vcxproj
Update: Add missing newline at end of some project files
2018-11-18 19:51:51 +01:00
strgen_vs140.vcxproj.filters
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
strgen_vs141.vcxproj
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
strgen_vs141.vcxproj.filters
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
strgen_vs142.vcxproj
Change: Limit in-editor warnings in VS 2019
2019-07-06 20:02:12 +01:00
strgen_vs142.vcxproj.filters
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
version_vs140.vcxproj
Update: Add missing newline at end of some project files
2018-11-18 19:51:51 +01:00
version_vs141.vcxproj
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
version_vs142.vcxproj
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00