Sergii Pylypenko
66e3334f0e
Merge upstream branch 1.8
2018-05-31 22:59:50 +03:00
frosch
2b933a1b3b
(svn r27862) [1.7] -Backport from trunk:
...
- Fix: Failed to load lzo compressed savegames sometimes [FS#6450] (r27793)
- Fix: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input [FS#6366] (r27791, r27790)
- Fix: [NewGRF] Get vehicle load amount after executing new cargo trigger [FS#6536] (r27788)
- Fix: AI configuration changed incorrect parameter when some parameters are hidden [FS#6479] (r27787, r27786)
- Fix: Buoys not always drawn after being placed depending on zoom level [FS#6508] (r27785)
- Fix: Allow rail conversion even if ship is on tile [FS#6505] (r27784)
2018-05-31 22:05:28 +03:00
frosch
9499e93a67
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
2017-09-24 17:38:03 +00:00
frosch
f43f4981e3
(svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
2017-09-24 17:35:51 +00:00
frosch
7726f2d330
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
2017-09-24 16:19:29 +00:00
frosch
28be179d4a
(svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled.
2017-09-24 16:00:29 +00:00
frosch
a04076ba41
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
2017-08-24 14:50:55 +00:00
Sergii Pylypenko
b4cc822085
Merge svn r27779
...
Conflicts:
src/autoreplace_gui.cpp
src/economy.cpp
src/fios_gui.cpp
src/lang/spanish_MX.txt
src/network/network_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/toolbar_gui.cpp
src/window.cpp
2017-03-17 23:14:41 +02:00
michi_cc
cb2e84454f
(svn r27791) -Fix (r27790) [FS#6366]: Try #2 . Now also for Visual Studio 2010.
2017-03-13 21:56:38 +00:00
michi_cc
ac735cfaac
(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
frosch
b21e13a2a4
(svn r27553) -Update: Project files
2016-04-30 14:33:36 +00:00
frosch
d57835c7ae
(svn r27553) -Update: Project files
2016-04-30 14:33:36 +00:00
frosch
e7e6b45d89
(svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds.
2016-04-17 16:50:37 +00:00
frosch
7e59cf588d
(svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds.
2016-04-17 16:50:37 +00:00
pelya
3ef1c1baff
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
...
These merges are becoming more awful every time
Conflicts:
src/ai/ai_gui.cpp
src/build_vehicle_gui.cpp
src/cheat_gui.cpp
src/company_gui.cpp
src/depot_gui.cpp
src/dock_gui.cpp
src/error_gui.cpp
src/genworld_gui.cpp
src/misc_gui.cpp
src/network/network_content_gui.cpp
src/network/network_gui.cpp
src/newgrf_gui.cpp
src/news_gui.cpp
src/rail_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/settings_gui.cpp
src/settings_gui.h
src/signs_gui.cpp
src/station_gui.cpp
src/table/settings.ini
src/terraform_gui.cpp
src/toolbar_gui.cpp
src/toolbar_gui.h
src/vehicle_gui.cpp
src/video/sdl_v.cpp
src/viewport.cpp
src/widget.cpp
src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
michi_cc
f4cd0198f4
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
michi_cc
9f5503ba8f
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
frosch
67ae231f1b
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
2015-07-26 09:47:17 +00:00
frosch
4830497f0b
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
2015-07-26 09:47:17 +00:00
frosch
4b39e3d98c
(svn r27152) -Fix: Generated files.
2015-02-15 14:56:21 +00:00
frosch
83a02da380
(svn r27152) -Fix: Generated files.
2015-02-15 14:56:21 +00:00
frosch
3ea4eebe9a
(svn r26995) -Fix: Add missing files to source.list
2014-10-11 21:38:32 +00:00
frosch
b8690523d2
(svn r26995) -Fix: Add missing files to source.list
2014-10-11 21:38:32 +00:00
planetmaker
ff71a8f5c9
(svn r26993) -Feature: Latin translation (Supercheese)
2014-10-11 21:30:33 +00:00
planetmaker
f7df63fbf9
(svn r26993) -Feature: Latin translation (Supercheese)
2014-10-11 21:30:33 +00:00
rubidium
8ab4f746f2
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
2014-09-20 15:46:44 +00:00
rubidium
9e0f4b3847
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
2014-09-20 15:46:44 +00:00
rubidium
6a1ed21342
(svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use
2014-09-19 20:06:51 +00:00
rubidium
79ca66eb67
(svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use
2014-09-19 20:06:51 +00:00
Sergii Pylypenko
2603e6b5e3
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/os/unix/unix.cpp
src/widgets/dropdown.cpp
2014-08-19 19:21:47 +03:00
michi_cc
7f9e7b1a08
(svn r26654) -Fix (r26482): Header file missing from sources.list.
2014-06-17 20:09:00 +00:00
michi_cc
5ba1a7f323
(svn r26654) -Fix (r26482): Header file missing from sources.list.
2014-06-17 20:09:00 +00:00
Juanjo
cf89f0ff5e
Toolbar types.
2014-03-15 21:59:34 +02:00
michi_cc
616da05c3e
(svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build.
2014-02-15 15:01:32 +00:00
michi_cc
7d56fd5382
(svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build.
2014-02-15 15:01:32 +00:00
zuu
ea7483a419
(svn r26305) -Add: [nogo] ScriptStoryPageElementList() - a list of all story page elements for a given page
2014-02-06 19:41:56 +00:00
zuu
57a88c9de2
(svn r26305) -Add: [nogo] ScriptStoryPageElementList() - a list of all story page elements for a given page
2014-02-06 19:41:56 +00:00
zuu
a6e0f162ed
(svn r26303) -Add: [nogo] ScriptStoryPageList() - a list of all story pages
2014-02-06 19:25:39 +00:00
zuu
5165be2698
(svn r26303) -Add: [nogo] ScriptStoryPageList() - a list of all story pages
2014-02-06 19:25:39 +00:00
rubidium
4585f74faa
(svn r26258) -Codechange: deduplicate Draw methods (MJP)
2014-01-13 18:12:33 +00:00
rubidium
fdf55a1a48
(svn r26258) -Codechange: deduplicate Draw methods (MJP)
2014-01-13 18:12:33 +00:00
rubidium
3df799c1c6
(svn r26257) -Codechange: replace most of the SSE macros by functions
2014-01-13 18:09:21 +00:00
rubidium
f5f4f8a4b3
(svn r26257) -Codechange: replace most of the SSE macros by functions
2014-01-13 18:09:21 +00:00
zuu
1672714d0f
(svn r26227) -Fix: [Windows] generate.vbs didn't include SSE source files
2014-01-05 10:19:59 +00:00
zuu
1aa26b30c7
(svn r26227) -Fix: [Windows] generate.vbs didn't include SSE source files
2014-01-05 10:19:59 +00:00
rubidium
793dc27096
(svn r26214) -Add: specialised animated SSE4 blitter (MJP)
...
With 32bpp base set about 15-20% faster in the Draw function (slower with 8bpp base set). Overall, with 32bpp base set, about 5% faster.
2014-01-02 23:52:13 +00:00
rubidium
4c84d13454
(svn r26214) -Add: specialised animated SSE4 blitter (MJP)
...
With 32bpp base set about 15-20% faster in the Draw function (slower with 8bpp base set). Overall, with 32bpp base set, about 5% faster.
2014-01-02 23:52:13 +00:00
rubidium
e25733c417
(svn r26213) -Add: specialised non-animated SSE4 blitter (MJP)
...
With 32bpp base set about 40% faster than 32bpp-optimized, or about 10% for 8bpp base sets in the Draw function. Respectively about 8 and 1% of total run time
2014-01-02 23:21:07 +00:00
rubidium
78df732a7b
(svn r26213) -Add: specialised non-animated SSE4 blitter (MJP)
...
With 32bpp base set about 40% faster than 32bpp-optimized, or about 10% for 8bpp base sets in the Draw function. Respectively about 8 and 1% of total run time
2014-01-02 23:21:07 +00:00
rubidium
730127b67e
(svn r26212) -Add: specialised non-animated SSSE3 blitter (MJP)
...
With 32bpp base set about 35% faster than 32bpp-optimized, or about 10% for 8bpp base sets in the Draw function. Respectively about 6 and 1% of total run time
2014-01-02 23:17:01 +00:00