864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
6 years ago
5abd7ad788
Merge branch 'cpp-11' into save_ext
7 years ago
124d9a753e
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
0d1f88c09a
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
6120e69f21
(svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
b9ed60d307
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
7 years ago
db3410e196
(svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled.
7 years ago
509e20406f
Merge branch 'master' into cpp-11
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
19e62d089f
Merge branch 'master' into save_ext
7 years ago
30a25f45ce
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
7 years ago
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
48bbe0325d
Merge branch 'cpp-11' into save_ext
7 years ago
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
7 years ago
9a62317dfc
(svn r27791) -Fix (r27790) [FS#6366]: Try #2 . Now also for Visual Studio 2010.
7 years ago
2d45d55925
(svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input.
7 years ago
8f3e0c4fe5
Add a custom arena allocator utility.
8 years ago
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
8 years ago
a6e0b1ac7d
Merge branch 'cpp-11' into save_ext
8 years ago
6e9ea59ab5
Add a simple scope guard include file.
8 years ago
e6c7134935
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
b21e13a2a4
(svn r27553) -Update: Project files
8 years ago
e7e6b45d89
(svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds.
8 years ago
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
9 years ago
ddcb3bf560
Update project files.
9 years ago
ef5ecdb2c7
Merge branch 'git_findversion_fix' into save_ext
9 years ago
88c150abf7
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
f4cd0198f4
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
9 years ago
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
36d5b874da
Update project files
9 years ago
67ae231f1b
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
9 years ago
4b39e3d98c
(svn r27152) -Fix: Generated files.
10 years ago
3ea4eebe9a
(svn r26995) -Fix: Add missing files to source.list
10 years ago
ff71a8f5c9
(svn r26993) -Feature: Latin translation (Supercheese)
10 years ago
8ab4f746f2
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
10 years ago
6a1ed21342
(svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use
10 years ago
7f9e7b1a08
(svn r26654) -Fix (r26482): Header file missing from sources.list.
10 years ago
616da05c3e
(svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build.
11 years ago
ea7483a419
(svn r26305) -Add: [nogo] ScriptStoryPageElementList() - a list of all story page elements for a given page
11 years ago
a6e0f162ed
(svn r26303) -Add: [nogo] ScriptStoryPageList() - a list of all story pages
11 years ago
4585f74faa
(svn r26258) -Codechange: deduplicate Draw methods (MJP)
11 years ago
3df799c1c6
(svn r26257) -Codechange: replace most of the SSE macros by functions
11 years ago
1672714d0f
(svn r26227) -Fix: [Windows] generate.vbs didn't include SSE source files
11 years ago
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.
11 years ago
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
11 years ago
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
11 years ago
0b08fb44f4
(svn r26211) -Add: specialised non-animated SS2 blitter (MJP)
...
With 32bpp base set about 30% faster than 32bpp-optimized, or about 10% for 8bpp base sets in the Draw function. Respectively about 5 and 1% of total run time
11 years ago
Jonathan G Rennison
frosch
michi_cc
patch-import
planetmaker
rubidium
zuu