Jonathan G Rennison
|
2ea1766677
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/commit-checker.yml
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/league_sl.cpp
# src/saveload/saveload.h
# src/script/api/script_object.hpp
# src/script/squirrel_helper.hpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/table/settings.h.preamble
# src/tree_cmd.cpp
# src/tree_map.h
# src/vehicle.cpp
# src/waypoint_cmd.cpp
|
2 years ago |
Rubidium
|
a409e4b026
|
Add: documention to large functions that have too little documentation according to CodeQL
|
2 years ago |
Jonathan G Rennison
|
c342b4219b
|
NewGRF: Use per-GRF text ID map in GetGRFStringID
|
2 years ago |
Jonathan G Rennison
|
d71e38446e
|
Improve performance of string lookup in AddGRFString
|
2 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 |
Jonathan G Rennison
|
fd605e3cf3
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
|
3 years ago |
Rubidium
|
9f4a71335d
|
Fix 11ab3c4: [NewGRF] Overflow when determining cargo mask for string code 9A 1E
9A 1E: Print unsigned word as name of a cargo type (translated for GRF version >= 7).
(cherry picked from commit 1c0c4637d2 )
|
3 years ago |
Rubidium
|
1c0c4637d2
|
Fix 11ab3c4: [NewGRF] Overflow when determining cargo mask for string code 9A 1E
9A 1E: Print unsigned word as name of a cargo type (translated for GRF version >= 7).
|
3 years ago |
rubidium42
|
55a11710a6
|
Codechange: convert printf DEBUG statements to fmt Debug statements
|
3 years ago |
rubidium42
|
ab9b937ab7
|
Codechange: [Network] Use std::string to get a NewGRF's name
|
3 years ago |
rubidium42
|
ed9e38221a
|
Cleanup: remove dead code; ++ on ostreambuf_iterator is a no-op
|
3 years ago |
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
4 years ago |
Jonathan G Rennison
|
082d9021d0
|
Only use more specific texts for money sending where available
|
4 years ago |
Jonathan G Rennison
|
d913083c37
|
Print warning instead of asserting for invalid NewGRF string IDs
|
4 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
Jonathan G Rennison
|
f0c3a4b42e
|
Saveload: Store NewGRF name in savegame, include in missing GRF message
|
4 years ago |
Jonathan G Rennison
|
0fa37bcad9
|
Add function to get GRF ID of string ID
|
4 years ago |
Jonathan G Rennison
|
f8d6e781ba
|
Merge branch 'master' into jgrpp
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
|
4 years ago |
Michael Lutz
|
c082f570ce
|
Codechange: Use std::string when translating TTDP NewGRF string codes.
|
4 years ago |
Michael Lutz
|
43cd892e0c
|
Codechange: Replace custom linked list for GRF texts with STL vectors and strings.
|
4 years ago |
Michael Lutz
|
f2b40f40aa
|
Codechange: Replace SmallPair with std::pair.
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
|
4 years ago |
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
Jonathan G Rennison
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
Charles Pigott
|
71a3e83468
|
Fix: GCC9's warnings about deprecated implicit assignment operators
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
Jonathan G Rennison
|
e64706d147
|
Log string ID in GetGRFStringPtr assertion
|
5 years ago |
Jonathan G Rennison
|
bd2fdde759
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
|
6 years ago |
PeterN
|
d2b6176cdf
|
Add: NewGRF string codes to access PUSH/POP_COLOUR. (#7527)
|
6 years ago |
Jonathan G Rennison
|
55fbf37373
|
Add missing includes to newgrf_text.cpp
|
6 years ago |
Jonathan G Rennison
|
1c0643e419
|
Add GRF ID/name to "Too many NewGRF string parameters" messages
|
6 years ago |
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Jonathan G Rennison
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
6 years ago |
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
6 years ago |
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
6 years ago |
Jonathan G Rennison
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
6 years ago |
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
Jonathan G Rennison
|
d1a287d73c
|
Merge branch 'save_ext' into jgrpp
|
8 years ago |
peter1138
|
0d13f793f2
|
(svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test.
|
8 years ago |
peter1138
|
02b6c533aa
|
(svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test.
|
8 years ago |
Jonathan G Rennison
|
a6168dd2f0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/company_sl.cpp
|
8 years ago |
frosch
|
2bb80d280c
|
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
|
8 years ago |
frosch
|
ce32ca4dc6
|
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
|
8 years ago |
frosch
|
a56e2bccd0
|
(svn r27756) -Codechange: Add StringTab enum
|
8 years ago |
frosch
|
49b940f69c
|
(svn r27756) -Codechange: Add StringTab enum
|
8 years ago |
frosch
|
f4da8ece0c
|
(svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently.
|
8 years ago |
frosch
|
b54a79f13e
|
(svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently.
|
8 years ago |
Jonathan G Rennison
|
5c7f36ef4b
|
Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
|
8 years ago |
frosch
|
1a92b0c7c3
|
(svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided.
|
8 years ago |