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
8d0d45c431
Add: ScriptCargo::GetWeight to get cargo weights
2 years ago
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
db98cedb7e
Fix #9883 : Show cost/income float over end tile of rail or road construction
2 years ago
91af0c82d3
Adjust CmdModifyOrder p2 bit allocation
2 years ago
9c255850a5
Add AI/GS method to get annual expense category value
...
See: #425
2 years ago
4b9d5a437f
Add GS methods to set inflation factors
...
See: #415
2 years ago
81291c4ffc
Add AI/GS methods to get inflation factors
...
See: #415
2 years ago
675cf7a8ee
Fix 6fe445e: [Script] Respect joining adjacent when building an airport
2 years ago
ed1457dca3
Fix 55170ae: [Script] Building two-way signals could end up one-way
2 years ago
5b7db9d849
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/command.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/crashlog.cpp
# src/economy.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/misc_gui.cpp
# src/newgrf_config.cpp
# src/openttd.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/table/settings/gui_settings.ini
2 years ago
7331149dde
Codechange: [CMake] Pass API files list via a file to minimise command line length ( #9874 )
2 years ago
f4ca94d3f6
Codechange: Revenue is not the same as Income
...
Income is revenue minus costs. Let's name things correctly (without breaking the script API).
2 years ago
e5a421b65a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/linkgraph/refresh.cpp
# src/order_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_base.h
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
2 years ago
e68bf58989
Codechange: Use anonymous union for vehicle orders/old orders list
2 years ago
f5ef81f5ac
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/italian.txt
# src/lang/tamil.txt
2 years ago
b4fc0b4dc5
Initial implementation of road waypoints
2 years ago
b8a8891a86
Add: [Script] IndustryType::ResolveNewGRFID to resolve industry id from grfid and grf_local_id
2 years ago
26ac0c48f0
Add: [Script] ObjectType::ResolveNewGRFID to resolve object id from grfid and grf_local_id
2 years ago
579c71dd44
Script: Add ScriptRoad methods related to road types
2 years ago
ba97d0a827
Allow building waypoints with spec IDs >= 256
...
See: #349
2 years ago
41fa16f325
Codechange: Don't use globals for return values from vehicle command procs.
2 years ago
57b82e2e99
Codechange: Don't use globals for story/goal/sign/group command proc return values.
2 years ago
3e85e833a7
Codechange: Add support for additional command result values.
2 years ago
8503854655
Codechange: Pass unpacked command arguments to command callbacks (except Script).
2 years ago
13528bfcd0
Codechange: Un-bitstuff all remaining commands.
2 years ago
58cff7b081
Codechange: Un-bitstuff the remaining on-map commands.
2 years ago
c6d7b98808
Codechange: Un-bitstuff landscape commands.
2 years ago
e6e69d5289
Codechange: Un-bitstuff goal and story page commands.
2 years ago
1a42a8a5d5
Codechange: Un-bitstuff town-related commands.
2 years ago
e08b3abe7f
Codechange: Un-bitstuff group and autoreplace commands.
2 years ago
46bd2f1ced
Codechange: Un-bitstuff remaining transport infrastructure commands.
2 years ago
55170ae703
Codechange: Un-bitstuff rail commands.
2 years ago
6fe445e6c0
Codechange: Un-bitstuff station/depot/waypoint commands.
2 years ago
21675ec7e2
Codechange: Un-bitstuff vehicle/engine commands.
2 years ago
211c630cbe
Codechange: Un-bitstuff order commands.
2 years ago
4f3ea3907e
Codechange: Un-bitstuff commands taking a ClientID (i.e. CMD_CLIENT_ID).
2 years ago
ccefa76a46
Codechange: Template DoCommandPInternal.
2 years ago
6691ee3b96
Codechange: Template script command calls.
2 years ago
eab18f06a4
Codechange: Pass additional data as byte stream to command callbacks.
2 years ago
e740c24eb7
Codechange: Template DoCommand to automagically reflect the parameters of the command proc.
...
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
2 years ago
b0990fcff7
Codechange: Make TileIndex a "strong" typedef to give it a distinct type.
...
This is accomplished by changing it to a single member struct with the
appropriate operator overloads to make it all work with not too much
source modifications.
2 years ago
a38bbefe1b
Codechange: Untangle command code, flags and error string for DoCommand*.
2 years ago
549caca39c
Codechange: Move command arguments to the back of the networked command function calls.
2 years ago
b6933a2ebd
Codechange: Move command arguments to the back of the DoCommand function call.
2 years ago
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
3ef1a0943b
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/lang/chuvash.txt
# src/lang/czech.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/german.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latvian.txt
# src/lang/russian.txt
# src/tree_gui.cpp
# src/vehicle.cpp
3 years ago
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
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
3 years ago
c6f0559ad4
Fix const-correctness in script DoCommand string validation
...
See: 665e3c1f
3 years ago
Jonathan G Rennison
SamuXarick
Tyler Trahan
glx22
Loïc Guilloux
Niels Martin Hansen
Andy
Michael Lutz