Commit Graph

15 Commits (6b107d65d9a37485324ea208b993bb137b73c2a7)

Author SHA1 Message Date
Jonathan G Rennison 7194e19380 Merge branch 'save_ext' into tracerestrict-sx 8 years ago
Jonathan G Rennison 48bbe0325d Merge branch 'cpp-11' into save_ext 8 years ago
Jonathan G Rennison 58d8a791e4 Merge branch 'save_ext' into tracerestrict-sx 8 years ago
Jonathan G Rennison fae4ac1a5d Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
8 years ago
michi_cc 2d45d55925 (svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input. 8 years ago
Jonathan G Rennison 8f3e0c4fe5 Add a custom arena allocator utility. 8 years ago
Jonathan G Rennison 162e495cc9 Merge branch 'save_ext' into tracerestrict-sx
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison a6e0b1ac7d Merge branch 'cpp-11' into save_ext 8 years ago
Jonathan G Rennison 6e9ea59ab5 Add a simple scope guard include file. 8 years ago
Jonathan G Rennison e6c7134935 Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison e4b932d53a Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison b11d48b431 Update project files 8 years ago
frosch e7e6b45d89 (svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds. 9 years ago
Jonathan G Rennison ddcb3bf560 Update project files. 9 years ago
michi_cc f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 9 years ago