Jonathan G Rennison
|
18a42664fc
|
Merge branch 'master' into jgrpp
Remove 'byte' typedef
|
1 month ago |
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
3 months ago |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
5 months ago |
|
Jonathan G Rennison
|
d5a7a67b8c
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# src/ai/ai_gui.cpp
# src/blitter/32bpp_optimized.cpp
# src/blitter/32bpp_simple.cpp
# src/blitter/32bpp_sse2.cpp
# src/blitter/8bpp_optimized.cpp
# src/blitter/8bpp_simple.cpp
# src/blitter/null.cpp
# src/blitter/null.hpp
# src/company_gui.cpp
# src/game/game_gui.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/graph_gui.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraphjob.cpp
# src/network/network_gui.cpp
# src/newgrf_debug_gui.cpp
# src/openttd.cpp
# src/pathfinder/npf/aystar.h
# src/road_gui.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/script/script_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/sortlist_type.h
# src/spritecache.cpp
# src/spriteloader/grf.cpp
# src/spriteloader/grf.hpp
# src/spriteloader/spriteloader.hpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strings.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/video/opengl.cpp
# src/video/opengl.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window_gui.h
|
6 months ago |
Peter Nelson
|
302e8852c1
|
Fix: Crash if squirrel compatibility scripts cannot be parsed. (#11589)
|
6 months ago |
|
Peter Nelson
|
1071acb483
|
Codechange: Redundant use of char * and c_str(). (#11454)
|
7 months ago |
|
Jonathan G Rennison
|
3436e0a781
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/error.h
# src/error_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/misc_gui.cpp
# src/newgrf_gui.cpp
# src/news_gui.cpp
# src/rail_cmd.cpp
# src/saveload/gamelog_sl.cpp
# src/script/api/script_text.cpp
# src/script/script_instance.cpp
# src/statusbar_gui.cpp
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/textbuf_gui.h
|
7 months ago |
|
Jonathan G Rennison
|
6ccbd7cce2
|
Saveload: Remove test pass from ScriptInstance::Save
Use SlConditionallySave to discard the saved data instead if there
was an error
|
10 months ago |
|
Jonathan G Rennison
|
d0c6b7136d
|
Saveload: Improve performance of script data save/load
Avoid unnecessarily using SlObject wrappers
|
10 months ago |
|
Jonathan G Rennison
|
508f871c5f
|
Use core/format.hpp for fmt includes
|
11 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 |
|
Rubidium
|
18a31cca7c
|
Codechange: do not make a string valid in place, to then copy it
|
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
|
12 months ago |
Loïc Guilloux
|
6c19e5ecae
|
Fix #10868: [Script] Handle errors when loading savegame data on stack (#11029)
(cherry picked from commit 1d9bc23525)
|
12 months ago |
|
Loïc Guilloux
|
1d9bc23525
|
Fix #10868: [Script] Handle errors when loading savegame data on stack (#11029)
|
1 year ago |
|
Jonathan G Rennison
|
ac2f9a21e8
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
Leave afterload in src/saveload/
|
1 year 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 |
|
Jonathan G Rennison
|
3a47b421b0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/core/overflowsafe_type.hpp
# src/economy.cpp
# src/engine_base.h
# src/ground_vehicle.cpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/newgrf_commons.cpp
# src/newgrf_engine.cpp
# src/newgrf_industries.cpp
# src/newgrf_object.cpp
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/rail_gui.cpp
# src/road_cmd.h
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/script/api/script_log.cpp
# src/script/api/script_log.hpp
# src/settings_gui.cpp
# src/settingsgen/settingsgen.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strgen/strgen.cpp
# src/string_func.h
# src/string_type.h
# src/table/settings/network_private_settings.ini
# src/tests/math_func.cpp
# src/textfile_gui.cpp
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/waypoint_cmd.h
# src/widgets/dropdown.cpp
|
1 year ago |
|
Jonathan G Rennison
|
fd4d4d341d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/animated_tile.cpp
# src/cargopacket.h
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/date.cpp
# src/disaster_vehicle.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/engine.cpp
# src/error_gui.cpp
# src/fontcache/spritefontcache.cpp
# src/game/game_gui.cpp
# src/game/game_text.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/highscore_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/italian.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/turkish.txt
# src/lang/vietnamese.txt
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_generic.cpp
# src/news_gui.cpp
# src/openttd.cpp
# src/os/unix/unix.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/misc_sl.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spritecache.cpp
# src/spritecache.h
# src/spriteloader/grf.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen_base.cpp
# src/subsidy.cpp
# src/table/settings/difficulty_settings.ini
# src/texteff.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/townname.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/widgets/dropdown.cpp
# src/window.cpp
|
1 year ago |
|
Rubidium
|
ab51175db2
|
Codechange: use std::string for script config
|
1 year ago |
|
Rubidium
|
e035705239
|
Codechange: introduce and use std::string variant of sq_throwerror
|
1 year ago |
|
Rubidium
|
a30f7c83bd
|
Codechange: use std::string for script names to load
|
1 year ago |
|
Rubidium
|
9b0123ab66
|
Codechange: use std::string for script API versions
|
1 year ago |
|
Jonathan G Rennison
|
7bc6c4b59c
|
Script: Boost gamescript op limit when game is paused due to game script
|
1 year ago |
|
Jonathan G Rennison
|
1b6d1086d0
|
Script: Add ScriptInstance field for script type
|
1 year ago |
|
Rubidium
|
6e3d3c0e7c
|
Codechange: introduce std::string variant of sq_pushstring
|
1 year ago |
|
PeterN
|
b67cf7f94a
|
Change: Replace ScriptLog data array with std::deque. (#10770)
Due to cyclic header dependency this requires moving the data types used
by ScriptLog out of the ScriptLog class.
|
1 year ago |
|
Rubidium
|
8b93e45e22
|
Codechange: use string/fmt instead of printf for squirrel's PRINTFUNC
|
1 year ago |
|
Jonathan G Rennison
|
a6babb23d3
|
Script: Allow text param mismatches for scripts with 13 or below compatibility
|
1 year ago |
dP
|
c73b88ddca
|
Fix: Don't send unused tile field over the network (#10507)
|
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 |
|
Loïc Guilloux
|
85a4308741
|
Fix #10361, fe30f66: Don't try to give saved data to a dead script (#10433)
(cherry picked from commit 07b40c02fe)
|
1 year ago |
|
Loïc Guilloux
|
07b40c02fe
|
Fix #10361, fe30f66: Don't try to give saved data to a dead script (#10433)
|
1 year ago |
|
Rubidium
|
4e65ec1dc4
|
Codechange: do not declare functions in blocks
|
1 year ago |
|
Jonathan G Rennison
|
a1f6aaa58f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/korean.txt
# src/saveload/afterload.cpp
# src/saveload/ai_sl.cpp
# src/saveload/game_sl.cpp
# src/script/script_instance.cpp
|
1 year ago |
|
Loïc Guilloux
|
fe30f66570
|
Fix #9720: Delay start of GS/AI to after loading of savegame (#9745)
|
1 year ago |
|
dP
|
c91033ac5e
|
Feature: [GS] Scriptable league tables (#10001)
(cherry picked from commit 5e14a20b3b)
|
2 years ago |
|
Jonathan G Rennison
|
dc96fbc573
|
Script: Store CommandCost::GetResultData
|
2 years ago |
|
dP
|
5e14a20b3b
|
Feature: [GS] Scriptable league tables (#10001)
|
2 years ago |
Michael Lutz
|
41fa16f325
|
Codechange: Don't use globals for return values from vehicle command procs.
|
3 years ago |
|
Michael Lutz
|
57b82e2e99
|
Codechange: Don't use globals for story/goal/sign/group command proc return values.
|
3 years ago |
|
Michael Lutz
|
3e85e833a7
|
Codechange: Add support for additional command result values.
|
3 years ago |
|
Michael Lutz
|
eab18f06a4
|
Codechange: Pass additional data as byte stream to command callbacks.
|
3 years ago |
|
Michael Lutz
|
a38bbefe1b
|
Codechange: Untangle command code, flags and error string for DoCommand*.
|
3 years ago |
|
Loïc Guilloux
|
a84feb3444
|
Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415)
(cherry picked from commit ddafc0de05)
|
3 years ago |
|
Jonathan G Rennison
|
81290df946
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/lang/spanish.txt
# src/network/core/tcp_content_type.h
# src/network/network_content.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_internal.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/gameopt_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
|
3 years ago |
|
Loïc Guilloux
|
eed49d7792
|
Fix #9626, ddafc0d: Incorrect loading of script saved data (#9629)
|
3 years ago |
|
Jonathan G Rennison
|
544da99102
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/cargopacket.h
# src/lang/korean.txt
# src/linkgraph/linkgraph.h
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.h
# src/network/network_admin.h
# src/network/network_func.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/order_base.h
# src/rail_cmd.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/economy_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/signs_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/subsidy_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_object.cpp
# src/settings.cpp
# src/string.cpp
# src/string_func.h
# src/table/CMakeLists.txt
# src/table/settings/settings.ini
# src/viewport_sprite_sorter_sse4.cpp
|
3 years ago |
|
rubidium42
|
057e858d32
|
Fix #9353: [Script] Garbage collecting on priority queues could crash the game
(cherry picked from commit 71f3c35288)
|
3 years ago |
|
Loïc Guilloux
|
ddafc0de05
|
Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415)
|
3 years ago |