Commit Graph

557 Commits (ee15a172b5f54d3ab9356efaeb230327fe692f8f)

Author SHA1 Message Date
Jonathan G Rennison 88c150abf7 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
9 years ago
michi_cc f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 037cce3b38 Merge branch 'save_ext' into infrastructure_sharing-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison 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
patch-import ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 174779e371 Merge branch 'save_ext' into enhanced_viewport_overlay-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison 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
patch-import 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
Jonathan G Rennison bc8b2d9826 Merge branch 'save_ext' into tracerestrict-sx 9 years ago
Jonathan G Rennison 6452b0fe02 Merge branch 'departure-boards-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
9 years ago
Jonathan G Rennison 6596ba216c Merge branch 'zoning' into jgrpp
Conflicts:
	src/table/sprites.h
9 years ago
Jonathan G Rennison 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
Jonathan G Rennison de76316634 Merge branch 'tracerestrict-sx' into jgrpp 9 years ago
patch-import 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
Jonathan G Rennison 00f9f75d34 Merge branch 'save_ext' into departure-boards-sx 9 years ago
Jonathan G Rennison 526cb42608 Merge branch 'master' into depature-boards
Conflicts:
	src/table/strgen_tables.h
9 years ago
patch-import 79138de1b9 Import departure boards patch 9 years ago
Jonathan G Rennison 36d5b874da Update project files 9 years ago
Jonathan G Rennison b1d8bcfe35 Merge branch 'save_ext' into progsig-sx
Conflicts:
	source.list
	src/saveload/saveload.cpp
