1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 01:27:29 +08:00
Commit Graph

42255 Commits

Author SHA1 Message Date
ekrctb
da3499f10e Simplify the way of getting catcher 2021-07-21 16:27:44 +09:00
ekrctb
81d0a9bd9c Fix item ordering 2021-07-19 21:05:36 +09:00
ekrctb
41169fbdaf Add [NotNull] 2021-07-19 20:20:10 +09:00
ekrctb
7201cfe0b4 Move child drawable creation of CatchPlayfield from constructor to load. 2021-07-19 20:18:17 +09:00
ekrctb
879467961f Fix catcher trails displayed in wrong place 2021-07-19 20:13:31 +09:00
ekrctb
b88ee3c1a1 Pass DroppedObjectContainer via constructor instead of DI
It is now just one level deep, so it is not beneficial to use DI here.
This effectively reverts ae09c23e.
2021-07-19 20:11:49 +09:00
ekrctb
50f9e5f362 Replace usage of CatcherArea.MovableCatcher with Catcher 2021-07-19 19:52:40 +09:00
ekrctb
97059a9f50 Create Catcher in CatchPlayfield 2021-07-19 19:44:40 +09:00
Dean Herbert
23ef666f34
Merge pull request #13887 from ekrctb/legacy-converted-y
Preserve Y position of hit objects in osu!catch
2021-07-19 18:48:23 +09:00
Dan Balasescu
f1f6af88a1
Merge pull request #13926 from peppy/set-rank-on-failed-submission
Set score's rank on a failed submission
2021-07-19 18:45:21 +09:00
Dan Balasescu
473011070f
Merge pull request #13908 from peppy/editor-disallow-placement-when-untimed
Fix editor composer allowing object placement without timing present
2021-07-19 18:37:19 +09:00
Dean Herbert
5f94692aa6
Merge pull request #13927 from ekrctb/catch-hitobjec-utils
Change the way position is set for components of catch editor
2021-07-19 18:26:11 +09:00
Dean Herbert
b29209d13f Ensure tool is always set back to select tool when beatmap becomes untimed 2021-07-19 17:08:40 +09:00
Dean Herbert
bde35d9f21 Rename radio button classes to be local to editor 2021-07-19 16:57:12 +09:00
ekrctb
c347584851 Use added utility function 2021-07-19 13:33:46 +09:00
ekrctb
70c9d7105f Add a function to compute hit object position in catch editor 2021-07-19 13:33:22 +09:00
Dean Herbert
d7f997a7f3 Set score's rank on a failed submission
As we don't have a `RankInfo.F`, this is the next best choice. I am also
adding a check osu-web side for this - this is just to make sure we
aren't sending scores with SS when they are not actually completed.

