Commit Graph

153 Commits (jgrpp)

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
3 months ago
Rubidium a4d4301a0c Codechange: We are heading to 15 3 months ago
Jonathan G Rennison 24b744f7c8 Merge branch 'master' into jgrpp
# Conflicts:
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/saveload/saveload.h
1 year ago
Michael Lutz 150f05dc15
Change: Heading for 14 now. (#10302) 1 year ago
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
2 years ago
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.
2 years ago
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
3 years ago
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
3 years ago
Patric Stout 394c749b6b
Change: Heading for 13 now (#9573) 3 years ago
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.
3 years ago
Loïc Guilloux 799eb31ff1
Change: [CMake] Copy AI/GS compatibility files to build dir (#8906) 3 years ago
Patric Stout 9bfa7198fd
Change: Heading for 1.12 now (#8862) 3 years ago
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)
4 years ago
Charles Pigott 5c19668fdb Doc: [Script] Add a note about how wagon connectivity works for scripts 4 years ago
glx 2f264f2c92 Change: Heading for 1.11 now 4 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
JMcKiern 04f659e768 Fix: Some typos found using codespell 5 years ago
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.
5 years ago
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.
5 years ago
glx f8e6cd10ef Add: script API functions for build with refit feature 5 years ago
frosch a67ee02529
Change: Heading for 1.10 now (#7319) 5 years ago
Peter Nelson 5a5944867d Add: Add parent_group_id parameter to CreateGroup() 5 years ago
SamuXarick 1e5a6765d9 Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988) 5 years ago
glx22 efc44466d6 Fix: make -k switch useful when testing regression (#7053) 5 years ago
glx 7b5e7aa14f Add: [Win32] regression test script 5 years ago
Johannes E. Krause 662dcc3c31 Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation 6 years ago
Jonathan G Rennison df92a056df Fix #6875: Depot building cost does not include foundation build cost (#6883) 6 years ago
Jonathan G Rennison d839526365 Fix bf8d7df: Script/AI construction of rail track and waypoints (#6881) 6 years ago
frosch 09d4735679 (svn r27993) -Change: Heading for 1.9 now 6 years ago
frosch 8c458c153d (svn r27990) -Update: Docs 6 years ago
frosch afcef7faa6 (svn r27780) -Update: Numbers 7 years ago
frosch 0c7c0ada78 (svn r27518) -Update: Numbers 8 years ago
frosch 6477356dd2 (svn r27192) -Change: heading for 1.6 now 9 years ago
rubidium 8415a15999 (svn r26898) -Fix: hopefully make regression under MinGW work again 10 years ago
fonsinchen d87e20d6f4 (svn r26897) -Change: Add some more AIStationList autotests 10 years ago
fonsinchen 57d758f73e (svn r26896) -Codechange: Move AIStationList* tests to separate test case 10 years ago
fonsinchen d92c95b29c (svn r26895) -Change: Allow for multiple independent test cases for AI API regression 10 years ago
fonsinchen 73d273ffd6 (svn r26892) -Feature: Script API for retrieving planned flow 10 years ago
fonsinchen bb269661d4 (svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo 10 years ago
frosch 26262e035a (svn r26410) -Fix: Missing svn properties 10 years ago
frosch 8ff9499fe2 (svn r26409) -Update: Version number in some more places. 10 years ago
frosch 6baa58a7d8 (svn r26407) -Fix: __ln__ never read the script compatibility files. 10 years ago
frosch db96a109ff (svn r26406) -Change: heading for 1.5 now 10 years ago
rubidium 43a9cfcaa4 (svn r25491) -Fix: ofcourse... doing something with Random messes with the regression result... 11 years ago
rubidium bfdc7fe558 (svn r25392) -Fix (r25390): update regression to account for the compatability settings 11 years ago
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 11 years ago
rubidium 7e12c449f1 (svn r25144) -Fix (r25143): one of the changes strings was used in the regression test, which subsequently failed 11 years ago
rubidium 7ff6598cd2 (svn r25001) -Change: heading for 1.4 now 11 years ago
frosch a155a51a18 (svn r24814) -Fix (r24810): Update AI regression. 12 years ago
zuu cb01e4b496 (svn r24629) -Fix (r24628): Also update regression test 12 years ago