9 years ago
patch-import 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
Jonathan G Rennison 71012789d2 Update project listings. 9 years ago
frosch 67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 9 years ago
frosch 4b39e3d98c (svn r27152) -Fix: Generated files. 10 years ago
frosch 3ea4eebe9a (svn r26995) -Fix: Add missing files to source.list 10 years ago
planetmaker ff71a8f5c9 (svn r26993) -Feature: Latin translation (Supercheese) 10 years ago
rubidium 8ab4f746f2 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 10 years ago
rubidium 6a1ed21342 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 10 years ago
michi_cc 7f9e7b1a08 (svn r26654) -Fix (r26482): Header file missing from sources.list. 10 years ago
michi_cc 616da05c3e (svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build. 11 years ago
zuu ea7483a419 (svn r26305) -Add: [nogo] ScriptStoryPageElementList() - a list of all story page elements for a given page 11 years ago
zuu a6e0f162ed (svn r26303) -Add: [nogo] ScriptStoryPageList() - a list of all story pages 11 years ago
rubidium 4585f74faa (svn r26258) -Codechange: deduplicate Draw methods (MJP) 11 years ago
rubidium 3df799c1c6 (svn r26257) -Codechange: replace most of the SSE macros by functions 11 years ago
zuu 1672714d0f (svn r26227) -Fix: [Windows] generate.vbs didn't include SSE source files 11 years ago
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.
11 years ago
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
11 years ago
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
11 years ago
rubidium 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
rubidium 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
rubidium 716250728c (svn r26196) -Fix (r26195): forgot project files 11 years ago
rubidium bfd72d7a89 (svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP) 11 years ago
fonsinchen fb281ce23c (svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher. 11 years ago
fonsinchen f9d371bcd3 (svn r25888) -Codechange: Add a smallstack type. 11 years ago
michi_cc 1880c36405 (svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system. 11 years ago
michi_cc 4248d90937 (svn r25652) -Fix: Improve text caret movement for complex scripts. 11 years ago
michi_cc c62ee869c8 (svn r25611) -Fix (r25608): Update project files. 11 years ago
rubidium 672ccbfde5 (svn r25470) -Feature-ish: use ICU's layout engine when that's available 11 years ago
rubidium c0538388c9 (svn r25465) -Codechange: add the concept of a layouting engine for text 11 years ago
rubidium d99113bd00 (svn r25436) -Codechange: split the font detection code out of the font caching code 11 years ago
rubidium d230f22d1c (svn r25404) -Feature: Thai 11 years ago
fonsinchen 94baba190e (svn r25357) -Add: flow mapper for link graph 11 years ago
fonsinchen 1cc410f7bb (svn r25356) -Add: Multi-Commodity-Flow solver for link graph 11 years ago
fonsinchen aa393a8ee9 (svn r25355) -Add: demand handler for link graph 11 years ago
fonsinchen 97a9908b0e (svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes 11 years ago
fonsinchen bfd6f2bb85 (svn r25353) -Add: link graph job implementation 11 years ago
fonsinchen e4d3b981e3 (svn r25348) -Add: multimap implementation with guaranteed order between equal keys 11 years ago
zuu 7a5cedf078 (svn r25344) -Feature: GUI for viewing story pages 11 years ago
zuu 65129db43c (svn r25342) -Add: StoryPage data structures and GS API 11 years ago
frosch b172ed3578 (svn r25291) -Add: WindowDesc ability to load and store information in a config file. 12 years ago
rubidium 71ce89c1d0 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 12 years ago
rubidium 3f2f1c4df7 (svn r25261) -Add: abstract implementation of linkgraph overlay for GUI (fonsinchen) 12 years ago
rubidium 6515371cf5 (svn r25258) -Codechange: save linkgraph (fonsinchen) 12 years ago
rubidium 251bf7ddcb (svn r25257) -Add: basic link graph (fonsinchen) 12 years ago
rubidium 4b30ce61c1 (svn r25256) -Add: small matrix type (like vector, but for matrices) (fonsinchen) 12 years ago
rubidium 079423116f (svn r25198) -Feature: Gaelic (Scottish) translation 12 years ago
rubidium f0fd6a008a (svn r25176) -Feature: Faroese translation 12 years ago
rubidium 76c11caf03 (svn r25015) -Change: Tamil migrated to 'finished' status 12 years ago
rubidium 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
peter1138 1a4492c656 (svn r24868) -Fix (r24797): Update VS projects to include Basque translation. 12 years ago
glx eda22e0595 (svn r24826) -Fix: determineversion.vbs could hang in a git checkout 12 years ago
frosch 2a875a1907 (svn r24442) -Codechange: Split some members of Vehicle into a new class BaseConsist. 12 years ago
alberth f9fd070c03 (svn r24408) -Fix (r24406): Forgot to add the new files to the Studio build list. 12 years ago
alberth 4ae69a088d (svn r24405) -Add: Save and load of active cargo monitors. 12 years ago
alberth a7158589f3 (svn r24404) -Add: Data structures for cargo transport monitoring. 12 years ago
frosch 56383c577a (svn r24337) -Feature: Allow filtering for multiple words (separated by whitespace resp. quoted) in the sign list, content- and NewGRF-guis. 13 years ago
frosch 755b52dcc0 (svn r24323) -Codechange: Split Textbuf and associated functions to separate files. 13 years ago
frosch 70d3206320 (svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h 13 years ago
rubidium 6256d64553 (svn r23932) -Codechange: split the NewGRF text window into its own source files 13 years ago
michi_cc ac1919408d (svn r23898) -Remove: PNG sprite loader. 13 years ago
rubidium e40e1325d6 (svn r23730) -Add: Australian translation 13 years ago
truebrain 8faa8f2342 (svn r23648) -Revert (r23646): partial revert; nobody has to know about my local changes and attempts 13 years ago
truebrain 190a68b350 (svn r23646) -Fix [FS#4901]: rescan the Game Scripts when done downloading one. 13 years ago
truebrain 8bff646cf2 (svn r23635) -Add: introduce GSText, to allow translating GameScript text, even over network 13 years ago
truebrain f1f0776efd (svn r23634) -Add: support language files for GameScript (Rubidium) 13 years ago
truebrain 95b199e313 (svn r23632) -Add: GSCompanyMode, to change company in GameScripts 13 years ago
truebrain 867b263900 (svn r23631) -Add: ScriptWindow, to manipulate windows on the client (GameScript only) 13 years ago
truebrain ccf9b01f5d (svn r23630) -Add: a Goal GUI to show your current goals 13 years ago
truebrain 09ef12ab03 (svn r23627) -Add: ScriptNews::Create, to create custom news messages (GameScript only) 13 years ago
truebrain 1367fc9deb (svn r23625) -Add: ScriptViewport::ScrollTo, for SinglePlayer only (GameScript only) 13 years ago
truebrain 1d84fb277e (svn r23623) -Add: allow bi-directional communication with the AdminPort and GameScript 13 years ago
truebrain 3a799f1145 (svn r23618) -Add: ScriptGame::Pause, ScriptGame::Unpause, and ScriptGame::GetLandscape (GameScript only) 13 years ago
truebrain e3a518f9b1 (svn r23610) -Add: Doxygen files for NoGo API (Yexo) 13 years ago
truebrain 5d4b2519a4 (svn r23609) -Add: save/load all GameScript related material 13 years ago
truebrain 17fea560ba (svn r23606) -Add: GameScanner, to auto-detect game scripts, and wire it in the console 13 years ago
truebrain f66f27d249 (svn r23604) -Add: initial support for GameScripts 13 years ago
rubidium 0a1135818a (svn r23577) -Fix (r23576): strgen project files aren't automatically updated :( 13 years ago
truebrain 49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago