Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
2018-04-27 02:42:20 +01:00
Peter Nelson
4d6a5fbec4
Fix: Four group action icons were misplaced and cropped.
2018-04-17 19:05:35 +02:00
frosch
09d4735679
(svn r27993) -Change: Heading for 1.9 now
2018-03-14 19:36:41 +00:00
frosch
8c458c153d
(svn r27990) -Update: Docs
2018-03-14 18:05:06 +00:00
Jonathan G Rennison
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
2018-03-11 22:21:39 +00:00
Jonathan G Rennison
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
2018-03-11 22:16:19 +00:00
frosch
6eac63622e
(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)
2018-03-11 12:03:17 +00:00
frosch
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)
2018-03-11 12:03:17 +00:00
frosch
8f3dbd2efc
(svn r27976) -Add [FS#6664]: Climate-specific Action5 extra airport sprites. (PaulC)
2018-03-11 11:43:32 +00:00
frosch
37be4bef67
(svn r27976) -Add [FS#6664]: Climate-specific Action5 extra airport sprites. (PaulC)
2018-03-11 11:43:32 +00:00
Jonathan G Rennison
4a0d949d83
Merge branch 'master' into jgrpp
2018-01-14 23:22:47 +00:00
frosch
09f41da863
(svn r27961) -Fix [FS#6654]: The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version. (PaulC)
2018-01-07 14:21:09 +00:00
frosch
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)
2018-01-07 14:21:09 +00:00
Jonathan G Rennison
a93cc441a9
Merge branch 'cpp-11' into jgrpp
2017-10-05 18:20:54 +01:00
frosch
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.
2017-09-11 18:31:32 +00:00
frosch
96b1ac9d09
(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.
2017-09-11 18:31:32 +00:00
Jonathan G Rennison
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
2017-09-04 01:04:04 +01:00
Jonathan G Rennison
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
2017-03-12 20:37:26 +00:00
frosch
ed63b48e76
(svn r27780) -Update: Numbers
2017-03-11 20:50:26 +00:00
frosch
afcef7faa6
(svn r27780) -Update: Numbers
2017-03-11 20:50:26 +00:00
frosch
f2af019eb7
(svn r27773) -Update: Baseset translations
2017-03-11 12:20:50 +00:00
frosch
9184b32978
(svn r27773) -Update: Baseset translations
2017-03-11 12:20:50 +00:00
Jonathan G Rennison
bdc5820836
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/road_cmd.cpp
2017-02-22 21:13:04 +00:00
frosch
c46e51449e
(svn r27745) -Update: Baseset translations
2017-02-12 12:01:03 +00:00
frosch
7d6d3897db
(svn r27745) -Update: Baseset translations
2017-02-12 12:01:03 +00:00
Jonathan G Rennison
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
2017-01-17 19:11:09 +00:00
frosch
c72f21e410
(svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf
2017-01-14 18:00:02 +00:00
frosch
08b4255b67
(svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf
2017-01-14 18:00:02 +00:00
frosch
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.
2017-01-14 15:48:19 +00:00
frosch
1aedadb49b
(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.
2017-01-14 15:48:19 +00:00
Jonathan G Rennison
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
2016-09-10 00:57:05 +01:00
Jonathan G Rennison
7b56097f50
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# src/linkgraph/demands.cpp
# src/linkgraph/mcf.cpp
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/smallmap_gui.cpp
2016-07-24 10:16:55 +01:00
frosch
2c403c8a80
(svn r27619) -Update: Baseset translations
2016-07-22 21:25:37 +00:00
frosch
7a180dbb4e
(svn r27619) -Update: Baseset translations
2016-07-22 21:25:37 +00:00
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
rubidium
668fb3f658
(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
208d83f9d3
(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
frosch
5931616e71
(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
frosch
0c7c0ada78
(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
frosch
00ce319efa
(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
