vdd
synced commits to master at vdd/destiny-2-Sunrise from mirror
a57dc9a9e7 Merge pull request #84 from Nyxaraa/triumph-work-code
Implement Triumphs, lore collectibles, titles, seasonal progression, Artifact perks, bonus power, and reward publication
fd1c441026 Follow master's #75 and #87 shapes in the merged web and push paths
Master's #87 dropped the 901 codec's clock policy helpers, so the artifact purchase lines report the request fields only. Its change-ring globals in the family-4 inventory updates now own kChangeKind and kChangeFlags, so the two local copies go. Master's #75 profile-setup commit logs through core::log, which the account runtime now includes.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017y4GeUXaw46fq2mDFGBVHN
74ec77add4 Merge remote-tracking branch 'origin/master' into triumph-work-code
# Conflicts:
# Sunrise/src/client/content/items/packages/package_item_build.cpp
# Sunrise/src/middleware/datagen/family4/loadout/loadout_item_resolver.cpp
# Sunrise/src/server/bap/encrypted/body/bap_service_body.cpp
# Sunrise/src/server/bap/encrypted/push/snapshot/family4_inventory_updates.cpp
# Sunrise/src/server/web_service/web_service_actions.cpp
# Sunrise/src/server/web_service/web_service_runtime.cpp
# Sunrise/src/state/build_data/cache/records/format.h
# Sunrise/src/state/runtime/state_account_acquisition_runtime.cpp
# Sunrise/src/state/runtime/state_account_profile_runtime.cpp
571fa8a36c Guard the new build-data catalogs with SrwLock
Master's #91 removed the build_data Lock type. The records, rewards, nodes and SObject catalogs still used it, so they follow the sibling catalogs onto core::threading::SrwLock with std::lock_guard and std::shared_lock.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017y4GeUXaw46fq2mDFGBVHN
17376ccb6e Merge remote-tracking branch 'origin/master' into triumph-work-code
# Conflicts:
# Sunrise/resources/default_settings.json
# Sunrise/src/client/content/items/packages/package_item_build.cpp
# Sunrise/src/middleware/datagen/family4/account/account_encoder.cpp
# Sunrise/src/middleware/datagen/family4/loadout/loadout_item_resolver.cpp
# Sunrise/src/server/bap/bap_route.cpp
# Sunrise/src/server/bap/encrypted/activity_message/receipts/activity_message_receipts.cpp
# Sunrise/src/server/bap/encrypted/body/bap_service_body.cpp
# Sunrise/src/server/bap/encrypted/encrypted_runtime.cpp
# Sunrise/src/server/bap/encrypted/internal.h
# Sunrise/src/server/bap/encrypted/queuez/queuez_deferred_push.cpp
# Sunrise/src/server/bap/encrypted/queuez/queuez_outcome_staging.cpp
# Sunrise/src/server/bap/encrypted/transactions/service_outcome_commit.cpp
# Sunrise/src/server/web_service/web_service_actions.cpp
# Sunrise/src/server/web_service/web_service_runtime.cpp
# Sunrise/src/server/web_service/web_service_runtime.h
# Sunrise/src/state/account/inventory/inventory_state.h
# Sunrise/src/state/build_data/build_data_runtime.cpp
# Sunrise/src/state/build_data/cache/read/cache_payload_reader.cpp
# Sunrise/src/state/build_data/cache/records/codec.h
# Sunrise/src/state/build_data/cache/records/format.h
# Sunrise/src/state/build_data/runtime.h
# Sunrise/src/state/runtime/state_runtime.cpp
- View comparison for these 135 commits »
4 days ago