mvglasow
bf36c875d5
Merge commit 'eb264889e3' into traffic
2025-10-10 18:40:35 +03:00
Wojciech Sipak
9c9c9c8b8b
[cmake] remove shaders_compiler dead code
...
Signed-off-by: Wojciech Sipak <wsipak@protonmail.com >
2025-09-21 19:31:15 +02: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
mvglasow
90d7cadc3f
Merge commit '211e3fb4' into traffic
...
# Conflicts:
# android/app/src/main/cpp/CMakeLists.txt
# android/app/src/main/java/app/organicmaps/sdk/util/Config.java
# android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
# android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
# android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
# indexer/ftypes_matcher.hpp
# iphone/Maps/Maps.xcodeproj/project.pbxproj
2025-08-16 18:04:14 +03:00
Andrei Shkrob
0f744e7cf2
[desktop] Organize desktop resources
...
Signed-off-by: Andrei Shkrob <github@shkrob.dev >
2025-08-16 00:12:24 +07:00
Harry Bond
1e358375c6
[desktop] change id to app.comaps.comaps
...
apparently app.comaps.qt is no good either. this one is confirmed fine
Signed-off-by: Harry Bond <me@hbond.xyz >
2025-08-10 14:40:15 +01:00
Harry Bond
607191503c
[desktop] Change ID from .desktop to .qt
...
required to publish on Flathub, and .desktop is a file extension anyway so it's a bad idea
also some improvements to metadata structure, and add branding colours
and fix the welcome message in qt
Signed-off-by: Harry Bond <me@hbond.xyz >
2025-08-10 10:06:24 +02:00
Andrei Shkrob
8f5c8a5bd7
[data] Refactor resources folder
...
Signed-off-by: Andrei Shkrob <github@shkrob.dev >
2025-08-08 20:47:41 +07:00
mvglasow
034856f033
Merge commit '20c9fc5f' into traffic-2025072304
...
# Conflicts:
# android/app/src/main/res/xml/prefs_main.xml
# qt/CMakeLists.txt
2025-07-28 18:27:49 +03:00
mvglasow
bebac8d8a7
[traffxml] Remove openlr dependency, disable OpenLrV3TraffDecoder
...
Signed-off-by: mvglasow <michael -at- vonglasow.com>
2025-07-28 00:33:25 +03:00
mvglasow
bb410fc3bc
[traffxml] Add module
...
Signed-off-by: mvglasow <michael -at- vonglasow.com>
2025-07-28 00:33:19 +03:00
mvglasow
7b420def17
[qt] Link against openlr library
...
Signed-off-by: mvglasow <michael -at- vonglasow.com>
2025-07-28 00:33:19 +03:00
Viktor Govako
8ec407528f
[qt] Added missing _outdoors_ files to the bundle.
...
Signed-off-by: Viktor Govako <viktor.govako@gmail.com >
2025-06-07 15:00:45 +02:00
Konstantin Pastbin
54ab965822
[cmake] Rebrand desktop version to CoMaps
...
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com >
2025-05-19 20:55:34 +07:00
Andrew Shkrob
ef6ffa299d
[data] Move fonts into a separate folder
...
Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by >
2025-05-19 10:52:42 +02:00
Ferenc Géczi
5110867b38
[platform] Separete the location_service lib
...
Signed-off-by: Ferenc Géczi <ferenc.gm@gmail.com >
2025-05-18 13:36:53 +00: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