I'm working on a separate PR to ensure this does not get mutated during
the player exit process.
2021-07-19 12:36:15 +09:00
Dan Balasescu
48b34457e7
Merge pull request #13925 from peppy/fix-icon-overwrite
Fix osu!(lazer) overwriting osu!(stable) desktop icons by adding back a suffix
2021-07-19 12:08:03 +09:00
Dan Balasescu
49fb8f52e2
Merge pull request #13922 from bdach/replace-get-or-default-calls
Replace calls to obsoleted `GetOrDefault()` extension
2021-07-19 11:55:11 +09:00
Dean Herbert
e0af5f0469 Fix osu!(lazer) overwriting osu!(stable) desktop icons by adding back a suffix
As discussed in https://github.com/ppy/osu/issues/13864, Squirrel will
use the product name before the title, allowing us to use this variable
to update the icon while not changing the window display title or naming
elsewhere.
2021-07-19 11:38:45 +09:00
Bartłomiej Dach
fb5d25405e
Replace calls to obsoleted GetOrDefault() extension 2021-07-18 21:52:16 +02:00
Dean Herbert
856adfe6a3
Merge pull request #12877 from Henry-YSLin/osu-target-mod
Implement osu target mod
2021-07-19 02:09:34 +09:00
Dean Herbert
4aa0e62673
Merge pull request #13911 from kj415j45/localisation-base
Add support for localising breadcrumb controls
2021-07-19 02:09:11 +09:00
Bartłomiej Dach
6e065362be
Merge branch 'master' into osu-target-mod 2021-07-18 18:22:36 +02:00
Henry Lin
fdebe4b94a Code formatting fixes 2021-07-18 22:01:26 +08:00
Dean Herbert
49f0c707f6 Move approach circle hiding within BeginAbsoluteSequence 2021-07-18 22:34:28 +09:00
Dean Herbert
353ff5c6ce
Merge pull request #13915 from bdach/fix-tourney-seeding-crash
Fix seeding screen crashing on seedings with null mod
2021-07-18 17:47:29 +09:00
Bartłomiej Dach
7be7fb4ca9
Merge pull request #13906 from peppy/tournament-flow-warnings
Show warning on screens which require a current match to be selected
2021-07-17 19:13:00 +02:00
Bartłomiej Dach
32ca2b939b
Merge branch 'master' into tournament-flow-warnings 2021-07-17 18:33:45 +02:00
Bartłomiej Dach
714255e6d4 Fix seeding screen crashing on seedings with null mod 2021-07-17 18:06:47 +02:00
Bartłomiej Dach
9a2fb8ca6c Add test coverage for null mod on seeding screen 2021-07-17 18:06:47 +02:00
kj415j45
f4eeb9139e Correct code style 2021-07-17 21:37:58 +08:00
kj415j45
0183564810 Merge branch 'localisation-base' of https://github.com/kj415j45/osu into localisation-base 2021-07-17 21:19:14 +08:00
kj415j45
ca1080dfb5 use switch statement
Co-authored-by: bdach <dach.bartlomiej@gmail.com>
2021-07-17 21:16:57 +08:00
kj415j45
5b4a1ef70a Update test to match Breadcrumb change 2021-07-17 20:40:59 +08:00
bdach
7859d02c5b Allow null for breadcrumb control 2021-07-17 20:33:26 +08:00
LiangXiang Shen
6bebb1fdb9
Merge branch 'master' into localisation-base 2021-07-17 19:50:52 +08:00
huoyaoyuan
e3c10e3994 Add missing LocalisableString 2021-07-17 19:40:32 +08:00
kj415j45
22ff40fdd5 Fix broken WikiHeader 2021-07-17 19:40:25 +08:00
huoyaoyuan
5b694ad28b Replace string with LocalisableString 2021-07-17 19:37:32 +08:00
Bartłomiej Dach
8dc9ab9e76
Merge pull request #13905 from peppy/schedule-display-without-current
Allow the schedule screen to show even when a current match is not selected
2021-07-16 23:23:29 +02:00
Bartłomiej Dach
7fabdbc504
Merge branch 'master' into schedule-display-without-current 2021-07-16 22:45:51 +02:00
Dean Herbert
50eed26bd1 Rename radio button item to label 2021-07-17 02:32:23 +09:00
Dean Herbert
eac9b1ec7e Disable toolbox composition buttons when beatmap is not timed 2021-07-17 02:30:13 +09:00
Dean Herbert
3ae5f6707a Expose whether an EditorBeatmap has timing present or not via bindable 2021-07-17 02:30:00 +09:00
Dean Herbert
7a671754f2 Change RadioButton's object to a string 2021-07-17 02:29:31 +09:00
Dean Herbert
e8595871de Update remaining screens to also show the warning message 2021-07-17 00:23:17 +09:00
Dean Herbert
0a13e033ea Move height warning to bottom of screen to avoid overlap 2021-07-17 00:23:17 +09:00
Dean Herbert
71f74f0e98 Add warning message to screens which require a current match to be selected 2021-07-17 00:23:17 +09:00
Dan Balasescu
6a781aedb3
Merge pull request #13904 from peppy/fix-match-removal-line-rendering
Fix progression lines getting stuck after removing a match in ladder editor screen
2021-07-17 00:23:16 +09:00