dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,208 Commits 1 Branch 0 Tags
6e3b3c04dea2670c6c41fbc17e44fcf3b019c51a
Commit Graph

22208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
6e3b3c04de Enhanced viewports: Fix bug in previous fix for aqueducts in viewport map mode. 
Tile type tests were being performed on the wrong tile index.
This fixes commit 5540374227.
 2015-09-18 22:12:58 +01:00
Jonathan G Rennison
388dab7390 Merge branch 'master' into enhanced_viewport_overlay 
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
 2015-08-11 21:41:41 +01:00
michi_cc
f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 2015-08-10 20:36:57 +00:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
michi_cc
0cd198c798 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 2015-08-10 20:21:29 +00:00
frosch
63aa9f4ea8 (svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode. 2015-08-10 20:04:31 +00:00
alberth
438d7a26cc (svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum. 2015-08-10 10:04:14 +00:00
rubidium
eb4b6a08d0 (svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal 2015-08-09 13:54:17 +00:00
rubidium
cc5b8ea6cb (svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config 2015-08-09 12:43:52 +00:00
rubidium
2011c24502 (svn r27375) -Fix-ish: update help parameter for png configuration (it has used pkg-config for a long time) 2015-08-09 12:42:52 +00:00
rubidium
36f77b1aa7 (svn r27374) -Codechange: make zlib detection and configuration make use of pkg-config 2015-08-09 12:42:21 +00:00
rubidium
c3715a025d (svn r27373) -Codechange: make sdl detection and configuration use pkg-config 2015-08-09 12:41:54 +00:00
rubidium
f05d71a9a6 (svn r27372) -Codechange: make allegro detection and configuration use pkg-config 2015-08-09 12:41:35 +00:00
rubidium
f179a92007 (svn r27371) -Codechange: make freetype detection and configuration use pkg-config 2015-08-09 12:41:12 +00:00
rubidium
2aee2899e8 (svn r27370) -Codechange: move the "dedicated server" check into the pkg-config check routine 2015-08-09 12:40:17 +00:00
rubidium
a08d1a044f (svn r27369) -Cleanup: there's no need to do dependency checking of libraries in OpenTTD; zlib should always be installed if libpng is because it links to zlib 2015-08-09 12:39:26 +00:00
rubidium
625bc2e0e7 (svn r27368) -Cleanup: undo the special case of OSX; it works fine without it 2015-08-09 12:37:20 +00:00
rubidium
ee700fd3b1 (svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n) 2015-08-09 12:33:27 +00:00
frosch
9f72662ecc (svn r27366) -Fix [FS#6358]: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font. 2015-08-09 10:22:51 +00:00
frosch
c9120cd714 (svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines. 2015-08-09 10:21:06 +00:00
translators
a9200aa69a (svn r27364) -Update from WebTranslator v3.0: 
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
 2015-08-08 17:45:27 +00:00
alberth
894f69e1fd (svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs. 2015-08-08 13:19:38 +00:00
alberth
48485a6a5a (svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods. 2015-08-08 10:06:24 +00:00
rubidium
bc199a4fe1 (svn r27361) -Fix-ish: when attempting to find a host, try gcc/g++ but also CC/CXX appended to the host triple. This to make cross compilation with clang alone easier 2015-08-08 08:54:49 +00:00
rubidium
501ee2105a (svn r27360) -Feature: allow configuring pkg-config in one go for all libraries 2015-08-08 08:52:21 +00:00
Jonathan G Rennison
5540374227 Enhanced viewports: Fix crash when looking at aqueducts in viewport map mode. 
Don't use water tile accessors on aqueduct bridge heads.
 2015-08-07 21:30:33 +01:00
translators
f95759139b (svn r27359) -Update from WebTranslator v3.0: 
swedish - 1 changes by planetmaker
 2015-08-07 17:45:12 +00:00
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
 2015-08-05 21:25:13 +01:00
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
 2015-08-05 21:24:30 +01:00
translators
163c30570b (svn r27358) -Update from WebTranslator v3.0: 
catalan - 25 changes by juanjo
 2015-08-02 17:45:14 +00:00
translators
e6782df9ba (svn r27357) -Update from WebTranslator v3.0: 
catalan - 181 changes by juanjo
 2015-08-01 17:45:15 +00:00
frosch
4eb6ce863a (svn r27354) -Fix (r27343): Actually make it work. (rubidium) 2015-07-31 21:43:40 +00:00
translators
66418db43e (svn r27352) -Update from WebTranslator v3.0: 
catalan - 134 changes by juanjo
 2015-07-31 17:45:18 +00:00
translators
18e7b67864 (svn r27347) -Update from WebTranslator v3.0: 
slovenian - 15 changes by matej1245
 2015-07-30 17:45:14 +00:00
alberth
67366cf03d (svn r27346) -Feature: Make the object placement gui an independent window. 2015-07-28 18:20:54 +00:00
alberth
e36a82c3e6 (svn r27345) -Fix-ish: Hide selected view if no object selected. 2015-07-28 18:18:59 +00:00
alberth
b1f1647303 (svn r27344) -Doc: Documenting the (Re)setObjectToPlace functions. 2015-07-28 08:16:52 +00:00
frosch
13a726b18f (svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side. 2015-07-26 12:28:34 +00:00
frosch
730c2177bf (svn r27342) -Add: Optionally return the number of sprites in the spriteset from GetCustomRailSprite. 2015-07-26 12:25:37 +00:00
frosch
bd50600f5b (svn r27341) -Fix [FS#6332]: Do not rerandomise the town name when only cost-estimating the founding. 2015-07-26 09:56:43 +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
translators
932aaa8cb5 (svn r27339) -Update from WebTranslator v3.0: 
frisian - 42 changes by BAJansen
 2015-07-25 17:45:15 +00:00
translators
55c177c26d (svn r27338) -Update from WebTranslator v3.0: 
frisian - 8 changes by BAJansen
 2015-07-24 17:45:18 +00:00
translators
f6a3faf927 (svn r27337) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by Gavin
 2015-07-21 17:45:18 +00:00
translators
28f9637aed (svn r27336) -Update from WebTranslator v3.0: 
greek - 36 changes by Jubilee
 2015-07-17 17:45:14 +00:00
translators
28e885dd51 (svn r27335) -Update from WebTranslator v3.0: 
greek - 24 changes by Jubilee
 2015-07-16 17:45:15 +00:00
frosch
80df194341 (svn r27334) -Revert (r27232) [FS#6342]: No idea what the plan was, but making the main noise coefficients the same for all smoothness types certainly wasn't. 2015-07-16 17:05:40 +00:00
translators
99ed8df797 (svn r27333) -Update from WebTranslator v3.0: 
greek - 7 changes by Jubilee
 2015-07-13 17:45:17 +00:00
frosch
86825a745c (svn r27332) -Change: Enable YAPF cache debugging with desync debug level 2. 2015-07-12 17:06:02 +00:00
frosch
2af1fa921a (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 2015-07-11 11:18:24 +00:00