dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
98aa58a6b4d451c3ef73c3d2db20543ca4039c8f
openttd/projects
History
Jonathan G Rennison 281d346fe2 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
2019-01-29 02:28:14 +00: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 'cpp-11' into crashlog_improvements
2018-04-27 00:33:44 +01:00
dpi_aware.manifest
Fix: enable DPI-awareness for MINGW builds
2019-01-25 16:59:41 +01:00
gen-kdev4.sh
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
2017-08-24 14:50:55 +00:00
generate
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01: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
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
generate.vbs
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01: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_vs80.vcproj
Merge branch 'cpp-11' into save_ext
2019-01-06 22:10:04 +00:00
openttd_vs90.vcproj
Merge branch 'cpp-11' into save_ext
2019-01-06 22:10:04 +00:00
openttd_vs100.vcxproj
Merge branch 'cpp-11' into save_ext
2019-01-06 22:10:04 +00:00
openttd_vs100.vcxproj.filters
Merge branch 'cpp-11' into save_ext
2019-01-06 22:10:04 +00: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
2019-01-29 02:28:14 +00:00
openttd_vs140.vcxproj.filters
Codechange: [Blitter] Change DrawLine to be templated
2019-01-24 11:12:06 +00: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
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00: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
2019-01-29 02:28:14 +00:00
openttd_vs141.vcxproj.filters
Codechange: [Blitter] Change DrawLine to be templated
2019-01-24 11:12:06 +00: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
Change: Always build baseset metadata, instead of including it in the repo.
2019-01-25 22:28:39 +00:00
openttd_vs142.sln
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +01:00
openttd_vs142.vcxproj
Merge branch 'master' into jgrpp
2019-01-29 02:28:14 +00:00
openttd_vs142.vcxproj.filters
Merge branch 'master' into jgrpp
2019-01-29 02:28:14 +00: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: Visual Studio 2019 project files
2019-01-26 14:56:35 +01: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: Visual Studio 2019 project files
2019-01-26 14:56:35 +01: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
Add: Visual Studio 2019 project files
2019-01-26 14:56:35 +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