Jonathan G Rennison
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
2019-03-30 20:45:58 +00:00
PeterN
7fb77ff35a
Fix: Incorrect display of industry production around tiles. ( #7426 )
...
Display of industry production around tiles (as shown when placing a station)
did not take account of the station catchment changes, so still showed production
from an industry even if it was not covered by a tile.
This is fixed by making a set of nearby industries that are covered, instead of
looping over all possible industries.
2019-03-27 23:10:02 +00:00
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2019-03-27 18:12:04 +00:00
glx
f8e6cd10ef
Add: script API functions for build with refit feature
2019-03-24 15:28:48 +00:00
Jonathan G Rennison
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
2019-03-04 01:18:25 +00:00
frosch
a67ee02529
Change: Heading for 1.10 now ( #7319 )
2019-03-03 20:51:57 +01:00
Peter Nelson
5a5944867d
Add: Add parent_group_id parameter to CreateGroup()
2019-03-03 09:15:39 +01:00
Jonathan G Rennison
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
2019-02-02 01:27:56 +00:00
SamuXarick
1e5a6765d9
Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type ( #6988 )
2019-01-31 23:08:03 +00:00
Jonathan G Rennison
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
2019-01-31 18:19:45 +00:00
PeterN
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
2019-01-31 14:57:44 +01:00
Jonathan G Rennison
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
2019-01-29 02:28:14 +00:00
Peter Nelson
1334cfb3e5
Change: Always build baseset metadata, instead of including it in the repo.
...
This adds a script and project files to generate these files within MSVC.
2019-01-25 22:28:39 +00:00
Jonathan G Rennison
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
2019-01-14 00:01:44 +00:00
glx22
efc44466d6
Fix: make -k switch useful when testing regression ( #7053 )
2019-01-13 07:40:54 +00:00
Jonathan G Rennison
0e7519f33e
Merge branch 'more_cond_orders-sx' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
2019-01-06 22:35:57 +00:00
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 0497399a03c4d60bc9e927729f10ac92b827729f10fc1e67b51ed89ee0445edd21bc4d9db1716b451d8b
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
