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
glx22
b28a678436
Fix #7112 , fef8b831a9: incorrect precondition check ( #7127 )
2019-01-28 17:16:19 +01:00
glx
7292591967
Add: generate_widget.vbs to allow script_window.hpp enums generation for users unable to run bash/gawk scripts
2019-01-23 19:44:43 +01:00
glx
636fcc2cc0
Fix: keep the line ending when generating widget enums with bash/gawk on windows
2019-01-23 19:44:43 +01:00
Jonathan G Rennison
7c539267ed
Merge branch 'master' into jgrpp
2019-01-15 18:39:32 +00:00
glx
9f0ad7e269
Fix: BSD find used by OSX requires explicit path
2019-01-14 00:34:52 +00:00
glx
3f28e0cf53
Add: squirrel_export.vbs for users unable to run bash/gawk scripts
2019-01-14 00:34:52 +00:00
glx
8e5a8d3ec3
Cleanup: remove svn references in squirrel_export.sh
2019-01-14 00:34:52 +00:00
glx
2cf9405aa2
Fix: remove manual single file generation in squirrel_export.sh as it's broken
2019-01-14 00:34:52 +00:00
glx
34c438d7ad
Fix: keep line endings when running squirrel_export.sh on windows
2019-01-14 00:34:52 +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
Eddi-z
13056aedbc
Add: Conditional order for max. reliability (patch by Cirdan, #6360 ) ( #7017 )
2019-01-05 22:10:37 +01:00
Jonathan G Rennison
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
2019-01-02 16:09:44 +00:00
Alberth
4a255e879a
Fix #6966 : Only allow switching to a valid company.
2018-12-29 16:15:44 +01:00
Joan Josep
8890926b0d
Fix #6974 : Add save-load filter widget to api
2018-12-27 09:53:55 +01:00
Jonathan G Rennison
ccf13467db
Prevent AIs from creating or adding to rail custom bridge heads
2018-12-19 18:51:15 +00:00
Jonathan G Rennison
2003a86932
Merge remote-tracking branch 'origin/master' into jgrpp
...
# Conflicts:
# src/string.cpp
2018-12-10 18:40:05 +00:00
comicsads
b93fad7481
Fix: Spelling in code comment ( #6984 )
2018-11-28 16:24:01 +01:00
Jonathan G Rennison
06c458cb19
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
2018-11-11 11:27:41 +00:00
Greg-21
4ba73dac95
Doc: Changed several files to unificate them... ( #6964 )
...
...with those from release 1.8 branch.
2018-11-06 00:38:42 +01:00
Jonathan G Rennison
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
2018-11-05 12:53:36 +00:00
Samu
1e68b9b3e6
Add: AI/GS GetMonthlyMaintenanceCost ( #6897 )
...
API addition which allows AI/GS scripts to retrieve the monthly maintenance cost of an airport type.
2018-11-01 18:06:08 +01:00
Oskari Leppäaho
b3b89257f7
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
2018-10-31 19:24:21 +01: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
4566699939
Fix script/AI construction of rail track and waypoints
...
Broken by increase to 64 rail types (bf8d7df736
2018-08-07 23:20:51 +01:00
Jonathan G Rennison
ae15c96c1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_gui.cpp
# src/bridge_map.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/rail_map.h
# src/rail_type.h
# src/road_map.h
# src/saveload/afterload.cpp
# src/saveload/map_sl.cpp
# src/saveload/saveload.cpp
# src/script/api/script_rail.cpp
# src/station_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
2018-07-26 20:54:13 +01:00
Peter Nelson
bf8d7df736
Change: Extend rail types to 64 (6 bit storage)
2018-07-26 13:27:40 +01:00
Jonathan G Rennison
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
2018-07-24 18:30:42 +01:00
J0an Josep
8975318286
Fix 2a868b9f3b: Expose widgets and windows to scripts and fix documentation.
2018-07-23 20:32:18 +02:00
Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
2018-05-03 23:54:51 +01:00
Pavel Stupnikov
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
2018-05-02 21:01:30 +02:00
J0an Josep
cfb8092397
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
2018-04-30 21:52:40 +02:00
Joan Josep
944f785be8
Fix: Spelling errors ( #6769 )
2018-04-30 18:52:32 +02:00
Joan Josep
a6b18f0d92
Fix #6090 : And (svn r27822). Run scripts for widgets. ( #6765 )
...
Fix 19f5a6cbb019d56a33e8#6765 )
2018-04-30 12:25:11 +01:00
Pavel Stupnikov
913119487f
Feature: Add GS method to question a single client ( #6748 )
2018-04-28 17:37:59 +02:00
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
2018-04-27 02:42:20 +01:00
Pavel Stupnikov
8e4bce58ea
Feature: GS methods to scroll viewport for players ( #6745 )
2018-04-24 19:19:00 +02:00
Pavel Stupnikov
6ff81b908e
Feature #6459 : API for querying network clients from GS ( #6736 )
2018-04-22 15:42:29 +02:00
Jonathan G Rennison
78838ee2a2
Add freight train load/unload mode: through load
2018-03-26 20:12:50 +01:00
frosch
09d4735679
(svn r27993) -Change: Heading for 1.9 now
2018-03-14 19:36:41 +00:00
Jonathan G Rennison
4a0d949d83
Merge branch 'master' into jgrpp
2018-01-14 23:22:47 +00:00
frosch
b69c0acca2
(svn r27950) -Merge: Documentation updates from 1.7 branch
2017-12-24 12:18:36 +00:00
frosch
54040bd31a
(svn r27950) -Merge: Documentation updates from 1.7 branch
2017-12-24 12:18:36 +00:00
keldorkatarn
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
2017-09-20 19:11:48 +01:00
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
Jonathan G Rennison
f3dde49ff8
Prevent AIs/scripts from creating road custom bridge heads.
2017-06-22 19:02:46 +01:00
