Jonathan G Rennison
|
8ae1587987
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/os/windows/crashlog_win.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/os/windows/win32.h
# src/video/win32_v.cpp
# src/video/win32_v.h
|
5 months ago |
Loïc Guilloux
|
28efa65e0c
|
Revert a2edf52: SQOpsLimiter does a more precise job (#11754)
|
5 months ago |
|
Jonathan G Rennison
|
914b92b21f
|
Merge branch 'master' into jgrpp
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
|
5 months ago |
|
Loïc Guilloux
|
c86d918921
|
Add: [Script] Optional filter parameter to more ScriptXXXList constructors (#11698)
|
5 months ago |
|
Jonathan G Rennison
|
48b6b1844a
|
Change: Limit total script ops that can be consumed by a list valuate (#11670)
|
5 months ago |
|
Jonathan G Rennison
|
be4f8b91c6
|
Change: Limit total script ops that can be consumed by a list valuate
(cherry picked from commit 1d0b40b2b2f2998d96221b18ae65a4d1524c61a7)
|
5 months ago |
|
Jonathan G Rennison
|
0d4d4a9cac
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/3rdparty/squirrel/squirrel/sqclosure.h
# src/3rdparty/squirrel/squirrel/sqobject.h
# src/3rdparty/squirrel/squirrel/sqvm.h
# src/aircraft.h
# src/airport_gui.cpp
# src/blitter/32bpp_sse_func.hpp
# src/blitter/null.hpp
# src/bridge_gui.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.h
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_gui.cpp
# src/console_gui.cpp
# src/date_gui.cpp
# src/depot_gui.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/fileio.cpp
# src/fios.cpp
# src/fios_gui.cpp
# src/fontcache/spritefontcache.h
# src/framerate_gui.cpp
# src/game/game_text.cpp
# src/gamelog.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/highscore_gui.cpp
# src/hotkeys.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/main_gui.cpp
# src/misc_cmd.cpp
# src/misc_gui.cpp
# src/network/core/tcp_game.cpp
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_airport.cpp
# src/newgrf_airport.h
# src/newgrf_airporttiles.cpp
# src/newgrf_airporttiles.h
# src/newgrf_animation_base.h
# src/newgrf_canal.cpp
# src/newgrf_commons.h
# src/newgrf_config.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_engine.cpp
# src/newgrf_engine.h
# src/newgrf_generic.cpp
# src/newgrf_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/newgrf_industries.cpp
# src/newgrf_industries.h
# src/newgrf_industrytiles.cpp
# src/newgrf_industrytiles.h
# src/newgrf_object.cpp
# src/newgrf_object.h
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_roadstop.cpp
# src/newgrf_roadstop.h
# src/newgrf_roadtype.cpp
# src/newgrf_roadtype.h
# src/newgrf_spritegroup.cpp
# src/newgrf_spritegroup.h
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/newgrf_town.cpp
# src/newgrf_town.h
# src/news_gui.cpp
# src/object_gui.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/os/windows/win32_main.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/npf/queue.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/roadveh.h
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/script/api/script_text.hpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/signs_cmd.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spriteloader/grf.hpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/station_map.h
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/table/newgrf_debug_data.h
# src/terraform_gui.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_window.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/transparency_gui.cpp
# src/vehicle_gui.cpp
# src/water_cmd.cpp
# src/waypoint_cmd.cpp
# src/widget.cpp
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/rail_widget.h
# src/widgets/terraform_widget.h
# src/window.cpp
# src/window_gui.h
|
7 months ago |
Peter Nelson
|
49dae08a3b
|
Codechange: Add missing override specifiers.
|
9 months ago |
|
Jonathan G Rennison
|
752b0bce47
|
ScriptList: Defer creation of sorter and values map until first used
|
10 months ago |
|
Jonathan G Rennison
|
24a77e5b36
|
ScriptList: Update iterators when swapping lists
Safe btree iterators store a pointer to the parent container
|
10 months ago |
|
Jonathan G Rennison
|
bdbc631e6c
|
Script: Simplify implementation of ScriptList
Use btrees instead of set/map
Replace bucket mechanism for reverse mapping
Avoid redundant operations
|
10 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 |
|
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 |
Patric Stout
|
199e41c762
|
Codechange: use default dtor instead of empty (#10826)
|
1 year ago |
|
Peter Nelson
|
e6740046ee
|
Codechange: Use range-for iteration.
|
1 year ago |
|
Jonathan G Rennison
|
faa77e2605
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/script/api/script_company.cpp
# src/script/api/script_date.cpp
# src/script/api/script_date.hpp
# src/script/api/script_gamesettings.cpp
# src/script/api/script_order.hpp
# src/script/api/script_town.cpp
# src/script/api/script_window.cpp
|
1 year ago |
glx22
|
a225fda9fe
|
Codechange: Use SQInteger for generic numbers in script_list
|
1 year 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 |
|
Jonathan G Rennison
|
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 |
|
Loïc Guilloux
|
4eb368c786
|
Fix 14f197c: [Script] int64 values don't fit into int (#9465)
|
3 years ago |
Rubidium
|
281a65b3e1
|
Cleanup: simplify some boolean expressions
|
3 years ago |
|
rubidium42
|
55a11710a6
|
Codechange: convert printf DEBUG statements to fmt Debug statements
|
3 years ago |
Michael Lutz
|
1f1345de09
|
Codechange: [Script] Improve copying a list into another empty list.
|
4 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
nikolas
|
10fe568f08
|
Fix: typo in ScriptList::Valuate param error (#7687)
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
frosch
|
a2edf52b41
|
(svn r27594) -Fix [FS#6473]: [Script] Kill scripts, when a non-suspendable valuator call takes way too long.
|
8 years ago |
|
frosch
|
eb25d9e275
|
(svn r27258) -Fix [FS#6287]: ScriptList::RemoveList failed to remove a list from itself.
|
9 years ago |
|
frosch
|
fece468d96
|
(svn r27166) -Codechange: Optimise ScriptList by making use of iterators instead of looking up map-items multiple times per API call.
|
9 years ago |
|
rubidium
|
14f197c6ff
|
(svn r27104) -Fix [FS#6194]: support 64 bits integere in the ScriptLists as well
|
10 years ago |
fonsinchen
|
1a5b2f0e17
|
(svn r26894) -Feature: Swap method for script lists
|
10 years ago |
|
rubidium
|
33ab505567
|
(svn r26774) -Cleanup [Squirrel]: remove _SC macro
|
10 years ago |
|
frosch
|
7ca57bc578
|
(svn r26744) -Fix [FS6085-ish]: ScriptListSorterItemDescending::FindNext failed to detect the end.
|
10 years ago |
|
frosch
|
a03ad12322
|
(svn r26743) -Codechange: Simplify ScriptList iterators.
|
10 years ago |
|
frosch
|
0d561bcf57
|
(svn r26742) -Doc: Why reverse_iterator is unsuitable for ScriptList iterators
|
10 years ago |
|
frosch
|
c775ffe530
|
(svn r26741) -Revert (r26736): reverse_iterators are invalidated when the element next to them is erased (not the element they are pointing to), which makes them unsuitable for ScriptList.
|
10 years ago |
|
rubidium
|
d733c7d196
|
(svn r26736) -Fix [Script]: infinite loop (by scripts; always returning the same item) when sorted by item in descending order by oddly constructed FindNext that uses forward iterators. Simply use the same code as the ascending item sort but use the reverse iterator instead of the forward. Also do this same trick for the descending value sort even though I couldn't trigger the problem there
|
10 years ago |
|
rubidium
|
0463dbdc9e
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
10 years ago |
|
rubidium
|
be6b64f4e6
|
(svn r26072) -Cleanup: mark some unreachable default cases by NOT_REACHED()
|
11 years ago |
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
|
rubidium
|
22637f139f
|
(svn r24008) -Cleanup/doc: try not to mention (No)AI in script APIs
|
12 years ago |
|
truebrain
|
e1f04b89c3
|
(svn r23648) -Revert (r23646): partial revert; nobody has to know about my local changes and attempts
|
13 years ago |
|
truebrain
|
da8777d4e5
|
(svn r23646) -Fix [FS#4901]: rescan the Game Scripts when done downloading one.
|
13 years ago |
yexo
|
1bc1a41937
|
(svn r23392) -Fix: [NoAI] assigning 'null' to an AIList element to remove it didn't work
|
13 years ago |
|
truebrain
|
a8b22e5292
|
(svn r23386) -Fix: debug script related events to 'script' (removes 'ai')
|
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 |