4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
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
6596ba216c
Merge branch 'zoning' into jgrpp
...
Conflicts:
src/table/sprites.h
9 years ago
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
9 years ago
de76316634
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
6de087786c
Import and rebase zoning patch
...
Fix some of the whitespace issues
http://www.tt-forums.net/viewtopic.php?p=888801#p888801
9 years ago
36d5b874da
Update project files
9 years ago
b1d8bcfe35
Merge branch 'save_ext' into progsig-sx
...
Conflicts:
source.list
src/saveload/saveload.cpp
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
71012789d2
Update project listings.
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
3ea4eebe9a
(svn r26995) -Fix: Add missing files to source.list
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
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
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
5156c3731b
(svn r26205) -Feature: SSE 4.1 sprite sorter, improving the sorting performance significantly (MJP)
...
For example with GCC 4.8, x86_64 Linux, Intel i5-3337U this patch improves the performance of Pile, Treham and Hamac test save games by about 10% in over-all run time at fast forward at 1920x1080 when zoomed out and when trees are not disabled.
11 years ago
716250728c
(svn r26196) -Fix (r26195): forgot project files
11 years ago
fb281ce23c
(svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher.
11 years ago
f9d371bcd3
(svn r25888) -Codechange: Add a smallstack type.
11 years ago
4248d90937
(svn r25652) -Fix: Improve text caret movement for complex scripts.
11 years ago
c62ee869c8
(svn r25611) -Fix (r25608): Update project files.
11 years ago
c0538388c9
(svn r25465) -Codechange: add the concept of a layouting engine for text
11 years ago
d99113bd00
(svn r25436) -Codechange: split the font detection code out of the font caching code
11 years ago
94baba190e
(svn r25357) -Add: flow mapper for link graph
11 years ago
1cc410f7bb
(svn r25356) -Add: Multi-Commodity-Flow solver for link graph
11 years ago
aa393a8ee9
(svn r25355) -Add: demand handler for link graph
11 years ago
97a9908b0e
(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes
11 years ago
bfd6f2bb85
(svn r25353) -Add: link graph job implementation
11 years ago
e4d3b981e3
(svn r25348) -Add: multimap implementation with guaranteed order between equal keys
11 years ago
7a5cedf078
(svn r25344) -Feature: GUI for viewing story pages
11 years ago
65129db43c
(svn r25342) -Add: StoryPage data structures and GS API
11 years ago
71ce89c1d0
(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)
11 years ago
3f2f1c4df7
(svn r25261) -Add: abstract implementation of linkgraph overlay for GUI (fonsinchen)
11 years ago
6515371cf5
(svn r25258) -Codechange: save linkgraph (fonsinchen)
11 years ago
251bf7ddcb
(svn r25257) -Add: basic link graph (fonsinchen)
11 years ago
4b30ce61c1
(svn r25256) -Add: small matrix type (like vector, but for matrices) (fonsinchen)
11 years ago
79b74a5925
(svn r25010) -Codechange: Add general framework for cargo actions, i.e. loading, transfering, delivering and such, to contain this logic in a single place instead of spread around (fonsinchen)
12 years ago
Jonathan G Rennison
patch-import
frosch
rubidium
michi_cc
zuu
fonsinchen