Jonathan G Rennison
|
3050620189
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.cpp
# src/economy.cpp
# src/engine_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/newgrf.cpp
# src/newgrf_airporttiles.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/order_base.h
# src/order_cmd.cpp
# src/order_func.h
# src/order_gui.cpp
# src/pathfinder/pathfinder_type.h
# src/saveload/afterload.cpp
# src/subsidy_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
|
5 months ago |
Peter Nelson
|
400ae65ff2
|
Codechange: Redefine some cargo-related values in terms of CargoID instead of CargoType.
Values used as special filter types are now defined as offsets from NUM_CARGO instead of confusingly reusing CARGO_NO_REFIT/CARGO_AUTO_REFIT types.
|
5 months ago |
Peter Nelson
|
952d111b94
|
Codechange: Split CT_INVALID into CT_INVALID and INVALID_CARGO.
INVALID_CARGO is a CargoID and should be used for most purposes in game.
CT_INVALID is a CargoType used for defining default properties.
|
5 months ago |
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
5 months ago |
Rubidium
|
eaae0bb5e7
|
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
|
11 months ago |
Jonathan G Rennison
|
d09b504bc5
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-source.yml
# .github/workflows/release.yml
# CMakeLists.txt
# COMPILING.md
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/bridge_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/CMakeLists.txt
# src/core/smallmap_type.hpp
# src/disaster_vehicle.h
# src/effectvehicle_base.h
# src/fontcache.cpp
# src/game/game_core.cpp
# src/game/game_gui.cpp
# src/gamelog.cpp
# src/gamelog_internal.h
# src/group_gui.cpp
# src/linkgraph/linkgraph.h
# src/misc.cpp
# src/network/core/config.h
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/newgrf_profiling.cpp
# src/newgrf_profiling.h
# src/object_gui.cpp
# src/openttd.cpp
# src/openttd.h
# src/order_gui.cpp
# src/os/windows/font_win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/script/api/script_controller.cpp
# src/script/api/script_roadtypelist.cpp
# src/script/script_config.cpp
# src/script/script_config.hpp
# src/script/script_instance.cpp
# src/script/script_scanner.cpp
# src/script/squirrel.cpp
# src/script/squirrel_helper.hpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings/network_private_settings.ini
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/window_gui.h
|
11 months ago |
Rubidium
|
bbcb55ebc9
|
Codechange: use std::string as script API return type
|
1 year ago |
glx22
|
40424601c6
|
Codechange: Use SQInteger for generic numbers in script_cargo
|
1 year ago |
SamuXarick
|
8d0d45c431
|
Add: ScriptCargo::GetWeight to get cargo weights
|
2 years ago |
Patric Stout
|
218f40eea2
|
Add: [Script] ScriptCargo::GetName, to get the human readable name of a cargo (#8544)
Of course this translates into AICargo.GetName() for AIs and
GSCargo.GetName() for GameScripts.
|
3 years ago |
Niels Martin Hansen
|
b7751c483e
|
Feature: Influence industry production changes from GS (#7912)
|
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 |
frosch
|
de3bb62e9e
|
(svn r27316) -Doc: Improve documentation on ScriptCargo::GetCargoLabel
|
9 years ago |
zuu
|
ae23f519f7
|
(svn r26396) -Add: [script] AI/GS APIs to get cargo waiting from/via other station
|
10 years ago |
rubidium
|
e40eb8177a
|
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
|
13 years ago |
truebrain
|
436cf09923
|
(svn r23614) -Add: more API functions exposed to NoGo (part 1)
|
13 years ago |
rubidium
|
3d88c74389
|
(svn r23526) -Codechange: unify cargos vs cargoes
|
13 years ago |
rubidium
|
18d929aa21
|
(svn r23521) -Codechange: use the actual enum values from the 'core' in the API when they refer to the in-game values in the cases where that is possible and sensible
|
13 years ago |
truebrain
|
4d91f645c1
|
(svn r23370) -Add: support @api tag in API header files, to select which API should receive the defined classes and functions
|
13 years ago |
truebrain
|
98103121d4
|
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
|
13 years ago |
truebrain
|
afdb67a353
|
(svn r23354) -Codechange: move all src/ai/api/ai_*.[hc]pp files to src/script/api/script_* (Rubidium)
|
13 years ago |