Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
a6887d7010
OpenTTD-patches/projects
History
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp 
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2019-03-27 18:12:04 +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 'master' into jgrpp 2019-03-04 01:18:25 +00: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 Fix: don't include xaudio2 if you are not going to compile it 2019-03-11 10:16:00 +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 Fix: don't include xaudio2 if you are not going to compile it 2019-03-11 10:16:00 +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-03-27 18:12:04 +00:00
openttd_vs140.vcxproj.filters Merge branch 'master' into jgrpp 2019-03-27 18:12:04 +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 Codechange: liblzma is called liblzma, how ever strange that might be 2019-03-11 10:16:00 +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 2019-03-27 18:12:04 +00:00
openttd_vs141.vcxproj.filters Merge branch 'master' into jgrpp 2019-03-27 18:12:04 +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 Codechange: liblzma is called liblzma, how ever strange that might be 2019-03-11 10:16:00 +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 2019-03-27 18:12:04 +00:00
openttd_vs142.vcxproj.filters Merge branch 'master' into jgrpp 2019-03-27 18:12:04 +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 Codechange: liblzma is called liblzma, how ever strange that might be 2019-03-11 10:16:00 +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