391b80d59a
Fix: Check max member count in squirrel classes ( #10883 )
...
Manual cherry-pick from 23a0620658c880157518
1 year ago
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
a541b8217d
Codechange: use fmt::format to build Squirrel error message
1 year ago
43c1b42a2c
Revert "Revert "Codechange: Explicitly move a few variables to avoid a copy constructor (fixes warning from clang)""
...
This reverts commit a99418cb69
1 year ago
bc07331056
Remove src/3rdparty/optional
1 year ago
10e12154f5
Fix: false positive warning in fmt library (backport ef55d4f of upstream fmt)
1 year ago
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
c880157518
Fix: Check max member count in squirrel classes ( #10883 )
...
Manual cherry-pick from 23a0620658
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
101e4e54a1
Fix d9a04ba446: Ensure MD5Hash is initialized. ( #10876 )
...
Not all instances need to be initialized as often they are copied or
written to, but doing all ensures no surprises.
Move the ^= operator to MD5Hash while we're at it.
1 year ago
db3b086a52
Fix #10867 , 8b93e45: Squirrel compile error exception type changed ( #10869 )
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
eb635b85bb
Fix: work around GCC compiler bug #105120 in fmt
...
The fmt code pushes a pragma option, and later pops is. The intrinsics code
interacts with it via the __OPTIMIZE__ macro. This has been set by the pragma
option push, but not unset/reset to the original with the pop.
Since the pragma is only used for the GCC compiler (not Clang, not MSVC, not
ICC) and in debug mode, just remove the whole pragma handling for it.
1 year ago
187fa3f214
Codechange: update to fmt 10.0.0 and add formatting support for chrono and std types
1 year ago
8d2a0a7da4
Fix #10846 : [Squirrel] Ensure sqvector size does not overflow ( #10848 )
1 year ago
d9a04ba446
Codechange: make the MD5 hash/digest/checksum variables a std::array
1 year ago
e035705239
Codechange: introduce and use std::string variant of sq_throwerror
1 year ago
6e3d3c0e7c
Codechange: introduce std::string variant of sq_pushstring
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
2 years ago
012fd2be0d
Codechange: Suppress warnings when asserts are disabled
2 years 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
3 years ago
ab17deae3a
Random bytes: Fix minor compilation warnings
3 years ago
eb22b49758
Add randombytes lib to src/3rdparty
3 years ago
91f6c6941a
Add monocypher lib to src/3rdparty
3 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
c811d42d0c
Fix a99ac62: fmt's include of cassert breaks our assert logic
3 years ago
662d8dfc30
Add: minimal set of headers from {fmt} 7.1.3 to 3rdparty
3 years ago
00e3fddd0c
Fix: [MinGW] Unused squirrel code triggering a warning
3 years ago
28e90769f7
Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had
...
While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
3 years ago
7274432987
Fix #9267 , 47a99bb: [Squirrel] Heap use after free
...
Due to 47a99bb5c01f9ea52#256
3 years ago
5c01f9ea52
Fix #9267 , 47a99bb: [Squirrel] Heap use after free
...
Due to 47a99bb
3 years ago
1e4161ff56
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
3 years ago
44d1b964bf
Fix #7513 : recursive array/class/table release caused stack overflow
3 years ago
47a99bb676
Fix #7513 : recursive garbage collection caused stack overflow
3 years ago
edfa04286b
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release.yml
# bin/CMakeLists.txt
# src/dock_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/indonesian.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/object_gui.cpp
# src/pathfinder/yapf/yapf_costrail.hpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_cmd.cpp
# src/roadveh_cmd.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
3 years ago
dd798d688b
Fix #8919 : Release builds with asserts enabled ( #8925 )
3 years ago
591ea9862d
Codechange: Suppress warnings when asserts are disabled ( #8916 )
3 years ago
f4e29071be
Merge tag '1.11.0-beta2' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
3 years ago
9a069faa01
Codechange: [Win32] Try to get an OpenGL 3.2+ context if possible.
3 years ago
ef478ade64
Add: [Win32] Video driver that uses OpenGL to transfer the video buffer to the screen.
3 years ago
0d385c9688
Use 3rd party optional wrapper, always use local verison on Apple
3 years ago
aaeba6887c
Revert "Cleanup: use std::optional instead of custom implementation."
...
This reverts commit 484ea62a62
3 years ago
84eef99eaa
MinGW std: 🧵 suppress redundancy warning for non-debug builds
...
See: #216
3 years ago
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
3 years ago
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
3 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
484ea62a62
Cleanup: use std::optional instead of custom implementation.
4 years ago
22c3a01069
Comment out additional includes of <cassert>
...
This overrode our own assert handler in stdafx.h
4 years ago
3adeff1883
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
4 years ago
cf8ea74733
Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake
4 years ago
64b1c70fdd
Codechange: Add WARN_FORMAT to vseprintf and fix the cascade of warnings that followed
4 years ago
9895ced6af
Fix: Silence some warnings when building with clang-cl on VS 2019
...
Clang-cl presents as both _MSC_VER and __clang__ in the preprocessor which makes some things confusing.
4 years ago
56d54cf60e
Add: introduce CMake for project management
...
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.
Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.
This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.
Addtiionally, this heavily improves our detection of libraries, etc.
4 years ago
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
8aef14386f
Add: Optional implementation of std::optional for pre-C++17 compilers.
...
Sourced from https://github.com/akrzemi1/Optional , Boost Software License, Version 1.0.
4 years ago
babe98cdb1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network_server.h
# src/pathfinder/yapf/yapf_road.cpp
# src/viewport.cpp
4 years ago
196157b29e
Fix #7966 : SQInteger is 64-bit, print it as 64-bit
4 years ago
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
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
e81697c363
cpp-btree: Fix -Wdeprecated-copy warnings on GCC 9
5 years ago
Loïc Guilloux
Jonathan G Rennison
Rubidium
PeterN
Patric Stout
glx22
Blinnikov Pavel
Charles Pigott
Michael Lutz
frosch
TechGeekNZ
Niels Martin Hansen
S. D. Cloudt