Pull Request №6549 RosettaCommons/main/interactive/develop ← RosettaCommons/main/interactive/petrides/mac_build_fix Merge: ee98812c8c2a500eeab7d757eb0a30eacb73ce67←35db5806051e8d00974e4e3b797c9723a5747604 [Foldit] Update to XCode Project to Work with More Recent Apple Clang Versions ---------------- Merge commit message: changes i had to add to get mac to build from interactive/develop

• Summary
• foldit.build.release

Pull Request №6547 RosettaCommons/main/interactive/develop ← RosettaCommons/main/interactive/petrides/fix_rephase_for_tracks Merge: 166a64d78b6dc9d35fc9b69f6445ef5afbc0305d←b4f93d51ffbbfee3654e66d2069c1ffb1adc3013 [Foldit] Fix Crash For Set Track in Density Refinement Puzzles ---------------- Merge commit message: deleted lingering cout

• Summary
• foldit.build.release

Pull Request №6545 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccomoretti/fix_autoupload Merge: f85b24d5cf84088582b384390fc818c73c699692←857a237b3daca1e3b6f9ab1d7e7e7fc785635631 [Foldit] Address race condition in auto solution upload. ---------------- Merge commit message: [Foldit] Address race condition in auto solution upload. We're currently getting disk usage errors with the auto solution upload. It looks like the cause is a race condition where the main thread is adding to the same data structure that the solution thread is uploading from, which results in fresh solutions being immediately uploaded, rather than waiting for the next upload window. We can move the to-upload data to a local data structure to avoid the race condition. (We just need to make sure to copy the not-yet-uploaded data back if we encounter a server error.)

• Summary
• foldit.build.release
• foldit.unit.debug 「1」

Pull Request №6530 RosettaCommons/main/interactive/develop ← RosettaCommons/main/interactive/petrides/density_optimizations Merge: c9fc6287ed4767ddb2d5854d6b2f2220604227d7←b5ace659825ba014f5a39075a1043fa33c22ec3d [Foldit] Optimizations to Density Refinement For Large Puzzles ---------------- Merge commit message: runtime assert

• Summary
• foldit.build.release
• foldit.unit.debug 「1」
• foldit.unit.release 「1」

Pull Request №6543 RosettaCommons/main/interactive/develop ← RosettaCommons/main/interactive/petrides/trim_untrim_lua_tweak Merge: 7bad3604cacf301d76508e0c1e8507638c7b52ef←745f8624de604b1108ce3dbcc9fd2e87fa0bf744 [Foldit] Fix Method Used to Error on Bad Conditions for Trim and Untrim in Lua ---------------- Merge commit message: working

• Summary
• foldit.build.release

Pull Request №6530 RosettaCommons/main/interactive/develop ← RosettaCommons/main/interactive/petrides/density_optimizations Merge: c9fc6287ed4767ddb2d5854d6b2f2220604227d7←aca65f8aed05a56a2672204841cf1481ccc685b8 [Foldit] Optimizations to Density Refinement For Large Puzzles ---------------- Merge commit message: fixes based on PR feedback

• Summary
• foldit.build.release
• foldit.unit.debug 「1」

Pull Request №6539 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccomoretti/solutions_dialog Merge: d7a834818f06ce4480d2758106fff49770c44e6f←038368eebcb5eba1712ea896c285039bd619e8e7 [Foldit] Add download dialog for solution list. ---------------- Merge commit message: [Foldit] Add download dialog for solution list. Player are complaining about not being able to fetch the list of shared solutions. This converts the solution list fetching to be behind the recently added Downloader dialog popup.

• Summary
• foldit.build.release
• foldit.unit.release 「1」

Pull Request №6537 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccmoretti/network_popup Merge: ca646d3afc7b461eb707a6a23da205b6f10ccf01←d54f4b57974335b6b62e8b17e175a94cd241945a [Foldit] Add loading/progress dialog popup for puzzle and solution loading. ---------------- Merge commit message: Annotate checked function wrapper better.

• Summary
• foldit.build.release
• foldit.unit.release 「1」

Pull Request №6537 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccmoretti/network_popup Merge: ca646d3afc7b461eb707a6a23da205b6f10ccf01←67bb96e8c350ddfd86254b650dd2a937e6f3dda7 [Foldit] Add loading/progress dialog popup for puzzle and solution loading. ---------------- Merge commit message: Add soft crash in the cases where we can't upload the solution results.

• Summary
• foldit.build.release

Pull Request №6537 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccmoretti/network_popup Merge: ca646d3afc7b461eb707a6a23da205b6f10ccf01←8a5dfc625b39dd561c352160922e54259c36106b [Foldit] Add loading/progress dialog popup for puzzle and solution loading. ---------------- Merge commit message: Update the clock imaged for the loading dialog.

• Summary
• foldit.build.release
• foldit.unit.debug 「1」

Pull Request №6535 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccomoretti/server_timeout_adjust Merge: c9fc6287ed4767ddb2d5854d6b2f2220604227d7←3d2488d50ff4079dd687f6252304a23f03aac533 [Foldit] Update solution/puzzle timeout to be longer. ---------------- Merge commit message: [Foldit] Update solution/puzzle timeout to be longer. This extends the server timeout for puzzle and solution interaction with the server to 10s. Hopefully this should be a band-aid to address some of the issues players are seeing. (If it doesn't, we likely need to also change how the UI works.)

• Summary
• foldit.build.release
• foldit.unit.debug 「1」

Pull Request №6533 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccmoretti/server_unavailable Merge: a44f5aacc9eac414632ee7b1ee9083ff218814fe←305d8d7b561b41759e91b476816ac4892b4e6d69 [Foldit] Add timeout for server communication ---------------- Merge commit message: Spilling

• Summary
• foldit.build.release
• foldit.unit.debug 「1」
• foldit.unit.release 「2」

Pull Request №6533 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccmoretti/server_unavailable Merge: a44f5aacc9eac414632ee7b1ee9083ff218814fe←535e132ae07ed69e69abd7a6924ece194cc3be38 [Foldit] Add timeout for server communication ---------------- Merge commit message: Centralize login timing, update standard timeout to 3s

• Summary

Pull Request №6533 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccmoretti/server_unavailable Merge: a44f5aacc9eac414632ee7b1ee9083ff218814fe←5f7a00f3d6fc1b2c240ae53c30ec7c660a3f60dd [Foldit] Add timeout for server communication ---------------- Merge commit message: Add a timeout for login as well. With a zombie server, we need to give players feedback when logging in.

• Summary
• foldit.build.release
• foldit.unit.debug 「1」

Pull Request №6532 RosettaCommons/main/interactive/develop ← RosettaCommons/main/roccomoretti/queue_play_events Merge: a44f5aacc9eac414632ee7b1ee9083ff218814fe←e1b92325a21257758ec0cb581c3ac644cbc20ffe [Foldit] Convert play event logging to use a deferred queue ---------------- Merge commit message: Fix test compilation

• Summary
• foldit.build.release
• foldit.unit.debug 「1」
• foldit.unit.release 「1」

Pull Request №6530 RosettaCommons/main/interactive/develop ← RosettaCommons/main/interactive/petrides/density_optimizations Merge: a44f5aacc9eac414632ee7b1ee9083ff218814fe←f9a320a2f0e6c719eaa5ffc88fdc490d3aa3b187 [Foldit] Optimizations to Density Refinement For Large Puzzles ---------------- Merge commit message: cleaning up unwanted couts

• Summary
• foldit.build.release
• foldit.unit.debug 「1」

Legend: