1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 16:07:24 +08:00
Commit Graph

45822 Commits

Author SHA1 Message Date
Dan Balasescu
7b8982c87c
Merge pull request #15302 from peppy/fix-multiplayer-chat-escape-focus
Fix gameplay chat display not losing focus on escape key press
2021-10-26 15:34:05 +09:00
Dan Balasescu
48bc2cbab9
Merge pull request #15285 from peppy/move-online-beatmap-metrics
Move online metrics out of databased models
2021-10-26 15:33:54 +09:00
ekrctb
de7a908be2 Cut distance snap lines at playfield border in catch editor 2021-10-26 14:51:52 +09:00
Dan Balasescu
efe6763226
Merge branch 'master' into move-online-beatmap-metrics 2021-10-26 14:24:40 +09:00
Dan Balasescu
1b7745f283
Merge pull request #15286 from peppy/use-beatmap-interfaces-more-uncontested
Update `PreviewTrackManager` to use `IBeatmapSetInfo`
2021-10-26 14:21:04 +09:00
Dean Herbert
370775af68 Fix some surrounding code formatting 2021-10-26 14:05:07 +09:00
Dean Herbert
53ff0802cb Merge branch 'master' into use-ShowFileInNativeExplorer 2021-10-26 13:58:30 +09:00
Dean Herbert
26fb9af021 Update framework 2021-10-26 13:58:07 +09:00
Dean Herbert
6c38028d06 Fix gameplay chat display not losing focus on escape key press
Closes #15293.
2021-10-26 13:55:08 +09:00
Dan Balasescu
1e3c84b34b
Merge branch 'master' into use-beatmap-interfaces-more-uncontested 2021-10-26 13:51:55 +09:00
Dan Balasescu
676e7ff2a6
Merge pull request #15287 from peppy/get-beatmap-request-via-interface
Allow API beatmap requests using interface type
2021-10-26 13:50:46 +09:00
Jason Won
a582976851 reversing slider maintains shape 2021-10-26 00:05:46 -04:00
Roxie Wattz
6c2d288dc7
Merge branch 'master' into ouendan2-hidden 2021-10-25 20:19:00 -07:00
Roxie Wattz
8b85c78b0d Add processing of Spinner approach circles 2021-10-25 20:16:45 -07:00
Dean Herbert
d7ac94038a Update GetBeatmapRequest to use AddParameter 2021-10-26 12:05:31 +09:00
Dean Herbert
5d1170aaf4 Remove unnecessary null check 2021-10-26 11:57:51 +09:00
Dean Herbert
8015791d4c
Merge pull request #15276 from bdach/update-beatmap-set-status-pill-appearance
Update beatmap set status pill appearance in line with new designs
2021-10-26 11:49:29 +09:00
Dean Herbert
0757044b15 Refactor logic to work 2021-10-26 11:42:15 +09:00
Dean Herbert
e7b19cb724 Rename test and fix incorrect layout 2021-10-26 11:30:36 +09:00
ekrctb
c5d765029c Don't compute source object for distance snap grid when it is not enabled 2021-10-26 11:17:04 +09:00
ekrctb
b7a719de71 Rename method 2021-10-26 11:14:12 +09:00
ekrctb
068217557e Add doc comment on catch distance snap grid 2021-10-26 11:12:10 +09:00
ekrctb
9f49a1df8b Handle the case of cursor below the start time of distance snap 2021-10-26 11:00:55 +09:00
ekrctb
865be5a10b Fix distance snap grid rendering inverted when out of bounds 2021-10-26 11:00:44 +09:00
ekrctb
2c92f1a0b7 Use array for fixed-size list 2021-10-26 10:41:17 +09:00
Roxie Wattz
cf7fbf4b63 updated bdach's suggestion 2021-10-25 17:15:43 -07:00
Roxie Wattz
3687f830e8 Rename my test scene
As requested by bdach
2021-10-25 16:57:07 -07:00
Roxie Wattz
b1d60779aa
Merge branch 'master' into spinner-judgement-fix 2021-10-25 16:08:55 -07:00
Roxie Wattz
c9a2c6c031 Reworking the Ouendan 2 Hidden code AGAIN
Not finished. Will be finished in a later commit.
2021-10-25 14:09:22 -07:00
Bartłomiej Dach
0fb2307420
Add back using directive
Was removed for being unneeded in a prerequisite PR but then ended up
leading to compilation failures in the dependent PR.
2021-10-25 21:00:05 +02:00
Bartłomiej Dach
a49a1f41cb
Merge branch 'master' into move-online-beatmap-metrics 2021-10-25 20:33:49 +02:00
Bartłomiej Dach
2045bb4dcf
Merge pull request #15288 from peppy/tournament-ladder-parsing
Fix tournament client silently failing on error during parsing
2021-10-25 20:33:30 +02:00
Bartłomiej Dach
5a03e1736e
Merge branch 'master' into update-beatmap-set-status-pill-appearance 2021-10-25 20:26:49 +02:00
Bartłomiej Dach
6802e9ec10
Remove FixedWidth and add AutoSizeAxes specs to all usages 2021-10-25 20:24:48 +02:00
Bartłomiej Dach
0fe62bb899
Merge branch 'master' into tournament-ladder-parsing 2021-10-25 20:06:01 +02:00
Bartłomiej Dach
3f91e74e57
Remove unused using directive 2021-10-25 19:26:52 +02:00
Bartłomiej Dach
01a86f4c3b
Merge pull request #15290 from peppy/fix-incorrect-length-part-2
Fix incorrect length when calling `APIBeatmap.ToBeatmapInfo`
2021-10-25 17:33:14 +02:00
Dean Herbert
b65d199f6a Fix incorrect length when calling APIBeatmap.ToBeatmapInfo 2021-10-25 17:01:47 +09:00
Dean Herbert
6adb0f068b Fix multiple issues with json serialisation of online info (causing tournament failures) 2021-10-25 16:52:50 +09:00
Dean Herbert
4dafe666ba Merge branch 'tournament-ladder-parsing' into move-online-beatmap-metrics 2021-10-25 16:50:11 +09:00
Dean Herbert
7111f58bfe Fix tournament client silently failing on error during parsing 2021-10-25 16:49:33 +09:00
Dean Herbert
7c99193ada Add tournament LadderInfo serialisation tests 2021-10-25 16:49:33 +09:00
ekrctb
6d1cd0a3a1 Add distance snapping to catch editor 2021-10-25 16:37:44 +09:00
Roxie Wattz
7a92c7ab7e Move condition to separate switch statement
No clue if this is how peppy wanted me to do it but it still works
2021-10-25 00:25:32 -07:00
Dean Herbert
67ef1c40e6 Allow API beatmap requests using interface type 2021-10-25 15:59:40 +09:00
Dean Herbert
2c308f3008 Rename BeatmapMetrics to APIFailTimes 2021-10-25 15:34:41 +09:00
Dean Herbert
4969ab0599 Add forgotten JsonIgnore rules on interface types
Just to avoid them getting serialised as part of the "new" .osu
serialisation format.
2021-10-25 15:32:18 +09:00
Dean Herbert
20baae9094 Move online metrics out of BeatmapInfo model 2021-10-25 15:32:18 +09:00
ekrctb
60df0151c0 Add very basic distance snap grid for catch editor 2021-10-25 15:25:59 +09:00
Dean Herbert
045dd94a6e Move online metrics out of BeatmapSetInfo model 2021-10-25 15:12:39 +09:00