mvglasow
|
ba2d653a30
|
[3party/protobuf] Fix faulty merge
Signed-off-by: mvglasow <michael -at- vonglasow.com>
|
2025-09-28 13:55:34 +03:00 |
|
mvglasow
|
38e98df6cc
|
Merge commit '05cc660641' into traffic
# Conflicts:
# CMakeLists.txt
# android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
# android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
# libs/indexer/data_source.hpp
# libs/indexer/feature.hpp
# libs/indexer/ftypes_matcher.hpp
# libs/map/framework.cpp
# libs/map/traffic_manager.cpp
# libs/routing/absent_regions_finder.cpp
# libs/routing/edge_estimator.hpp
# libs/routing/index_router.cpp
# libs/routing/index_router.hpp
# libs/routing/routing_session.hpp
# libs/routing_common/num_mwm_id.hpp
# libs/traffic/traffic_info.cpp
# qt/mainwindow.hpp
# qt/preferences_dialog.cpp
# tools/openlr/helpers.hpp
# tools/openlr/openlr_decoder.cpp
# tools/openlr/openlr_decoder.hpp
# tools/openlr/openlr_stat/openlr_stat.cpp
# tools/openlr/router.hpp
# tools/openlr/score_candidate_paths_getter.cpp
# tools/openlr/score_candidate_paths_getter.hpp
# xcode/CoMaps.xcworkspace/contents.xcworkspacedata
|
2025-09-10 21:22:40 +03:00 |
|
Osyotr
|
4117cca562
|
CMake fixes for Windows
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
|
2025-08-18 09:07:05 +02:00 |
|
Osyotr
|
5158ceb311
|
Add windows support to vulkan_wrapper
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
|
2025-08-18 09:07:05 +02:00 |
|
Alexander Borsuk
|
4de9de38ad
|
[3party] Add glaze submodule
Signed-off-by: Alexander Borsuk <me@alex.bio>
|
2025-08-18 09:07:05 +02:00 |
|
Osyotr
|
dfd7af92fa
|
Remove usage of boost/iostreams from 3party/succint
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
|
2025-08-18 09:07:05 +02:00 |
|
Konstantin Pastbin
|
5b05a7ac71
|
[3party] Protobuf MSVC and C++23 fixes
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-08-16 01:15:07 +07:00 |
|
Alexander Borsuk
|
76d8396cb1
|
[3party] Updated Vulkan headers to v1.4.322
Signed-off-by: Alexander Borsuk <me@alex.bio>
|
2025-08-16 00:19:01 +07:00 |
|
Yannik Bloscheck
|
074d443f0f
|
More rebranding including the team identifier, url scheme, and links on about screen
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-06-15 18:33:52 +07:00 |
|
Matheus Gomes
|
d4e1d53c40
|
Rebranded the app for iOS
|
2025-06-15 18:32:35 +07:00 |
|
Alexander Borsuk
|
fad1da2f6c
|
[mac] Fix shaders_metal target build error
Signed-off-by: Alexander Borsuk <me@alex.bio>
|
2025-06-02 13:59:04 +02:00 |
|
Viktor Govako
|
5bc6e6ded6
|
[3party] Don't build gflags exec.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
|
2025-06-02 13:59:04 +02:00 |
|
Alexander Borsuk
|
f0d813d676
|
[3party] Updated jansson and gflags for cmake 4+ compatibility
Signed-off-by: Alexander Borsuk <me@alex.bio>
|
2025-06-02 13:59:04 +02:00 |
|
Konstantin Pastbin
|
e3e4a1985a
|
Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)
To expand with full Organic Maps and Maps.ME commits history run:
git remote add om-historic [om-historic.git repo url]
git fetch --tags om-historic
git replace squashed-history historic-commits
|
2025-05-08 21:10:51 +07:00 |
|