dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,257 Commits 1 Branch 0 Tags
d4381d06ea4b3fa23688d48337154ca45eb6adb2
Commit Graph

1252 Commits

Author SHA1 Message Date
Peter Nelson
3c047b124e Add: AI functions to get current and last year profit of a group. 2019-03-03 09:15:39 +01:00
Peter Nelson
b62452903a Add: AI functions to set/get vehicle group parent. 2019-03-03 09:15:39 +01:00
Jonathan G Rennison
9b07287303 Add scope info logging to ScriptObject::DoCommand 2019-03-01 18:30:12 +00:00
Niels Martin Hansen
13962a8475 Change: Framerate window can now scroll and resize 2019-02-23 14:29:07 +01:00
Peter Nelson
fde5bd0ccf Change: Add scrollbar to cargo legend in cargo payment rates window. 2019-02-23 11:46:00 +01:00
Greg Carlin
00d28a500d Feature: Add option to adjust font size separately from GUI size. (#7003) 
Adds an option in the "Game Options" next to "Interface Size" called "Font Size". Available options are normal, double, and quad.
 2019-02-23 08:27:46 +00:00
Jonathan G Rennison
36ac643749 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/afrikaans.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/estonian.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/unfinished/persian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/rail_cmd.cpp
#	src/station_cmd.cpp
 2019-02-19 19:36:30 +00:00
Samu
ba55f93f41 Doc: [AI] UnshareOrders empties the orders list of the vehicle. 2019-02-19 15:25:53 +01:00
Jonathan G Rennison
4c8b358ffe Add game setting to allow only non-stop orders for ground vehicles 2019-02-17 19:56:49 +00:00
PeterN
5dc377244d Fix #7224: AI could no longer create groups. (#7233) 2019-02-15 19:15:53 +00:00
Jonathan G Rennison
2fdcc52321 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/lang/dutch.txt
#	src/lang/korean.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/rail.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle.cpp
 2019-02-13 19:09:06 +00:00
glx
70e1c57f81 Fix: line ending issues with MSYS2 2019-02-10 12:44:10 +01:00
Peter Nelson
bfdad9ad1b Fix #7108: Missed generate_widget script run for livery changes. 2019-02-06 21:15:15 +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
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