Commit Graph

42053 Commits

Author SHA1 Message Date
b9e11a3a35 Android: Adopt a new versionCode scheme
Right now, we assign a versionCode to each Android build of Dolphin by
counting the total number of git commits made. This has worked fine so
far, but it won't work as-is for the new release process.

Let's say we're currently on commit 20000. If we want to create a
release under the new release process, we would create a release branch,
add a new commit on it that updates the release name in CMake files and
so on, and create a tag for that commit. The Android build of this
release commit would get the version code 20001. However, the master
branch is also going to get a commit with the version code 20001 sooner
or later, and this commit would be an entirely different commit than
commit 20001 on the release branch. This isn't much of a problem for
people downloading Dolphin from dolphin-emu.org, but it's a big problem
for Google Play, as Google Play doesn't allow us to upload two builds
with the same version code.

This commit makes us calculate the Android version code in a new way:
The number of commits times two, and if the current build isn't a
release build, plus 1. (We check whether the current build is a release
build by checking whether there's a tag for the current commit.)

With this new version code scheme, the release commit described in my
example would get the version code 40002, and the master commit would
get the version code 40003. This lets us upload both corresponding
builds to Google Play, and also lets the user switch from the release
build to the development build if they would like to. (Under normal
circumstances, Android forbids installing a build with an older version
code than the currently installed build. Therefore, whether the 1 is
added for release builds or for development builds is a decision with
consequences.)
2024-06-01 17:36:20 +02:00
2b386cdcdc Merge pull request #12812 from LillyJadeKatrin/retroachievements-close-fixes
Properly reset Discord presence after game close
2024-05-31 20:18:22 +02:00
0e6db07203 Merge pull request #12794 from TryTwo/PR_Windows_Initialize_Fix
MainWindow, Bugfix: Initialize geometries before calling GetWindowSystemInfo
2024-05-31 20:00:37 +02:00
171596ac74 Merge pull request #12315 from Dentomologist/interfacepane_add_balloontips
InterfacePane: Add BalloonTips
2024-05-31 19:41:55 +02:00
de9326bd53 InterfacePane: Add BalloonTip to user style combobox 2024-05-31 19:10:30 +02:00
33b64d6c91 InterfacePane: Add BalloonTip to cursor visible radio buttons 2024-05-31 19:09:00 +02:00
a581fa2bfa InterfacePane: Add BalloonTip to lock mouse checkbox 2024-05-31 19:07:33 +02:00
9ed1688d09 InterfacePane: Add BalloonTip to pause on focus lost checkbox 2024-05-31 19:06:50 +02:00
14f01bb12c InterfacePane: Add BalloonTip to show active title checkbox 2024-05-31 19:06:11 +02:00
c5532b19e6 InterfacePane: Add BalloonTip to enable on-screen display checkbox 2024-05-31 19:05:35 +02:00
16cdd0a961 InterfacePane: Add BalloonTip to use panic handlers checkbox 2024-05-31 19:04:57 +02:00
dc15a555c9 InterfacePane: Add BalloonTip to confirm on stop checkbox 2024-05-31 19:04:18 +02:00
d1ac66824e InterfacePane: Add BalloonTip to disable screensaver checkbox 2024-05-31 19:03:19 +02:00
26758716ae InterfacePane: Add BalloonTip to use covers checkbox 2024-05-31 19:01:43 +02:00
78ab53a6e4 InterfacePane: Add BalloonTip to focused hotkeys checkbox 2024-05-31 19:01:03 +02:00
afe5bfd512 InterfacePane: Add BalloonTip to debugging enabled checkbox 2024-05-31 18:59:24 +02:00
7d704ca9ca InterfacePane: Add BalloonTip to language combobox 2024-05-31 18:57:28 +02:00
266bbeefc8 InterfacePane: Add BalloonTip to top window checkbox 2024-05-31 18:52:22 +02:00
55aaa323ec InterfacePane: Add BalloonTip to theme combobox 2024-05-31 18:52:13 +02:00
ae0914174f InterfacePane: Add BalloonTip to title database checkbox 2024-05-31 18:25:47 +02:00
072b6cdb1d Merge pull request #12797 from mitaclaw/branch-watch-tool-fixes-1
Branch Watch Tool: Fixes
2024-05-31 18:11:36 +02:00
cd9521f293 Merge pull request #12807 from TacoTheDank/cleanupProguard
Android: Clean up ProGuard
2024-05-31 17:41:20 +02:00
729669f7b1 Merge pull request #12808 from TacoTheDank/fixGradleDeprecation
Android: Fix Gradle deprecation
2024-05-31 17:40:26 +02:00
c3e0aeb184 Merge pull request #12728 from OatmealDome/mac-version-numbers-2
ScmRevGen: Generate Info.plist files containing the current version
2024-05-30 01:13:32 -04:00
8ac22378a1 Merge pull request #12814 from Tilka/verify_wad
DolphinTool: support WAD verification
2024-05-28 20:48:15 +01:00
5255fe5f74 DolphinTool: support WAD verification 2024-05-28 19:00:00 +01:00
8e33a5778e Properly reset Discord presence after game close
Also fixed an Achievement log that was reporting even when achievements were disabled.
2024-05-27 17:52:13 -04:00
8582644058 Merge pull request #12796 from JosJuice/interpreter-cr0-so-gt
Interpreter: Fix GT when setting SO of CR
2024-05-26 17:57:06 +01:00
14e68a0f4b Merge pull request #12804 from Tilka/drop_unused_overload
DiscIO: drop unused Volume::CheckContentIntegrity() overload
2024-05-26 17:17:49 +01:00
921d711113 Jit: Clarify FixGTBeforeSettingCRFieldBit comment 2024-05-26 08:32:25 +02:00
51f4dfabc2 Android: Fix Gradle deprecation 2024-05-25 22:13:25 -04:00
5a6fbc4c57 Android: Clean up ProGuard 2024-05-25 21:56:19 -04:00
4619db2ae9 DiscIO: drop unused Volume::CheckContentIntegrity() overload
The offset-based overload hasn't been in use since
f754a1a548.
2024-05-26 00:10:26 +01:00
8167a046ef Merge pull request #12793 from Pokechu22/minimum-compilers-for-bitcast
CMake: update required compiler versions for std::bitcast support
2024-05-25 23:23:58 +01:00
f35e8e62e6 Merge pull request #12795 from JosJuice/remove-isbranchtarget
PPCAnalyst: Remove unused member isBranchTarget
2024-05-25 23:10:17 +01:00
52f51d0d87 Merge pull request #12802 from JosJuice/ppcanalyst-bi-shift
PPCAnalyst: Fix handling of FL_READ_CR_BI
2024-05-25 23:01:45 +01:00
30eff8e37c PPCAnalyst: Fix handling of FL_READ_CR_BI
BI contains both the field and the flag (5 bits total), so we need to
shift away the 2 flag bits to get the 3 field bits. (Same as the
CRBA/CRBB handling in the code just below the BI code.)
2024-05-25 18:13:38 +02:00
3b214a4978 BranchWatchDialog: Resolve Linux FIXME
This stopped being an issue for me with a recent package update, so I guess Qt6 was fixed upstream?
2024-05-25 06:22:45 -07:00
4a2ec86a9a Branch Watch Tool: Add Rule Of 5 And Remove Unnecessary Include 2024-05-25 06:22:44 -07:00
ecce8e81c8 BranchWatchDialog: Case-Insensitive Sorting 2024-05-24 15:42:04 -07:00
46dc406325 Interpreter: Fix GT when setting SO of CR
This is the same fixup as in Jit64::FixGTBeforeSettingCRFieldBit.
2024-05-24 21:21:46 +02:00
f6aca69ea0 PPCAnalyst: Remove unused member isBranchTarget
Branch targets always start a new block, so this variable isn't useful.
2024-05-24 20:51:39 +02:00
222a393080 Merge pull request #12782 from brad0/openbsd_arm64
Add OpenBSD/arm64 support.
2024-05-23 21:38:57 +02:00
f991610052 Merge pull request #12778 from LillyJadeKatrin/retroachievements-default-badges-v2
RetroAchievements - Default Badges
2024-05-23 21:38:30 +02:00
1e9e0cd2d7 Remove names from badge objects
The names attached to the BadgeStatus object are obsolete and unneeded and are removed from everything that uses them. All BadgeStatus references are updated to just Badge.
2024-05-23 21:29:23 +02:00
3b61b6d816 Add Default Achievement Badges
The defaults get loaded in by Dolphin at emulator start, and are used if the badge that would normally be displayed has not for whatever reason been downloaded yet. Badges attached to this PR are placeholders (MayIMilae is designing permanent badges) and reside in Sys\Load\RetroAchievements.
2024-05-23 21:29:15 +02:00
dc8f3f6eae Refactored Achievement Badges into Texture Layers
Achievement badges/icons are refactored into the type CustomTextureData::ArraySlice::Level as that is the data type images loaded from the filesystem will be. This includes everything that uses the badges in the Qt UI and OnScreenDisplay, and similarly removes the OSD::Icon type because Level already contains that information.
2024-05-23 10:41:45 -04:00
75465f00cc Remove Badges Enabled option from Achievements
Was informed by the RetroAchievements team that this isn't an option in most emulators, and as the next commits will be to enable default icons, there will always be something to display.
2024-05-23 10:40:08 -04:00
564d4c3c25 MainWindow: Initialize geometries before calling GetWindowSystemInfo.
On Windows:
wsi.render_window being set will set/save the initial geometry, which will cause sizing bugs until it's set again by the user resizing/repositioning.
2024-05-22 21:27:50 -07:00
e0e09d1074 Merge pull request #12792 from JosJuice/android-vibrators-crash
Android: Fix crash when no devices have outputs
2024-05-23 00:04:05 +02:00