Jonathan G Rennison
4c0423d6d8
Merge branch 'master' into jgrpp
2016-05-13 00:25:10 +01:00
rubidium
baa11c8b0f
(svn r27559) -Update: baseset translations
2016-05-11 18:42:32 +00:00
Jonathan G Rennison
3da991bf9b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/rail_gui.cpp
2016-04-19 22:48:33 +01:00
frosch
4cfa482786
(svn r27541) -Update: Baseset translations
2016-04-17 16:30:45 +00:00
frosch
e580d9e623
(svn r27533) -Update: Baseset translations
2016-04-02 15:59:14 +00:00
Jonathan G Rennison
57cbecb0e0
Merge branch 'master' into jgrpp
2016-03-02 21:44:58 +00:00
frosch
fbd79d88f0
(svn r27518) -Update: Numbers
2016-03-01 20:00:22 +00:00
Jonathan G Rennison
cbf1ece361
Merge branch 'group_collapse' into jgrpp
2016-01-19 21:16:25 +00:00
frosch
265c8d090f
(svn r27496) -Update: Baseset translations
2016-01-13 21:33:40 +00:00
Jonathan G Rennison
f2d0c3a441
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/gfxinit.cpp
src/rail_cmd.cpp
src/table/sprites.h
2015-08-20 00:39:26 +01:00
Jonathan G Rennison
8faead7e7a
Graphically indicate restricted signals by recolouring the signal post.
...
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
2015-08-19 21:56:22 +01:00
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
2015-08-05 21:54:11 +01: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
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
5923cfff4f
(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
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
rubidium
dd40950643
(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
planetmaker
ff71a8f5c9
(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
fonsinchen
14604b9215
(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
82baae3eb8
(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
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
fonsinchen
7836470f60
(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
frosch
d6c9900615
(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
f89c387723
(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
50729655ec
(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
6b07112326
(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
frosch
fc3040af02
(svn r25967) -Add: [NoGo] GSTown::TOWN_GROWTH_NORMAL to reset a town growth rate set previously via GSTown::SetGrowthRate.
2013-11-12 17:56:35 +00:00
frosch
0d5ab589fe
(svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000)
2013-10-27 15:09:41 +00:00
frosch
29c7e59909
(svn r25813) -Update: Baseset translations
2013-10-06 10:14:19 +00:00
alberth
736359623b
(svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88).
2013-10-01 20:16:44 +00:00
frosch
e15e0057f1
(svn r25728) -Update: Baseset translations
2013-08-18 15:34:00 +00:00
rubidium
04affb26a9
(svn r25704) -Update: baseset translations
2013-08-09 18:30:33 +00:00
planetmaker
0727c3c76d
(svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one
2013-07-30 22:03:36 +00:00
rubidium
8e9618b125
(svn r25629) -Update: baseset translations
2013-07-27 14:45:09 +00:00
rubidium
d4f2bcc545
(svn r25581) -Fix: WT3 validation
2013-07-10 17:46:54 +00:00
rubidium
8ba0735ff3
(svn r25522) -Update: baseset descriptions
2013-06-29 17:50:59 +00:00
