Repository navigation
Release 3.1.0 - #605
Open
Osiris-DevWorks wants to merge 43 commits into
Open
Release 3.1.0#605Osiris-DevWorks wants to merge 43 commits into
Osiris-DevWorks wants to merge 43 commits into
Conversation
Branch-opening commit for the 3.1.0 integration target. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFfwPYBmRRqt4rroHKi
release.yml signs SmartCitizen.exe (and the bundled unp4k/unforge), the installer and the portable .exe files, then zips the portable folder again with the new build_exe.py --portable --zip-only. Every signing step is skipped until the AZURE_SIGNING_ACCOUNT repository variable is set, so releases keep working unsigned until the Azure account is ready. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFg4JmXaXwTRySyJEQW
Inno now signs Setup.exe and the uninstaller itself through scripts/build/sign_file.ps1 when release.yml compiles with /DSIGN, so the separate installer signing step is gone. Every release gets a build provenance attestation, and a VirusTotal scan whose links go into the release notes once the VIRUSTOTAL_API_KEY secret is set. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFg4JmXaXwTRySyJEQW
The drawer docked to the primary screen and the scan decoder captured it, so with the game on a second monitor the drawer was on the wrong screen and nothing was read. A running overlay now looks for the game window once a second (FindWindowW by class or title, MonitorFromWindow, GetMonitorInfoW: no process handle, memory read, hook or input) and docks the drawer and captures on that screen, falling back to the primary screen when the game is not found. The capture now passes screen-local coordinates to grabWindow, which counts from the screen's own top-left. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFgfzN2geRf5Nsc5cKP
A Config tab tick box, off by default. When ticked, minimising hides the window in the system tray instead of the taskbar, and the tray icon brings it back as it was (maximised stays maximised). Its menu has Show Smart Citizen and Quit, and the first trip to the tray ever shows a notice that Smart Citizen is still running. The overlay keeps running while the window is in the tray. While the window is in the tray, a second start brings it back instead of opening another copy. The hidden copy listens on a local socket named for the settings it uses, and main() asks before any migrator or window, with plain Windows pipe calls, after handing on its right to bring a window to the front. Qt's pipes have no buffer, so the request's write finishes only once the copy has read it, and one not read within 5 s is taken back: a busy copy stays in the tray while the new start opens, never both. A copy on screen does not listen, so a second copy still opens beside it. The window is not hidden with a modal box open or with no system tray, the app's quit-on-last-window rule is off while it is hidden, and a close while hidden quits the app. The texts are in all 12 languages, with two sentences in HELP's Appearance section and one in the guided tour's Appearance step, which keeps the step's text from release/3.0.1 whole. Fixes #577 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
languages/TRANSLATIONS.md said HELP's Appearance bullet gains two sentences. It gains three, and the first commit's message should have said three as well. The root CLAUDE.md row for minimize to tray now names src/gui/global_hotkey.py and allow_any_foreground(), which the second start calls first to hand on its right to bring a window to the front. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…36sm Overlay: follow the monitor Star Citizen is on (#573)
They ship in 3.0.1 from claude/project-thread-i51q3v-scan; this PR keeps only the code signing for 3.1.0. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFg4JmXaXwTRySyJEQW
A fourth drawer section builds a crafting order the way RK Crafting Central does, from our own DataForge extraction: - The generator reads each blueprint's slots, pick groups and quality curves, plus the stat names in crafting/craftedproperties (now kept by unforge), and writes them to crafting_index.json as version 2. - crafting_order.py holds the order maths: one line per item, totals by material and quality band, pick groups and stat bonuses. - The Order section shows the order summary on top (SCU or cSCU, Copy, Watch minerals, Clear), a search, and one collapsible card per item with a quality slider per slot and its bonuses. Items whose blueprint isn't owned are marked, and material tooltips say where to mine them. - The order is saved in settings and kept out of profile defaults. New strings in every language, Help, the test plan and the CLAUDE.md files are updated. The XML field names follow the public DataForge parsers and still need checking on a LIVE cache. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
- Keep blueprints whose materials no carryable names. They were dropped, which hid most of the catalogue (NDB-30 among them) and looked like an owned-only filter. Item materials are named from their entity (crafting_index.json "mnames"); the rest show as an unknown material. - Add an Owned only box under the Order search, off by default and saved. - Owned changes now refresh the Order cards and results at once, and names match through the Blueprint Tracker's normalizer. - Save an order under a typed name as orders/<name>.json in the data folder, and load one back from a Saved orders list. A name already saved needs a second click. The orders folder moves with Setup's OneDrive move. - Translations in all 12 languages, HELP, test plan and CLAUDE.md updated. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
- Clear becomes New order, on its own row under the saved orders. It empties the order and the save name on a second click. The armed text is a short "Sure?" and the why goes in the status line, because "Click again to clear" ran off the drawer. A test keeps the armed text no longer than the label in every language. - Delete, beside Load, deletes the picked saved order on a second click (crafting_order.delete_saved_order). The order being built stays. - Strings in all 12 languages, HELP.md in each, test plan, notes, tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
scan_crafting_blueprints took an item's name only from the blueprint's entityClass. Where CIG ships a blueprint ahead of that link, or base.ini has no text for the linked name, the item kept its file name (mxox_neutronrepeater_s3), so the Order and Crafting searches could not find NDB-30 and the like by name. _crafted_item_name now follows the chain the mission blueprint lists use: the entityClass, then the entity file named like the blueprint, then the file name. Blueprints still named by file are listed in one INFO line. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
Ores and minerals come at one quality per tier (F to S, then Perfect), not any value from 0 to 1000. ore_qualities.py holds the community's datamined table (Alpha 4.9), pasted as given so a patch's new table can be pasted over it; a short row (Carinite, no F tier) lines up from Perfect down. Each slot whose material is in the table gets its tiers (attach_quality_tiers, in memory), and clamp_quality snaps to the nearest one at or above the slot minimum. The slider marks the tiers with ticks, a groove click moves one tier, the label shows the tier and the tooltip lists them. New, loaded and saved lines snap too. Materials off the table keep any quality. Strings in all 12 languages, HELP.md, test plan, notes, tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
Amr: each ore and mineral's slider also stops at 0, 500 and 1000 (ore_qualities.ALWAYS_STEPS), so a new line stays at the neutral 500. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
Share the owned blueprints through a folder the player's cloud app already syncs. Each PC writes only its own machine-<id>.json in a 'Smart Citizen Sync' folder and reads everyone's; the newest change per blueprint wins, so a blueprint moved back to Available stays there. - src/utils/smart_sync.py: Qt-free ledger, merge and folder sync - AppSettings: smart_sync/* keys (excluded from backups), the ledger recorded by set_owned_items, Import Settings adds while sync is on - SmartSyncWorker; MainWindow syncs at startup, after Owned changes, when the folder changes, and pushes a pending change at close - Config tab: Smart Sync folder picker, Turn Off, status line - UI strings and HELP in every language (AI text for non-English) - tests/test_smart_sync.py Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFfzZY3bs9NpC8k6upk
The stat labels, mission details and journal lines the enhancement generator adds now go through _t(), keyed by the English text, and each language's languages/<lang>/enhancements.json holds its words (ht/at, like ui.json). English output is unchanged. All 11 languages have AI drafts of the 207 texts. A translated language's enhancements stamp carries its table's fingerprint, so a table change regenerates. Each start also fetches the selected language's community global.ini again when its source is a URL (a conditional request), and reloads with it when it changed, so a translation fixed after a game patch arrives without switching language. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFgcUnWwdd1hCc8rBH1
release/3.1.0 was cut from main at 3.0.0, before 3.0.1 shipped, so it lacked every 3.0.1 change. Conflicts resolved: - VERSION.TXT: keep 3.1.0. - sco_overlay.py: keep #573's screen following beside 3.0.1's drawer pass-through (#582) and hotkey key check (#587); the drawer docks to the game's screen and keeps within_device_pixels on that screen. - src/gui/CLAUDE.md, tests/CLAUDE.md: 3.0.1's text plus #573's lines. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFjEDADY2PnfwNXEq9T
A PTU folder linked to LIVE crashed the first launch after an update with WinError 448. Setup's "Launch Smart Citizen" ran the app as admin, and Windows won't let an elevated process follow a link a normal user made. Path.exists() lets that error through. - get_available_channels() treats a Data.p4k it can't check as missing. - The installer's launch entry runs as the original user. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFfH6SHBcWCQMC5hLfC
A cargo size such as "12,000 µSCU" read as a mining signature. The digit-tall "SCU" joined the row as more digits, which the row cut off after the comma's three, and the short "µ" never joined it. A row now counts only when nothing follows its last digit: no more digits in the chain, and no glyph-sized blob on its line within a digit height. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFgdq8vw74YyHjU5uBf
A magnifying glass tab with a search box: type an item and each match expands to the shops that sell it, with place, system and price, cheapest first. Shop data comes from UEX's free API, cached for 12 hours per channel and used as-is when UEX can't be reached. Fetched in a worker thread only while the overlay runs with the finder on. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFfydz67s94FUZMXX7e
…ty0t Add an Item Finder tab to the SCO drawer
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFfzZY3bs9NpC8k6upk
Conflicts resolved: - test_plan.py: keep 3.0.1's plan and add #606's Item Finder section. - src/gui/CLAUDE.md, src/utils/CLAUDE.md, tests/CLAUDE.md: keep both sides' changes to each entry. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFjEDADY2PnfwNXEq9T
…art-citizen into claude/project-thread-j441kl # Conflicts: # src/gui/CLAUDE.md
Keeps both the Order tab and the Item Finder tab (#606). The Order tab stays fourth in the drawer and the Item Finder is fifth. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFh8a2Z97Zp74A8nwtS
…ris-DevWorks/smart-citizen into claude/project-thread-iu0mzj # Conflicts: # src/utils/CLAUDE.md
Code reviewNo issues found. Checked for bugs and CLAUDE.md compliance. |
release.yml: keep both permission sets (id-token for the Azure login and the attestation, attestations: write) and both job env values (SIGN and VT_KEY_SET). CLAUDE.md: keep the Code signing and Download checks notes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFhCB4hwYZDdSQcaeNF
Tour Appearance step (tutorial.json and the 11 ui.json files): keep this branch's line, which already has 3.0.1's font size text plus the tray sentence. TRANSLATIONS.md: keep both logs, this one first. global_hotkey.py: keep AllowSetForegroundWindow's types; the raw input declarations stay gone, as #587 removed them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFhCB4hwYZDdSQcaeNF
This comment has been minimized.
This comment has been minimized.
…1q3v Sign release builds (Azure Artifact Signing)
Add Minimize to Tray, and bring a hidden copy back (#577)
Doc conflicts only (CLAUDE.md, src/gui/CLAUDE.md, src/utils/CLAUDE.md), both sides kept word for word. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFhCB4hwYZDdSQcaeNF
This comment has been minimized.
This comment has been minimized.
…41kl Show generated stats and mission text in the selected language (#579)
One doc conflict in src/gui/CLAUDE.md: both sides kept, the SmartSyncWorker sentence after the #564 scan workers' one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFhCB4hwYZDdSQcaeNF
…tab branch Merges #598's branch, which holds the latest release/3.1.0, so this runs CI on what release/3.1.0 will be once both are in. Doc conflicts only (CLAUDE.md, src/gui, src/utils and tests CLAUDE.md), both sides kept; the drawer still lists Order fourth and the Item Finder fifth. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFhCB4hwYZDdSQcaeNF
This comment has been minimized.
This comment has been minimized.
…wdni Smart Sync: keep Owned blueprints the same across PCs (#567)
…zcf5 Add the Order tab to the overlay drawer
This comment has been minimized.
This comment has been minimized.
Each item's shops now sit under their star system, in the game's order, cheapest first in each. Long item and shop names wrap inside the panel instead of being cut off (a tree with word wrap sizes rows for one line, so a delegate works the wrapped height out). A shop's tooltip gives its place and price instead of the date the price was reported. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFfydz67s94FUZMXX7e
…ty0t SCO Item Finder: group shops by system, wrap long names, price tooltip
…609) * Add Karolinger Guides links to the footer, Help and the tour (#602) - Footer: Karolinger Guides logo right of the Discord link, opening the Smart Citizen guides page. Footer images now load through one helper, MainWindow._footer_pixmap(). - Help: a Guides section in every HELP.md, its link written as a token that the Help panel swaps for the URL. - Tour: a last step (22) on the logo with a link to the video tutorial; the coach mark can show a link under a step's description. - Both links are placeholders in src/utils/karolinger.py until the real pages exist. - Strings in every language; tests in tests/test_karolinger_guides.py. Closes #602 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFefbjyv8XR9NfafqHK * Shorten the Karolinger Guides footer logo so the footer fits a 900 px window (#602) At 40 px tall the footer grew past the narrow window width and brought up the window-level scroll bar (test_tab_scrollbar_placement). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011hqxFefbjyv8XR9NfafqHK --------- Co-authored-by: Claude <noreply@anthropic.com>
|
📦 Tester installer built for this PR
Testers need a GitHub account but no special repo permissions. The download is a zip; inside is |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requested by Amr · project thread
Merges
release/3.1.0intomain. Merging this ships 3.1.0 (tag, GitHub release, Discord post). Release notes:docs/3.1.0-RELEASE-NOTES.md(to be written).In this release
Before merging
build-installerandbuild-portablelabels on this PR.🤖 Generated with Claude Code
https://claude.ai/code/session_011hqxFjEDADY2PnfwNXEq9T