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 |
|
Jonathan G Rennison
|
02549c5224
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/cargomonitor.cpp
# src/core/CMakeLists.txt
# src/economy.cpp
# src/landscape.cpp
# src/linkgraph/flowmapper.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/misc_gui.cpp
# src/newgrf_generic.cpp
# src/newgrf_storage.cpp
# src/rail_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/station_sl.cpp
# src/script/script_gui.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/string_func.h
# src/terraform_cmd.cpp
|
1 year ago |
Rubidium
|
62fda0f505
|
Codechange: remove manual allocation/free for SQ_instance
|
1 year ago |
|
Rubidium
|
ab51175db2
|
Codechange: use std::string for script config
|
1 year ago |
|
Rubidium
|
48825e1a8e
|
Codechange: rewrite script string-to-settings conversion to C++
|
1 year ago |
|
Rubidium
|
1ae7eb1594
|
Codechange: use std::map over SmallMap and std::string of stredup(char*)
|
1 year ago |
|
Jonathan G Rennison
|
ae9b416684
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/ai/ai_instance.cpp
# src/console_cmds.cpp
# src/engine_type.h
# src/game/game_gui.cpp
# src/game/game_instance.cpp
# src/goal.cpp
# src/goal_cmd.h
# src/lang/english.txt
# src/lang/estonian.txt
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_generic.h
# src/openttd.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_map.h
# src/strings.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/gui_settings.ini
# src/tbtr_template_gui_main.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/water_cmd.cpp
|
1 year ago |
|
Rubidium
|
4e65ec1dc4
|
Codechange: do not declare functions in blocks
|
1 year ago |
|
Jonathan G Rennison
|
ad9e1a8fb3
|
Increase value of MAX_SL_OPS constant
|
2 years ago |
Michael Lutz
|
b408fe77f7
|
Codechange: Use std::string in file scanners.
|
3 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
rubidium
|
b3e93d6520
|
(svn r26057) -Fix: a number of possibly uninitialised variables
|
11 years ago |
truebrain
|
1616961ea2
|
(svn r23613) -Add: allow IsDeveloperOnly in info.nut, to indicate if you can select this GS via the GUI (optional, defaults to false)
|
13 years ago |
|
truebrain
|
4505edbd47
|
(svn r23365) -Codechange: move constants to a single place, to avoid duplication (and in time, different values)
|
13 years ago |
|
truebrain
|
34d7f01ccc
|
(svn r23364) -Codechange: refactor AIConfig, moving it mostly to Scriptconfig
|
13 years ago |
|
truebrain
|
c38c16773c
|
(svn r23363) -Documentation: document a tiny bit better what is in variables
|
13 years ago |
|
truebrain
|
e37149a1de
|
(svn r23362) -Codechange: refactor AIScanner, splitting it in AIScannerInfo and AIScannerLibrary
|
13 years ago |
|
rubidium
|
62777dbd84
|
(svn r22905) -Fix [FS#4753] (r22836): the name of the tar was removed from the AI filenames, so record it differently. Also removes some of the hackery to get the tar's filename
|
13 years ago |
alberth
|
7303f7d199
|
(svn r21595) -Codechange: Some header files had their name changed, update the ifndef/define/endif lines.
|
14 years ago |
|
rubidium
|
82fc28f77f
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
|
rubidium
|
73df2c7a25
|
(svn r18418) -Fix [FS#3298]: under some circumstances a pointer could be left untouched and then freed. Make sure this doesn't happen by ensuring it starts out as NULL instead of 'garbage'.
|
15 years ago |
|
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
yexo
|
a91ff2d5e8
|
(svn r16093) -Feature [FS#2808]: Add GetURL() as possible function to info.nut. If AIs implement it, that url is shown when the AI crashes and also in the AI selection window.
|
15 years ago |
|
yexo
|
ce4744e1d6
|
(svn r15736) -Codechange: Split AIScanner/AIFileInfo to the more generic classes ScriptScanner/ScriptFileInfo.
|
15 years ago |