ShuriZma
0 Followers · 0 Following
Repositories
22
 Projects Packages Public Activity Starred Repositories
ShuriZma synced commits to refs/pull/12192/merge at ShuriZma/pcsx2 from mirror 2025-01-30 04:07:14 +00:00
fd3ccb8b40 Merge 5ca1f48c26bfd7b56b1a2d89f3ac29b0579b0b61 into 32a67c48e05424996115dcd8565428b418a8eefd
32a67c48e0 Qt: Add Wiki and Documentation to 'Help' menu
Compare 2 commits »
ShuriZma synced commits to refs/pull/12201/merge at ShuriZma/pcsx2 from mirror 2025-01-30 04:07:14 +00:00
8a92a8b73f Merge 7f8985124ba0d6db572e89d5a614388d9375156c into bf8693a7e8546f1ec3bcb8a71603d9e460430b5e
bf8693a7e8 [ci skip] Qt: Update Base Translation.
Compare 2 commits »
ShuriZma synced commits to refs/pull/12235/merge at ShuriZma/pcsx2 from mirror 2025-01-30 04:07:14 +00:00
dbd71e8944 Merge 7c2d93034d02758cec9f9e16fb891bb2915ceaac into bf8693a7e8546f1ec3bcb8a71603d9e460430b5e
bf8693a7e8 [ci skip] Qt: Update Base Translation.
Compare 2 commits »
ShuriZma synced commits to refs/pull/12239/merge at ShuriZma/pcsx2 from mirror 2025-01-30 04:07:14 +00:00
07fed96c04 Merge 15ffee7d8d29d7a50cfd3cce2255f29e3f01b36a into bf8693a7e8546f1ec3bcb8a71603d9e460430b5e
bf8693a7e8 [ci skip] Qt: Update Base Translation.
Compare 2 commits »
ShuriZma synced commits to refs/pull/12241/merge at ShuriZma/pcsx2 from mirror 2025-01-30 04:07:14 +00:00
80ff25dbd6 Merge cdc89aa574d60b8cee7c4390086e1a72e9dc1a25 into bf8693a7e8546f1ec3bcb8a71603d9e460430b5e
bf8693a7e8 [ci skip] Qt: Update Base Translation.
Compare 2 commits »
ShuriZma synced commits to refs/pull/6553/merge at ShuriZma/pcsx2 from mirror 2025-01-30 04:07:14 +00:00
fb4680f897 Merge 01bd6f56ead31a71de859cad7565fdea0bd3bb07 into bf8693a7e8546f1ec3bcb8a71603d9e460430b5e
bf8693a7e8 [ci skip] Qt: Update Base Translation.
32a67c48e0 Qt: Add Wiki and Documentation to 'Help' menu
Compare 3 commits »
ShuriZma synced commits to refs/pull/5134/head at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
12ad9e2c57 Merge branch 'beta' into instruct
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
e88b8aeb6f Merge pull request #5212 from pagefaultgames/main
8d20b7b5e0 [Hotfix] Fix event encounters not evolving (#5206)
d14a5b8819 [Misc] Update version number to 1.5.1
Compare 8 commits »
ShuriZma synced commits to refs/pull/5136/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
809bff0a03 Merge 113c9bd96ed1fec7117ca6aaf5f28839581b9e1f into a9ffe03804a900efe641671353a62150d0ee903e
a9ffe03804 [Misc] Rename battle music, experimental sprites settings (#5174)
974fe9f7d3 [UI/UX] Merged shiny and variant buttons in starter select menu (#5213)
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
Compare 13 commits »
ShuriZma synced commits to refs/pull/5139/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
78a370f19b Merge 3568fa398a30b717fafc377b4d421bdd984bebc9 into 0989128deb7b85951284319514dbdaf12e69d755
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
4c17ebd400 [Bug][Test] Instruct Bugfixes + More tests (#5134)
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
Compare 11 commits »
ShuriZma synced commits to refs/pull/5165/head at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
50fa9c6ba7 Merge branch 'beta' into rage-fist-implementation
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
4c17ebd400 [Bug][Test] Instruct Bugfixes + More tests (#5134)
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
Compare 11 commits »
ShuriZma synced commits to refs/pull/5165/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
cf32a3afcd Merge 50fa9c6ba7e70ed13def8c395df9ad72c6751447 into 0989128deb7b85951284319514dbdaf12e69d755
50fa9c6ba7 Merge branch 'beta' into rage-fist-implementation
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
4c17ebd400 [Bug][Test] Instruct Bugfixes + More tests (#5134)
Compare 12 commits »
ShuriZma synced commits to refs/pull/5166/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
f7a98945d0 Merge b9ea81756a7b838dab91cbd482e0f9a6945def33 into 0989128deb7b85951284319514dbdaf12e69d755
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
4c17ebd400 [Bug][Test] Instruct Bugfixes + More tests (#5134)
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
Compare 11 commits »
ShuriZma synced commits to refs/pull/5170/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
3a39419db2 Merge aedd21fe6ecb5c3800a6bb7a1d6fea67b0a56bb5 into ec09186264f07735f7a10155016b1565944ac956
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
e88b8aeb6f Merge pull request #5212 from pagefaultgames/main
8d20b7b5e0 [Hotfix] Fix event encounters not evolving (#5206)
d14a5b8819 [Misc] Update version number to 1.5.1
Compare 8 commits »
ShuriZma synced commits to refs/pull/5171/head at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
d12350c846 Set Giovanni lead to always be Persian
f5f827ac67 Merge branch 'beta' into UpdateEvilLeaders
fec513a8e2 Update trainer-config.ts
ecaf526726 Update trainer-config.ts
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
Compare 24 commits »
ShuriZma synced commits to refs/pull/5171/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
a5b615e1cb Merge d12350c84633f65580a951805933ccd65e3eade5 into 974fe9f7d32d62cd2b3232944a7c4ad0a59e4546
974fe9f7d3 [UI/UX] Merged shiny and variant buttons in starter select menu (#5213)
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
4c17ebd400 [Bug][Test] Instruct Bugfixes + More tests (#5134)
Compare 17 commits »
ShuriZma synced commits to refs/pull/5172/head at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
3d6ed566aa Merge branch 'beta' into ivsummary
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
e88b8aeb6f Merge pull request #5212 from pagefaultgames/main
8d20b7b5e0 [Hotfix] Fix event encounters not evolving (#5206)
d14a5b8819 [Misc] Update version number to 1.5.1
Compare 20 commits »
ShuriZma synced commits to refs/pull/5172/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
bd5e3ab2fc Merge 3d6ed566aa5a4756bdc121e3ce26ef9096e15a44 into 974fe9f7d32d62cd2b3232944a7c4ad0a59e4546
974fe9f7d3 [UI/UX] Merged shiny and variant buttons in starter select menu (#5213)
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
4c17ebd400 [Bug][Test] Instruct Bugfixes + More tests (#5134)
Compare 13 commits »
ShuriZma synced commits to refs/pull/5173/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
0d4415b8e5 Merge 833eddb2332bcf64b380698912f639e8dc19b216 into 0989128deb7b85951284319514dbdaf12e69d755
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
4c17ebd400 [Bug][Test] Instruct Bugfixes + More tests (#5134)
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
Compare 11 commits »
ShuriZma synced commits to refs/pull/5174/head at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
0f39fbf5f3 Merge branch 'beta' into settinglabels
ec09186264 [Audio] Replace Title BGM with custom BGM by Firel (#5189)
2611ea71a0 Merge branch 'beta' into settinglabels
e88b8aeb6f Merge pull request #5212 from pagefaultgames/main
8d20b7b5e0 [Hotfix] Fix event encounters not evolving (#5206)
Compare 19 commits »
ShuriZma synced commits to refs/pull/5182/merge at ShuriZma/pokerogue from mirror 2025-01-30 04:07:11 +00:00
a3188905ea Merge 0ce30aad5f8fcc49e840fcc101891598e77f96d0 into a9ffe03804a900efe641671353a62150d0ee903e
a9ffe03804 [Misc] Rename battle music, experimental sprites settings (#5174)
974fe9f7d3 [UI/UX] Merged shiny and variant buttons in starter select menu (#5213)
0989128deb [Bug][Mystery Encounters] Use proper BST calculation (#5199)
4e0b10769b [Bug] [UI/UX] Allow arena flyout during target selection (#5208)
Compare 13 commits »