dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ceae4516ca66c55434e4288faca7145a8df1a3e9
openttd/projects
History
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
2018-11-05 12:53:36 +00:00
..
determineversion.vbs
Merge branch 'cpp-11' into crashlog_improvements
2018-04-27 00:33:44 +01:00
dpi_aware.manifest
(svn r27791) -Fix (r27790) [FS#6366]: Try #2. Now also for Visual Studio 2010.
2017-03-13 21:56:38 +00: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
Fix: Fluidsynth should not be added to VC project files
2018-11-01 23:20:44 +01:00
generate_vs80.vcproj
(svn r20154) -Fix: A missing entry caused MSVC to modify generate_vs*.vcproj all the time.
2010-07-15 17:14:36 +00:00
generate_vs90.vcproj
(svn r20154) -Fix: A missing entry caused MSVC to modify generate_vs*.vcproj all the time.
2010-07-15 17:14:36 +00:00
generate_vs100.vcxproj
(svn r20032) -Add: MSVC 2010 project files
2010-06-28 19:07:33 +00:00
generate_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
generate_vs141.vcxproj
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
generate.vbs
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
langs_vs80.vcproj
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs80.vcproj.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +00:00
langs_vs90.vcproj
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs90.vcproj.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +00:00
langs_vs100.vcxproj
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs100.vcxproj.filters
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)
2018-04-29 21:30:45 +02:00
langs_vs100.vcxproj.filters.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +00:00
langs_vs100.vcxproj.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +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
openttd_vs80.sln
(svn r22192) -Fix (r22188): MSVC 2005 64 bits didn't build settings(gen), and as such compilation failed
2011-03-05 08:48:37 +00:00
openttd_vs80.vcproj
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +01:00
openttd_vs80.vcproj.in
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
2018-06-25 18:39:59 +01:00
openttd_vs80.vcproj.user
(svn r7759) -Merge: makefile rewrite. This merge features:
2007-01-02 19:19:48 +00:00
openttd_vs90.sln
(svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build.
2014-02-15 15:01:32 +00:00
openttd_vs90.vcproj
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +01:00
openttd_vs90.vcproj.in
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
2018-06-25 18:39:59 +01:00
openttd_vs90.vcproj.user
(svn r12996) -Fix: debugging was not possible with MSVC 2008
2008-05-07 20:10:48 +00:00
openttd_vs100.sln
(svn r22188) -Add: Generate the settings as part of the MSVC build process, and enable it in Makefile too
2011-03-04 22:34:10 +00:00
openttd_vs100.vcxproj
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +01:00
openttd_vs100.vcxproj.filters
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +01:00
openttd_vs100.vcxproj.filters.in
Cleanup: Use new filename for README file. (#6738)
2018-04-21 11:05:38 +02:00
openttd_vs100.vcxproj.in
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
2018-06-25 18:39:59 +01:00
openttd_vs140.sln
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
openttd_vs140.vcxproj
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +01:00
openttd_vs140.vcxproj.filters
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +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
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
2018-06-25 18:39:59 +01:00
openttd_vs141.sln
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
openttd_vs141.vcxproj
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +01:00
openttd_vs141.vcxproj.filters
Merge branch 'master' into jgrpp
2018-07-24 18:30:42 +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
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
2018-06-25 18:39:59 +01:00
os_versions.manifest
Change: [Win32] Declare in the app manifest that all current Windows versions are natively supported.
2018-04-10 21:07:27 +02:00
settings_vs80.vcproj
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs80.vcproj.in
(svn r22190) -Fix (r22188): minor changes in project files
2011-03-04 23:44:10 +00:00
settings_vs90.vcproj
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs90.vcproj.in
(svn r22190) -Fix (r22188): minor changes in project files
2011-03-04 23:44:10 +00:00
settings_vs100.vcxproj
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs100.vcxproj.filters
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs100.vcxproj.filters.in
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
settings_vs100.vcxproj.in
(svn r22191) -Fix: make sure table/settings.h is generated with MSVC2010, also fix a warning in version project
2011-03-05 01:31:56 +00:00
settings_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +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
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
settings_vs141.vcxproj
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +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
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
settingsgen_vs80.vcproj
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
settingsgen_vs90.vcproj
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
settingsgen_vs100.vcxproj
(svn r22190) -Fix (r22188): minor changes in project files
2011-03-04 23:44:10 +00:00
settingsgen_vs100.vcxproj.filters
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
settingsgen_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00: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
strgen_vs80.vcproj
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
strgen_vs90.vcproj
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
strgen_vs100.vcxproj
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
strgen_vs100.vcxproj.filters
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
strgen_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00: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
version_vs80.vcproj
(svn r17407) -Fix (r17336): version_vs?0.vcproj not updated to new path
2009-09-03 20:03:01 +00:00
version_vs90.vcproj
(svn r17407) -Fix (r17336): version_vs?0.vcproj not updated to new path
2009-09-03 20:03:01 +00:00
version_vs100.vcxproj
(svn r22191) -Fix: make sure table/settings.h is generated with MSVC2010, also fix a warning in version project
2011-03-05 01:31:56 +00:00
version_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
version_vs141.vcxproj
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00