2ed248a61d
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# src/aircraft_cmd.cpp
# src/airport_gui.cpp
# src/articulated_vehicles.cpp
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/genworld_gui.cpp
# src/gfx_layout.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_config.h
# src/newgrf_engine.cpp
# src/news_gui.cpp
# src/order_gui.cpp
# src/roadveh_cmd.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/ship_cmd.cpp
# src/statusbar_gui.cpp
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
1 year ago
6091d7470c
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release-macos.yml
# src/company_gui.cpp
# src/linkgraph/linkgraph.cpp
# src/newgrf_debug_gui.cpp
# src/strgen/strgen_base.cpp
# src/timetable_gui.cpp
1 year ago
f00e0e195f
cpp-btree: Add support for uncopyable/move-only map/multimap value types
1 year ago
b381a30d2d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_media_func.h
# src/cargopacket.h
# src/gfxinit.cpp
# src/industry_cmd.cpp
# src/window_gui.h
1 year ago
a99418cb69
Revert "Codechange: Explicitly move a few variables to avoid a copy constructor (fixes warning from clang)"
...
This reverts commit 6378a78817Fixes : #521
1 year ago
81d4fa6999
Feature: drop ICU-lx in favour of directly interfacing with harfbuzz
...
This means we have RTL support again with ICU 58+. It makes use of:
- ICU for bidi-itemization
- ICU for script-itemization
- OpenTTD for style-itemization
- harfbuzz for shaping
1 year ago
57f2d70fef
Change: Use cstdint instead of rolling our own types. ( #10651 )
1 year ago
8f24901843
Codechange: replace printf with PRINTF macros by fmt::format for scripts
1 year ago
484883e6e1
Cleanup: remove (unused) Squirrel code that used a hack to work around printf safety
1 year ago
5733142b0d
Codechange: use string/fmt instead of printf for Squirrel's Raise_Error
1 year ago
8b93e45e22
Codechange: use string/fmt instead of printf for squirrel's PRINTFUNC
1 year ago
88ead3f102
Add: catch2 v2.13.10
1 year ago
a2d2dcd3d5
3rdparty: Add fmt from upstream
1 year ago
777dcd047d
CMake: Add missing references in src/3rdparty
1 year ago
72237f01cc
Add robin_hood hash set/map containers to 3rdparty
1 year ago
6285b5823b
3rdparty: Update monocypher from 3.1.2 to 3.1.3
1 year ago
483e3172af
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/strong_typedef_type.hpp
# src/gfx.cpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/map_func.h
# src/newgrf_debug_gui.cpp
# src/order_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/tile_type.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
1 year ago
ff0e779680
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/czech.txt
# src/order_backup.h
# src/settings_internal.h
# src/string.cpp
# src/viewport.cpp
1 year ago
6ba55e663e
Codechange: do not hide variables with other variables
1 year ago
1951af07c0
Codechange: do not hide parameters with local variables
1 year ago
71b46db8d0
Cleanup: remove commented out code
1 year ago
5863d78cb4
Codechange: use commented out code, or guard by #ifdef
1 year ago
ae422be979
Cleanup: remove/replace trailing ; with . in comments
1 year ago
1bfd96c7f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/3rdparty/fmt/core.h
# src/command_type.h
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/landscape.cpp
# src/network/network.cpp
# src/newgrf_object.h
# src/object_cmd.cpp
# src/order_gui.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_industrytype.cpp
# src/script/api/script_object.hpp
# src/script/api/script_town.cpp
# src/table/object_land.h
# src/timetable_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle_gui.cpp
# src/window.cpp
1 year ago
20a9e13272
Fix: inconsistent definition of copy constructor and assignment
1 year ago
62d524eaef
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/spritecache.cpp
# src/timetable_gui.cpp
1 year ago
f7af9a299a
Codechange: prevent suspicious pointer scaling
1 year ago
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
012fd2be0d
Codechange: Suppress warnings when asserts are disabled
1 year ago
2b5456a664
Squirrel: Change SQRefCounted allocator to avoid undefined behaviour
2 years ago
9abc6f9aec
Comment out additional include of <cassert>
...
Reapplies part of 22c3a010
2 years ago
29a1e49c28
Change various asserts to not be included in release builds
2 years ago
c8043f6e00
Update sqbaselib.cpp
...
(cherry picked from commit 43a4b138a504c0464e6a7bb7b87ac2a90968b0aa)
2 years ago
51a37ecf2a
Monocypher: Fix narrowing conversion warning
2 years ago
ab17deae3a
Random bytes: Fix minor compilation warnings
2 years ago
eb22b49758
Add randombytes lib to src/3rdparty
2 years ago
91f6c6941a
Add monocypher lib to src/3rdparty
2 years ago
34f8098689
Suppress Wdeprecated-copy warning on clang/emscripten
3 years ago
c4e3c2cd75
Avoid unknown pragma GCC diagnostic warning on GCC < 9
3 years ago
a731da3956
Suppress Wdeprecated-copy warning in btree_iterator
3 years ago
85d2d0daab
Fix 3rd party optional comparison operators
3 years ago
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
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
3 years ago
5586d1a20a
Remove use of deprecated allocator rebind in cpp-btree
3 years ago
da282c3ecc
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/misc_gui.cpp
# src/newgrf.cpp
3 years ago
ffef1c9e44
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/company_sl.cpp
# src/saveload/engine_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/order_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_gui.cpp
# src/settings_internal.h
# src/stdafx.h
# src/table/settings/settings.ini
# src/town_cmd.cpp
# src/vehicle.cpp
3 years ago
ff67f7b311
Fix #9588 , 140a96b: [Squirrel] Reaching memory limit during script registration could prevent further script detections ( #9589 )
...
Also the memory allocation triggering the limit was never freed.
And if the exception was thrown in a constructor using placement new, the pre-allocated memory was not freed either.
(cherry picked from commit ccd586a736
3 years ago
ccd586a736
Fix #9588 , 140a96b: [Squirrel] Reaching memory limit during script registration could prevent further script detections ( #9589 )
...
Also the memory allocation triggering the limit was never freed.
And if the exception was thrown in a constructor using placement new, the pre-allocated memory was not freed either.
3 years ago
281a65b3e1
Cleanup: simplify some boolean expressions
3 years ago
a9774f3e34
Cleanup: [Squirrel] Use nullptr instead of 0 or NULL
3 years ago
Jonathan G Rennison
Patric Stout
PeterN
Rubidium
glx22
Blinnikov Pavel
Loïc Guilloux