dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,426 Commits 1 Branch 0 Tags
cyka
Commit Graph

624 Commits

Author SHA1 Message Date
glx
7b5e7aa14f Add: [Win32] regression test script 2019-01-05 18:10:14 +01:00
Jonathan G Rennison
d39b511500 Update baseset files 2019-01-02 16:58:25 +00:00
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
 2018-10-29 18:33:15 +00:00
Johannes E. Krause
662dcc3c31 Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation 2018-09-30 20:45:41 +02:00
Jonathan G Rennison
a37e30dfd0 Merge branch 'master' into jgrpp 2018-08-29 02:26:16 +01:00
Jonathan G Rennison
df92a056df Fix #6875: Depot building cost does not include foundation build cost (#6883) 2018-08-14 22:05:47 +02:00
Jonathan G Rennison
d839526365 Fix bf8d7df: Script/AI construction of rail track and waypoints (#6881) 2018-08-12 09:45:38 +02:00
Jonathan G Rennison
df7177876c Update baseset files 2018-07-26 20:37:20 +01:00
Jonathan G Rennison
806dbc9e58 Update baseset text strings 2018-07-05 01:11:57 +01:00
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
 2018-06-25 18:57:48 +01:00
kiwitreekor
f00930fa52 Merge pull request #59 from kiwitreekor 
Squashed commit of the following:

commit 0497399a03f7279d47d67879516613105dd64f92
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 22:10:27 2018 +0900

    Update korean.txt

commit c4d60bc9e9db9543df68799d72cb903323a4ef37
Merge: 27729f1 0ac92b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:10:11 2018 +0900

    Merge branch 'jgrpp' into jgrpp

commit 27729f10fc82bea86bfe790998c95a780bfe3d9e
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:02:20 2018 +0900

    Update Korean Translation

commit 1e67b51ed818f241acd28cdd1f5104d7839cb1f0
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:33:04 2018 +0900

    Add files via upload

commit 9ee0445edd2f44ab8c885114ad1f49c8d20506b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:30:43 2018 +0900

    upload mistake

commit 21bc4d9db104b151e90648855c2ca6b45df80097
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:27:51 2018 +0900

    Fix Mistypo

commit 716b451d8b32bcfa8a051637fe41ed809a8989b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:25:15 2018 +0900

    Update Korean Translation
 2018-06-21 20:56:56 +01:00
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.
 2018-06-15 23:09:17 +02:00
Jonathan G Rennison
8e9d68048a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-06-07 06:49:18 +01:00
Niels Martin Hansen
921101ed06 Feature: Baseset music for TTD DOS and TTO data 2018-06-05 22:58:35 +02:00
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