Jonathan G Rennison
ea3948aa2d
Merge branch 'cpp-btree' into infrastructure_sharing
2018-01-26 18:26:24 +00:00
Jonathan G Rennison
093bd804cd
Merge branch 'save_ext' into infrastructure_sharing
2018-01-26 18:18:46 +00:00
Jonathan G Rennison
5abd7ad788
Merge branch 'cpp-11' into save_ext
2018-01-26 18:18:36 +00:00
Jonathan G Rennison
124d9a753e
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
2017-10-05 18:16:37 +01:00
frosch
6120e69f21
(svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
2017-09-24 17:35:51 +00:00
Jonathan G Rennison
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
2017-08-15 18:44:17 +01:00
Jonathan G Rennison
48bbe0325d
Merge branch 'cpp-11' into save_ext
2017-03-29 19:49:29 +01:00
Jonathan G Rennison
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
2017-03-19 12:12:52 +00:00
michi_cc
2d45d55925
(svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input.
2017-03-13 20:21:40 +00:00
Jonathan G Rennison
f3b1059930
Fix order removal due to shared-infra company deletion.
...
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
2017-02-22 20:58:24 +00:00
Jonathan G Rennison
8f3e0c4fe5
Add a custom arena allocator utility.
2017-02-08 21:46:50 +00:00
Jonathan G Rennison
3d0ed3547b
Update source.list and project files with btree headers.
2017-02-07 19:16:20 +00:00
Jonathan G Rennison
a6e0b1ac7d
Merge branch 'cpp-11' into save_ext
2016-09-05 23:17:02 +01:00
Jonathan G Rennison
6e9ea59ab5
Add a simple scope guard include file.
2016-09-05 23:16:47 +01:00
Jonathan G Rennison
e6c7134935
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
2016-09-02 22:21:28 +01:00
frosch
e7e6b45d89
(svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds.
2016-04-17 16:50:37 +00:00
Jonathan G Rennison
ddcb3bf560
Update project files.
2015-09-11 15:16:19 +01:00
michi_cc
f4cd0198f4
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
