864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
7 years ago
bdc775e941
(svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC)
7 years ago
37be4bef67
(svn r27976) -Add [FS#6664]: Climate-specific Action5 extra airport sprites. (PaulC)
7 years ago
9d9e15a747
(svn r27961) -Fix [FS#6654]: The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version. (PaulC)
7 years ago
bd68ed916d
(svn r27915) -Fix (r27730) [FS#6620]: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf.
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
ed63b48e76
(svn r27780) -Update: Numbers
8 years ago
f2af019eb7
(svn r27773) -Update: Baseset translations
8 years ago
c46e51449e
(svn r27745) -Update: Baseset translations
8 years ago
c72f21e410
(svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf
8 years ago
79027cbf9d
(svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf
...
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
orig_extra.grf contains graphics specific to the original baseset only.
8 years ago
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
8 years ago
2c403c8a80
(svn r27619) -Update: Baseset translations
8 years ago
baa11c8b0f
(svn r27559) -Update: baseset translations
9 years ago
4cfa482786
(svn r27541) -Update: Baseset translations
9 years ago
e580d9e623
(svn r27533) -Update: Baseset translations
9 years ago
fbd79d88f0
(svn r27518) -Update: Numbers
9 years ago
265c8d090f
(svn r27496) -Update: Baseset translations
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
97c76a51d6
(svn r27266) -Fix (r27265): Eddi jinxed it.
10 years ago
5923cfff4f
(svn r27265) -Fix: Truncated comment in openttd.grf
10 years ago
2edbc72ebd
(svn r27192) -Change: heading for 1.6 now
10 years ago
cd36ff1bfe
(svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news.
10 years ago
dd40950643
(svn r27103) -Update: copyright date
10 years ago
f453c166c5
(svn r27041) -Update: ob* translations
10 years ago
ff71a8f5c9
(svn r26993) -Feature: Latin translation (Supercheese)
10 years ago
0584d36c0b
(svn r26898) -Fix: hopefully make regression under MinGW work again
10 years ago
14604b9215
(svn r26897) -Change: Add some more AIStationList autotests
10 years ago
3f2da92ea2
(svn r26896) -Codechange: Move AIStationList* tests to separate test case
10 years ago
82baae3eb8
(svn r26895) -Change: Allow for multiple independent test cases for AI API regression
10 years ago
b6833fc6ef
(svn r26892) -Feature: Script API for retrieving planned flow
10 years ago
6592da4952
(svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111)
10 years ago
7836470f60
(svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo
11 years ago
74f666d741
(svn r26456) -Update: Baseset translations.
11 years ago
d6c9900615
(svn r26410) -Fix: Missing svn properties
11 years ago
e511805439
(svn r26409) -Update: Version number in some more places.
11 years ago
f89c387723
(svn r26408) -Update: Baseset translations.
11 years ago
ba112f104b
(svn r26407) -Fix: __ln__ never read the script compatibility files.
11 years ago
50729655ec
(svn r26406) -Change: heading for 1.5 now
11 years ago
b28e5eb117
(svn r26356) -Update: Baseset translations.
11 years ago
6b07112326
(svn r26168) -Update: Baseset translations
11 years ago
5df3f1ca6d
(svn r26147) -Update: Baseset translations
11 years ago
fc3040af02
(svn r25967) -Add: [NoGo] GSTown::TOWN_GROWTH_NORMAL to reset a town growth rate set previously via GSTown::SetGrowthRate.
11 years ago
0d5ab589fe
(svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000)
11 years ago
29c7e59909
(svn r25813) -Update: Baseset translations
11 years ago
736359623b
(svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88).
11 years ago
e15e0057f1
(svn r25728) -Update: Baseset translations
11 years ago
04affb26a9
(svn r25704) -Update: baseset translations
11 years ago
0727c3c76d
(svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one
11 years ago
Jonathan G Rennison
frosch
rubidium
patch-import
alberth
planetmaker
fonsinchen