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
Jonathan G Rennison
6596ba216c
Merge branch 'zoning' into jgrpp
...
Conflicts:
src/table/sprites.h
2015-08-02 18:20:23 +01:00
patch-import
6de087786c
Import and rebase zoning patch
...
Fix some of the whitespace issues
http://www.tt-forums.net/viewtopic.php?p=888801#p888801
2015-08-02 13:17:42 +01:00
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.
2015-08-01 17:06:43 +01:00
frosch
97c76a51d6
(svn r27266) -Fix (r27265): Eddi jinxed it.
2015-05-03 10:30:02 +00:00
frosch
386e2ad14a
(svn r27266) -Fix (r27265): Eddi jinxed it.
2015-05-03 10:30:02 +00:00
frosch
5923cfff4f
(svn r27265) -Fix: Truncated comment in openttd.grf
2015-05-03 10:10:04 +00:00
frosch
65694cf0cd
(svn r27265) -Fix: Truncated comment in openttd.grf
2015-05-03 10:10:04 +00:00
frosch
2edbc72ebd
(svn r27192) -Change: heading for 1.6 now
2015-03-17 20:33:44 +00:00
frosch
6477356dd2
(svn r27192) -Change: heading for 1.6 now
2015-03-17 20:33:44 +00:00
alberth
cd36ff1bfe
(svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news.
2015-02-22 17:25:29 +00:00
alberth
0143f486f2
(svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news.
2015-02-22 17:25:29 +00:00
rubidium
dd40950643
(svn r27103) -Update: copyright date
2015-01-01 20:51:18 +00:00
rubidium
9428d6fb34
(svn r27103) -Update: copyright date
2015-01-01 20:51:18 +00:00
rubidium
f453c166c5
(svn r27041) -Update: ob* translations
2014-10-25 12:35:48 +00:00
rubidium
eb3ffa85ca
(svn r27041) -Update: ob* translations
2014-10-25 12:35:48 +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
0584d36c0b
(svn r26898) -Fix: hopefully make regression under MinGW work again
2014-09-21 17:22:50 +00:00
rubidium
8415a15999
(svn r26898) -Fix: hopefully make regression under MinGW work again
2014-09-21 17:22:50 +00:00
fonsinchen
14604b9215
(svn r26897) -Change: Add some more AIStationList autotests
2014-09-21 16:45:51 +00:00
fonsinchen
d87e20d6f4
(svn r26897) -Change: Add some more AIStationList autotests
2014-09-21 16:45:51 +00:00
fonsinchen
3f2da92ea2
(svn r26896) -Codechange: Move AIStationList* tests to separate test case
2014-09-21 16:44:37 +00:00
fonsinchen
57d758f73e
(svn r26896) -Codechange: Move AIStationList* tests to separate test case
2014-09-21 16:44:37 +00:00
fonsinchen
82baae3eb8
(svn r26895) -Change: Allow for multiple independent test cases for AI API regression
2014-09-21 16:41:03 +00:00
fonsinchen
d92c95b29c
(svn r26895) -Change: Allow for multiple independent test cases for AI API regression
2014-09-21 16:41:03 +00:00
fonsinchen
b6833fc6ef
(svn r26892) -Feature: Script API for retrieving planned flow
2014-09-21 16:20:14 +00:00
fonsinchen
73d273ffd6
(svn r26892) -Feature: Script API for retrieving planned flow
2014-09-21 16:20:14 +00:00
rubidium
6592da4952
(svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111)
2014-09-21 07:57:45 +00:00
rubidium
2361aaf601
(svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111)
2014-09-21 07:57:45 +00:00
fonsinchen
7836470f60
(svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo
2014-05-04 13:57:48 +00:00
fonsinchen
bb269661d4
(svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo
2014-05-04 13:57:48 +00:00
planetmaker
74f666d741
(svn r26456) -Update: Baseset translations.
2014-04-12 11:41:45 +00:00
planetmaker
911e0e80b8
(svn r26456) -Update: Baseset translations.
2014-04-12 11:41:45 +00:00
frosch
d6c9900615
(svn r26410) -Fix: Missing svn properties
2014-03-17 20:28:48 +00:00
frosch
26262e035a
(svn r26410) -Fix: Missing svn properties
2014-03-17 20:28:48 +00:00
frosch
e511805439
(svn r26409) -Update: Version number in some more places.
2014-03-17 20:16:05 +00:00
frosch
8ff9499fe2
(svn r26409) -Update: Version number in some more places.
2014-03-17 20:16:05 +00:00
frosch
f89c387723
(svn r26408) -Update: Baseset translations.
2014-03-17 20:06:16 +00:00
frosch
fa0fdd45c6
(svn r26408) -Update: Baseset translations.
2014-03-17 20:06:16 +00:00
frosch
ba112f104b
(svn r26407) -Fix: __ln__ never read the script compatibility files.
2014-03-17 20:05:38 +00:00
frosch
6baa58a7d8
(svn r26407) -Fix: __ln__ never read the script compatibility files.
2014-03-17 20:05:38 +00:00
frosch
50729655ec
(svn r26406) -Change: heading for 1.5 now
2014-03-17 20:02:30 +00:00
frosch
db96a109ff
(svn r26406) -Change: heading for 1.5 now
2014-03-17 20:02:30 +00:00
frosch
b28e5eb117
(svn r26356) -Update: Baseset translations.
2014-02-19 20:42:33 +00:00
frosch
f7ba7f34f2
(svn r26356) -Update: Baseset translations.
2014-02-19 20:42:33 +00:00
frosch
6b07112326
(svn r26168) -Update: Baseset translations
2013-12-22 11:50:52 +00:00
frosch
b3f08fb67a
(svn r26168) -Update: Baseset translations
2013-12-22 11:50:52 +00:00
frosch
5df3f1ca6d
(svn r26147) -Update: Baseset translations
2013-12-08 14:49:47 +00:00
