Jonathan G Rennison
806dbc9e58
Update baseset text strings
6 years ago
Jonathan G Rennison
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
kiwitreekor
f00930fa52
Merge pull request #59 from kiwitreekor
...
Squashed commit of the following:
commit 0497399a03
Author: kiwitreekor <kiwitreekor@gmail.com>
Date: Thu Jun 21 22:10:27 2018 +0900
Update korean.txt
commit c4d60bc9e9
Merge: 27729f1
0ac92b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date: Thu Jun 21 00:10:11 2018 +0900
Merge branch 'jgrpp' into jgrpp
commit 27729f10fc
Author: kiwitreekor <kiwitreekor@gmail.com>
Date: Thu Jun 21 00:02:20 2018 +0900
Update Korean Translation
commit 1e67b51ed8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date: Sat Jan 13 21:33:04 2018 +0900
Add files via upload
commit 9ee0445edd
Author: kiwitreekor <kiwitreekor@gmail.com>
Date: Sat Jan 13 21:30:43 2018 +0900
upload mistake
commit 21bc4d9db1
Author: kiwitreekor <kiwitreekor@gmail.com>
Date: Sat Jan 13 21:27:51 2018 +0900
Fix Mistypo
commit 716b451d8b
Author: kiwitreekor <kiwitreekor@gmail.com>
Date: Sat Jan 13 21:25:15 2018 +0900
Update Korean Translation
6 years ago
Niels Martin Hansen
276192f714
Change #6684 : Cutting point overrides for music base sets
...
This improves bad looping of title screen song from Windows TTD, and fixes
a long silence at the end of "Can't get there from here" from Windows TTD.
6 years ago
Jonathan G Rennison
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
Niels Martin Hansen
921101ed06
Feature: Baseset music for TTD DOS and TTO data
6 years ago
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
Peter Nelson
4d6a5fbec4
Fix: Four group action icons were misplaced and cropped.
7 years ago
frosch
09d4735679
(svn r27993) -Change: Heading for 1.9 now
7 years ago
frosch
8c458c153d
(svn r27990) -Update: Docs
7 years ago
Jonathan G Rennison
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
Jonathan G Rennison
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
7 years ago
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)
7 years ago
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)
7 years ago
frosch
8f3dbd2efc
(svn r27976) -Add [FS#6664]: Climate-specific Action5 extra airport sprites. (PaulC)
7 years ago
frosch
37be4bef67
(svn r27976) -Add [FS#6664]: Climate-specific Action5 extra airport sprites. (PaulC)
7 years ago
Jonathan G Rennison
4a0d949d83
Merge branch 'master' into jgrpp
7 years ago
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)
7 years ago
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)
7 years ago
Jonathan G Rennison
a93cc441a9
Merge branch 'cpp-11' into jgrpp
7 years ago
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.
7 years ago
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.
7 years ago
Jonathan G Rennison
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
Jonathan G Rennison
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
8 years ago
frosch
ed63b48e76
(svn r27780) -Update: Numbers
8 years ago
frosch
afcef7faa6
(svn r27780) -Update: Numbers
8 years ago
frosch
f2af019eb7
(svn r27773) -Update: Baseset translations
8 years ago
frosch
9184b32978
(svn r27773) -Update: Baseset translations
8 years ago
Jonathan G Rennison
bdc5820836
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/road_cmd.cpp
8 years ago
frosch
c46e51449e
(svn r27745) -Update: Baseset translations
8 years ago
frosch
7d6d3897db
(svn r27745) -Update: Baseset translations
8 years ago
Jonathan G Rennison
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
8 years ago
frosch
c72f21e410
(svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf
8 years ago
frosch
08b4255b67
(svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf
8 years ago
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.
8 years ago
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.
8 years ago
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
8 years ago
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
8 years ago
frosch
2c403c8a80
(svn r27619) -Update: Baseset translations
8 years ago
frosch
7a180dbb4e
(svn r27619) -Update: Baseset translations
8 years ago
Jonathan G Rennison
4c0423d6d8
Merge branch 'master' into jgrpp
9 years ago
rubidium
baa11c8b0f
(svn r27559) -Update: baseset translations
9 years ago
rubidium
668fb3f658
(svn r27559) -Update: baseset translations
9 years ago
Jonathan G Rennison
3da991bf9b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/rail_gui.cpp
9 years ago
frosch
4cfa482786
(svn r27541) -Update: Baseset translations
9 years ago
frosch
208d83f9d3
(svn r27541) -Update: Baseset translations
9 years ago
frosch
e580d9e623
(svn r27533) -Update: Baseset translations
9 years ago
frosch
5931616e71
(svn r27533) -Update: Baseset translations
9 years ago
Jonathan G Rennison
57cbecb0e0
Merge branch 'master' into jgrpp
9 years ago
frosch
fbd79d88f0
(svn r27518) -Update: Numbers
9 years ago