Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-10-31 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,927 Commits 12 Branches 178 Tags 449 MiB
0ba9d9bb18
Commit Graph

153 Commits

Author SHA1 Message Date
Jonathan G Rennison
828d2146eb Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/ai/ai_info.cpp
#	src/company_base.h
#	src/economy.cpp
#	src/game/game_info.cpp
#	src/gfx_type.h
#	src/linkgraph/linkgraph_gui.cpp
#	src/palette.cpp
#	src/palette_func.h
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
#	src/window.cpp
#	src/window_func.h
 2024-02-26 18:19:34 +00:00
Rubidium
a4d4301a0c Codechange: We are heading to 15 2024-02-18 21:48:54 +01:00
Jonathan G Rennison
24b744f7c8 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/saveload/saveload.h
 2023-01-02 01:23:36 +00:00
Michael Lutz
150f05dc15
Change: Heading for 14 now. (#10302) 2023-01-01 22:52:23 +01:00
Jonathan G Rennison
0a9c44d1a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_anim_sse4.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/newgrf_object.h
#	src/road_gui.cpp
#	src/widgets/road_widget.h
#	src/window.cpp
 2022-10-16 20:14:13 +01:00
SamuXarick
3dda8c9bad Fix: ScriptRoad::HasRoadType really check for RoadType 
Script::HasRoadType was only checking if the tile had the same RoadTramType as that of the RoadType provided.
Now it really checks RoadType against RoadType.
 2022-10-16 18:27:23 +02:00
Jonathan G Rennison
9e946d4c5d Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
 2021-11-03 00:45:12 +00:00
Jonathan G Rennison
faf32200cf Merge tag '12.0-beta1' into jgrpp-beta 
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
 2021-11-02 17:51:38 +00:00
Patric Stout
394c749b6b
Change: Heading for 13 now (#9573) 2021-09-25 13:48:03 +02:00
Patric Stout
eca73a810c Change: rebrand 1.12.0 to 12.0 
One question that keeps popping up: "when do we release 2.0?".
NewGRF will force that at least 1.16 will be 2.0, but to not wait
for this, let's drop the "1." and be for ever done with that
conversation.

We are following in the footstep of giants here.
 2021-08-15 12:28:51 +02:00
Loïc Guilloux
799eb31ff1
Change: [CMake] Copy AI/GS compatibility files to build dir (#8906) 2021-04-02 10:15:45 +02:00
Patric Stout
9bfa7198fd
Change: Heading for 1.12 now (#8862) 2021-03-14 20:47:31 +01:00
Patric Stout
203a77c1dc Codechange: move regression outside of bin and make it work via CMake script 
The tst_stationlist savegame had to be changed to start the correct
AI. In the old setup, all regression AIs had the same name, which
made it impossible to run both regressions in parallel. With the new
setup this is possible.

Although all files are available to run the regression, it won't
really work till CMake is introduced (which will happen in a few
commits from here)
 2020-06-05 19:36:05 +02:00
Charles Pigott
5c19668fdb Doc: [Script] Add a note about how wagon connectivity works for scripts 2020-02-19 11:26:58 +01:00
glx
2f264f2c92 Change: Heading for 1.11 now 2020-02-08 23:38:49 +01:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
PeterN
3bbd7ea2c1
Fix: Industry coverage area is no longer rectangular. (#7464) 
AIs test station catchment in reverse to how players see station catchment.
This did not take account of non-rectangular station catchment areas, so AIs
could end up placing stations in locations that did not accept/deliver cargo.
 2019-04-13 14:27:57 +01: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
glx
f8e6cd10ef Add: script API functions for build with refit feature 2019-03-24 15:28:48 +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
SamuXarick
1e5a6765d9 Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988) 2019-01-31 23:08:03 +00:00
glx22
efc44466d6 Fix: make -k switch useful when testing regression (#7053) 2019-01-13 07:40:54 +00:00
glx
7b5e7aa14f Add: [Win32] regression test script 2019-01-05 18:10:14 +01: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
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
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
frosch
afcef7faa6 (svn r27780) -Update: Numbers 2017-03-11 20:50:26 +00:00
frosch
0c7c0ada78 (svn r27518) -Update: Numbers 2016-03-01 20:00:22 +00:00
frosch
6477356dd2 (svn r27192) -Change: heading for 1.6 now 2015-03-17 20:33:44 +00:00
rubidium
8415a15999 (svn r26898) -Fix: hopefully make regression under MinGW work again 2014-09-21 17:22:50 +00:00
fonsinchen
d87e20d6f4 (svn r26897) -Change: Add some more AIStationList autotests 2014-09-21 16:45:51 +00:00
fonsinchen
57d758f73e (svn r26896) -Codechange: Move AIStationList* tests to separate test case 2014-09-21 16:44:37 +00:00
fonsinchen
d92c95b29c (svn r26895) -Change: Allow for multiple independent test cases for AI API regression 2014-09-21 16:41:03 +00:00
fonsinchen
73d273ffd6 (svn r26892) -Feature: Script API for retrieving planned flow 2014-09-21 16:20:14 +00:00
fonsinchen
bb269661d4 (svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo 2014-05-04 13:57:48 +00:00
frosch
26262e035a (svn r26410) -Fix: Missing svn properties 2014-03-17 20:28:48 +00:00
frosch
8ff9499fe2 (svn r26409) -Update: Version number in some more places. 2014-03-17 20:16:05 +00:00
frosch
6baa58a7d8 (svn r26407) -Fix: __ln__ never read the script compatibility files. 2014-03-17 20:05:38 +00:00
frosch
db96a109ff (svn r26406) -Change: heading for 1.5 now 2014-03-17 20:02:30 +00:00
rubidium
43a9cfcaa4 (svn r25491) -Fix: ofcourse... doing something with Random messes with the regression result... 2013-06-27 20:30:22 +00:00
rubidium
bfdc7fe558 (svn r25392) -Fix (r25390): update regression to account for the compatability settings 2013-06-11 05:04:49 +00:00
rubidium
7a3d549f2f (svn r25150) -Fix [FS#5514]: [Script] The was no way to differentiate between a cargo-station combination with or without rating, so introduce [AI|GS]Station::HasRating and let GetRating return -1 when there is no rating 2013-04-06 12:36:33 +00:00
rubidium
7e12c449f1 (svn r25144) -Fix (r25143): one of the changes strings was used in the regression test, which subsequently failed 2013-04-04 20:15:51 +00:00
rubidium
7ff6598cd2 (svn r25001) -Change: heading for 1.4 now 2013-02-14 18:58:04 +00:00
frosch
a155a51a18 (svn r24814) -Fix (r24810): Update AI regression. 2012-12-09 17:09:24 +00:00
zuu
cb01e4b496 (svn r24629) -Fix (r24628): Also update regression test 2012-10-25 20:05:04 +00:00