ShuriZma
synced commits to refs/pull/2746/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
2290afb013
Merge a7113065c033680dc83d3ba6ad8fea090d093f21 into 51bb80cb662ed87c631707ec4662d295d4b45a29
a7113065c0
Merge branch 'beta' into implSynchronize
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
ShuriZma
synced commits to refs/pull/2763/head at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
a7c3d5140a
Update src/locales/ko/battler-tags.json
aebbc505b0
Merge branch 'beta' into main
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
ShuriZma
synced commits to refs/pull/2763/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
e03c6ff6c3
Merge a7c3d5140a25d5e4bf7e86e4d59f5ccc9d58b805 into 51bb80cb662ed87c631707ec4662d295d4b45a29
a7c3d5140a
Update src/locales/ko/battler-tags.json
aebbc505b0
Merge branch 'beta' into main
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
ShuriZma
synced commits to refs/pull/3628/head at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
1022c3360a
Apply suggestions from code review
df432156d5
Update src/locales/de/pokemon-form.json
867f769b80
Apply suggestions from code review
390e8e4c16
Update src/locales/de/pokemon-form.json
286aead7da
Update src/locales/de/pokemon-form.json
ShuriZma
synced commits to refs/pull/3628/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
827a166f42
Merge 1022c3360a457699ae4be40bee07f2fbe05a515c into 51bb80cb662ed87c631707ec4662d295d4b45a29
1022c3360a
Apply suggestions from code review
df432156d5
Update src/locales/de/pokemon-form.json
867f769b80
Apply suggestions from code review
390e8e4c16
Update src/locales/de/pokemon-form.json
ShuriZma
synced commits to refs/pull/3662/head at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
75cc306e9b
Merge branch 'beta' into powder
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
0567d4b5e2
[Dev] Remove `variant-tiers.ts` Enum (#3746)
ShuriZma
synced commits to refs/pull/3662/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
2b8da26e95
Merge 75cc306e9b3ef578af435ac12f8e5792edebd0e0 into 51bb80cb662ed87c631707ec4662d295d4b45a29
75cc306e9b
Merge branch 'beta' into powder
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
ShuriZma
synced commits to refs/pull/3776/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
2e83236ee7
Merge 9062925cf8539d1b703d61749e7850c2c18817c7 into 51bb80cb662ed87c631707ec4662d295d4b45a29
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
ShuriZma
synced commits to refs/pull/3974/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
09d9e38dbd
Merge 6947e4631674c09e9040c1ec8c443849720ce519 into 51bb80cb662ed87c631707ec4662d295d4b45a29
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
ShuriZma
synced commits to refs/pull/4019/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
747b388f66
Merge e679ad01ab84faa75d4fd08fe0432179d5991c11 into 51bb80cb662ed87c631707ec4662d295d4b45a29
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
ShuriZma
synced commits to refs/pull/4165/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
38a9b7332c
Merge 5ef58693fcdaded1a5d8ed4d7315270466c4adb4 into 51bb80cb662ed87c631707ec4662d295d4b45a29
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
0567d4b5e2
[Dev] Remove `variant-tiers.ts` Enum (#3746)
ShuriZma
synced commits to refs/pull/4183/head at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
0db2a55a1d
Added Korean missingthings at bug-type-superfan-dialogue.json
e12c8cbe72
Merge branch 'beta' into mystery-encounters-translations
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
605ae9e1c3
[Move] Improved damage forecasting for Shell Side Arm (#4310)
81ea1296b3
[Miscellaneous] Add new Lake and RUins biome BGM by Lmz (#4319)
ShuriZma
synced commits to refs/pull/4183/merge at ShuriZma/pokerogue from mirror
2024-09-19 08:03:41 +00:00
789e524ef4
Merge 0db2a55a1ded29e7962cf47dd5d0f56e548a0372 into 51bb80cb662ed87c631707ec4662d295d4b45a29
0db2a55a1d
Added Korean missingthings at bug-type-superfan-dialogue.json
e12c8cbe72
Merge branch 'beta' into mystery-encounters-translations
51bb80cb66
[Bug][UI] Fix scrolling UIs not resetting properly and add Scrollbars (#4312)
ShuriZma
synced commits to refs/pull/127/merge at ShuriZma/xenia-canary from mirror
2024-09-19 04:33:51 +00:00
0031243d9e
Merge dd15183faf865bf53a6115f52a505beddeb5d849 into 5abf67f540357a6e2c16e9db2a14719e041f21f1
5abf67f540
[MISC] Added devkit directory to gitignore file
17ca739935
[3PP] Reverted Catch2 back to 2.x version due to incompatibility
ecc92e4082
Third-party: Update a lot of submodules
ShuriZma
synced commits to refs/pull/11946/merge at ShuriZma/rpcs3 from mirror
2024-09-19 04:33:49 +00:00
3a1e7d2793
Merge 8560f0705e97b2da83914cb62c9cdd7fe28a2b8c into 66eae05e7506c801e9f3271367f8e654a6534e53
66eae05e75
cellAtracXdec: fix FFmpeg warning
ShuriZma
synced commits to refs/pull/14252/merge at ShuriZma/rpcs3 from mirror
2024-09-19 04:33:49 +00:00
866f91f0fc
Merge 4695e9c1f593482f53f201ab73bbefc41173cf95 into 66eae05e7506c801e9f3271367f8e654a6534e53
66eae05e75
cellAtracXdec: fix FFmpeg warning
ShuriZma
synced commits to refs/pull/15211/merge at ShuriZma/rpcs3 from mirror
2024-09-19 04:33:49 +00:00
3d9b0a4ef8
Merge 2b96a3e4efc3d343cb082bd764d766c6b47188a2 into 66eae05e7506c801e9f3271367f8e654a6534e53
66eae05e75
cellAtracXdec: fix FFmpeg warning
ShuriZma
synced commits to refs/pull/15308/merge at ShuriZma/rpcs3 from mirror
2024-09-19 04:33:49 +00:00
e85f96879c
Merge 660a37c7a0595f34abc1ae4789ece546628bf88e into 66eae05e7506c801e9f3271367f8e654a6534e53
66eae05e75
cellAtracXdec: fix FFmpeg warning
ShuriZma
synced commits to refs/pull/15473/merge at ShuriZma/rpcs3 from mirror
2024-09-19 04:33:49 +00:00
8c498a1c89
Merge c3c1ed1589bfc8e8787e2962896a8800d19f9fa5 into 66eae05e7506c801e9f3271367f8e654a6534e53
66eae05e75
cellAtracXdec: fix FFmpeg warning