ShuriZma
0 Followers · 0 Following
Repositories
24
 Projects Packages Public Activity Starred Repositories
ShuriZma synced commits to refs/pull/2050/merge at ShuriZma/melonDS from mirror 2024-09-18 11:03:39 +00:00
8f499819ae Merge c2b2dc70b604637477fd624d486a72e5a5cdc0bc into 7ac2eb2d7137caad07801fb4ebe49901d40e42bd
7ac2eb2d71 attempt at fixing Windows build
a3d696121e rework gdb packet parsing
Compare 3 commits »
ShuriZma synced commits to refs/pull/2127/merge at ShuriZma/melonDS from mirror 2024-09-18 11:03:39 +00:00
2b6db0d0ac Merge f6b73decc76f2bb9b2f0bd0fffba86da329078e2 into 7ac2eb2d7137caad07801fb4ebe49901d40e42bd
7ac2eb2d71 attempt at fixing Windows build
a3d696121e rework gdb packet parsing
Compare 3 commits »
ShuriZma synced commits to refs/pull/2137/merge at ShuriZma/melonDS from mirror 2024-09-18 11:03:39 +00:00
8091246f02 Merge 094af17674a22d899168f669c371d6f4de863c3f into 7ac2eb2d7137caad07801fb4ebe49901d40e42bd
7ac2eb2d71 attempt at fixing Windows build
a3d696121e rework gdb packet parsing
Compare 3 commits »
ShuriZma synced commits to refs/pull/3628/head at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
16533b189f Update src/locales/de/pokemon-form.json
22a5edd590 Update src/locales/de/pokemon-form.json
2ce7c4a74e Update src/locales/de/pokemon-form.json
b4c6c8c12b Update src/locales/de/pokemon-form.json
10c21fcd91 Update src/locales/de/pokemon-form.json
Compare 32 commits »
ShuriZma synced commits to refs/pull/3628/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
c78a95d5ae Merge 16533b189f1b897caa505db6cbfa2a9111439a05 into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
16533b189f Update src/locales/de/pokemon-form.json
22a5edd590 Update src/locales/de/pokemon-form.json
2ce7c4a74e Update src/locales/de/pokemon-form.json
b4c6c8c12b Update src/locales/de/pokemon-form.json
Compare 35 commits »
ShuriZma synced commits to refs/pull/3776/head at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
6cfc6f9341 Merge branch 'beta' into daily-standardization
9c391f92bd Merge pull request #1 from pagefaultgames/main
00ba2eebc8 Add new biome BGM by Firel (#4301)
fe69bd2b55 add missing translation for korean (#4295)
1fb5389765 Auto center the window vertically (#2686)
Compare 7 commits »
ShuriZma synced commits to refs/pull/4065/head at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
09cfdf6f7f Updated as per comment
ShuriZma synced commits to refs/pull/4198/head at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
39ee5b27fd Merge branch 'pagefaultgames:main' into admin-panel-unlink-update
7ea608fb8a [Bug] Fix Dire Hit & System Data Conversion Failure (#4282)
801b0a66f7 Readded vouchers to original weights
103c87ec3b Undo egg skip event
Compare 4 commits »
ShuriZma synced commits to refs/pull/4198/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
9ac3eb2156 Merge 39ee5b27fdaeb0146043637a41352f7dbe15fa33 into 00ba2eebc8d7586623bc6de5f7ede7ef2d019b53
39ee5b27fd Merge branch 'pagefaultgames:main' into admin-panel-unlink-update
00ba2eebc8 Add new biome BGM by Firel (#4301)
fe69bd2b55 add missing translation for korean (#4295)
1fb5389765 Auto center the window vertically (#2686)
Compare 10 commits »
ShuriZma synced commits to refs/pull/3364/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
e5426b9446 Merge ec7eeea2a4477c1d326788d927532caca77109f8 into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
6030b780f2 [Move][Mirror] Update HitTagAttr attributes v2 (#4297)
e386504977 [BUG][Beta] Fix English Status Symbols (#4293)
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
4389bff5d0 [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031)
Compare 8 commits »
ShuriZma synced commits to refs/pull/4215/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
58cf7372a7 Merge d461d8e07361f41c83b2d0f3c3e28eaee08053a1 into 00ba2eebc8d7586623bc6de5f7ede7ef2d019b53
00ba2eebc8 Add new biome BGM by Firel (#4301)
Compare 2 commits »
ShuriZma synced commits to refs/pull/3411/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
5f9f96cce5 Merge 559097d3099f802aa670cc2ee53da887510c3959 into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
6030b780f2 [Move][Mirror] Update HitTagAttr attributes v2 (#4297)
e386504977 [BUG][Beta] Fix English Status Symbols (#4293)
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
4389bff5d0 [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031)
Compare 8 commits »
ShuriZma synced commits to refs/pull/4228/head at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
ec4416c8a4 Merge branch 'beta' into autot
17e5ef789d Fix unit tests
bdd0850e6f Another linting
7b74e021ad Fix merge conflict
6030b780f2 [Move][Mirror] Update HitTagAttr attributes v2 (#4297)
Compare 46 commits »
ShuriZma synced commits to refs/pull/3493/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
7285865ac2 Merge c9cda53724f990cffac7b1f0c49fe91dd93c5d9a into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
6030b780f2 [Move][Mirror] Update HitTagAttr attributes v2 (#4297)
e386504977 [BUG][Beta] Fix English Status Symbols (#4293)
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
4389bff5d0 [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031)
Compare 5 commits »
ShuriZma synced commits to refs/pull/4228/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
b57a126b74 Merge ec4416c8a44ab9d749e90e7f45aa893fa9fe0802 into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
ec4416c8a4 Merge branch 'beta' into autot
17e5ef789d Fix unit tests
bdd0850e6f Another linting
7b74e021ad Fix merge conflict
Compare 47 commits »
ShuriZma synced commits to refs/pull/3528/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
53b9661f9b Merge d9fcce25d1a4425c8a7b52bf40f64fb5449b9185 into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
6030b780f2 [Move][Mirror] Update HitTagAttr attributes v2 (#4297)
e386504977 [BUG][Beta] Fix English Status Symbols (#4293)
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
4389bff5d0 [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031)
Compare 8 commits »
ShuriZma synced commits to refs/pull/4297/head at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
2baaa8bab3 rename: `DealsDoubleDamageToTagAttr` (from `HitsTagAttr`)
dcfdabde3a rename: `AlwaysHitMinimizeAttr` (from `MinimizeAccuracyAttr`)
ade37af396 Merge branch 'beta' into move/Update-HitTagAttr-attributes--mirror
e386504977 [BUG][Beta] Fix English Status Symbols (#4293)
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
Compare 6 commits »
ShuriZma synced commits to refs/pull/3556/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
c58555f91a Merge 25e582ce25ef36d8e6d647a3b44e810bc6434707 into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
6030b780f2 [Move][Mirror] Update HitTagAttr attributes v2 (#4297)
e386504977 [BUG][Beta] Fix English Status Symbols (#4293)
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
4389bff5d0 [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031)
Compare 8 commits »
ShuriZma synced commits to refs/pull/4298/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
0a5249c090 Merge fa5a42791ecad7a49c7ced065406880c5a4e9fa9 into 106ed6b27b849d316340c49f9a1bd18ef70c919a
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
4389bff5d0 [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031)
Compare 3 commits »
ShuriZma synced commits to refs/pull/3589/merge at ShuriZma/pokerogue from mirror 2024-09-18 07:33:43 +00:00
e2543cb9ac Merge 836964300d121b2e02d59482fbeac2368fabfa30 into 6030b780f2abed26b47ba3f1459a8bf8cdf0aa5f
6030b780f2 [Move][Mirror] Update HitTagAttr attributes v2 (#4297)
e386504977 [BUG][Beta] Fix English Status Symbols (#4293)
106ed6b27b [Bug] Using default animation for errors that occur. (#4266)
4389bff5d0 [Bug] Fix stat-protection-attribute not taking inverts (e.g. Contrary) into account (#4031)
Compare 6 commits »