Dean Herbert
bcd51afea1
Fix osu! icon font name mismatch
2019-04-02 19:55:46 +09:00
Dean Herbert
bc1077ed73
Remove remaining FontAwesome reference
2019-04-02 19:55:34 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2
2019-04-01 14:24:00 +09:00
Dean Herbert
14b606f761
Merge branch 'master' into colourable-menu-elements
2019-04-01 14:16:36 +09:00
Dean Herbert
b09973aaea
Merge branch 'master' into colourable-menu-elements
2019-04-01 13:30:20 +09:00
Dean Herbert
2060bad3bc
Try applying minimal inspection fixes for latest Rider EAP
2019-04-01 13:28:14 +09:00
Dean Herbert
2b3c70b2d2
Refactor with constants and better method names
2019-04-01 13:13:56 +09:00
Dean Herbert
e33974a57b
Merge branch 'master' into fix-replay-parse-culture
2019-04-01 11:32:50 +09:00
smoogipoo
fb0bba9b37
Use Parsing helpers
2019-04-01 11:23:07 +09:00
Dean Herbert
79b5c2482b
Merge pull request #4562 from peppy/fix-editor-blueprints
...
Fix editor blueprints being misplaced
2019-04-01 11:17:17 +09:00
Dan Balasescu
6d1f24e5e6
Merge branch 'master' into fix-frame-handler-nullrefs
2019-04-01 10:59:10 +09:00
Dean Herbert
6896ec7731
Remove unnecessary method
2019-04-01 10:39:55 +09:00
Dean Herbert
d1a175675d
Use variable
2019-04-01 10:37:02 +09:00
smoogipoo
f453675838
Fix replays being parsed with incorrect cultures
2019-04-01 10:31:20 +09:00
LeNitrous
8088e27fa8
Mimic stable minimum cursor size
2019-03-31 21:10:35 +08:00
LeNitrous
698e38c4e0
make menu flashes and visualisation colourable by skin
2019-03-31 20:10:44 +08:00
Joehu
92673c6d1e
Add ability to sort by favourites on osu!direct
2019-03-30 19:24:16 -07:00
Dean Herbert
5d91c3bcfc
Fix replay handler nullref crashes
2019-03-31 01:33:56 +09:00
Dean Herbert
42eaabe24c
Fix editor blueprints being misplaced
...
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
22519ddacc
Update framework
2019-03-30 12:45:09 +09:00
smoogipoo
772545dd22
Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
2019-03-29 18:21:20 +09:00
Joehu
1ba608f01f
Remove line spacing on similar code
2019-03-29 00:26:17 -07:00
Joehu
eefc55f89b
Fix volume overlay being blocked by other floating overlays
...
- excluding settings
2019-03-29 00:20:16 -07:00
Dean Herbert
81585a8283
Merge branch 'master' into resume-cursor-2
2019-03-29 15:56:46 +09:00
smoogipoo
2967c876ea
Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
# osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-29 15:11:00 +09:00
Dean Herbert
1217cfa334
Merge branch 'master' into fix-login-overlay-behavior
2019-03-29 15:03:07 +09:00
Dean Herbert
6c34842c4e
Merge branch 'master' into fix-loaderanimation-testcase
2019-03-29 15:02:45 +09:00
Dean Herbert
4225d41a84
Merge pull request #4443 from jorolf/screen-title-class
...
Add ScreenTitle class
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 15:02:38 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +09:00
Dean Herbert
c772a38c1b
Merge branch 'master' into fix-loaderanimation-testcase
2019-03-29 14:55:00 +09:00
Dean Herbert
ccc0853f75
Change login overlay's depth and load order
2019-03-29 14:53:40 +09:00
Dean Herbert
90a4cb8e04
Fix unnecessary positioning
2019-03-29 14:49:15 +09:00
Dean Herbert
5495a0a70f
Add content to ScreenTestCase as protection against overwriting
2019-03-29 14:34:58 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior
2019-03-28 22:28:56 -07:00
Dean Herbert
a1fa497ec0
Merge pull request #4546 from Joehuu/fix-music-controller-offset
...
Fix offset of music controller when toolbar is hidden
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-03-29 14:26:28 +09:00
Dean Herbert
bda8ce2dbb
Merge pull request #4537 from peppy/stable-storyboard-ordering
...
Add stable storyboard element ordering
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-03-29 14:15:26 +09:00
Dean Herbert
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
...
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
3e28c4ae0a
Fix remaining IconUsage changes
2019-03-29 14:03:00 +09:00
Dan Balasescu
9c57b9eed2
Merge branch 'master' into fix-music-controller-offset
2019-03-29 14:02:49 +09:00
Dan Balasescu
e45c08ad23
Adjust comment
2019-03-29 14:02:19 +09:00
Dean Herbert
de47e0a8e8
Merge remote-tracking branch 'upstream/master' into screen-title-class
2019-03-29 14:01:08 +09:00
Dean Herbert
95bf0b9ed6
Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset
2019-03-29 13:57:02 +09:00
Dean Herbert
c4096fb628
Remove unused using
2019-03-29 13:56:56 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags
2019-03-29 13:45:45 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes
2019-03-29 12:59:51 +09:00
Dean Herbert
14cef94a53
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
2019-03-29 12:59:26 +09:00
Dean Herbert
0439216f7e
Merge branch 'master' into stable-storyboard-ordering
2019-03-29 12:44:09 +09:00
Dean Herbert
a71e9fdb0e
Merge branch 'master' into convert-ranking-statistics
2019-03-29 12:42:49 +09:00
Dean Herbert
e7b38cdc75
Remove unnecessary set
2019-03-29 12:38:47 +09:00
Dean Herbert
5b0aa7bf8d
Split out current/next frame conditionals for readability
2019-03-29 12:38:40 +09:00
Dean Herbert
19825cf237
Merge branch 'master' into ctb-pp
2019-03-29 12:34:17 +09:00
Dean Herbert
e5b49b1657
Merge branch 'master' into ctb-pp
2019-03-29 12:24:47 +09:00
Dean Herbert
d6f8dbfd5c
Merge branch 'master' into wedge-fix
2019-03-29 12:23:42 +09:00
Dean Herbert
fed58fba3a
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 12:14:28 +09:00
Dean Herbert
26a73b4a65
Merge branch 'master' into correct-preview-loop
2019-03-29 12:00:58 +09:00
Dean Herbert
ed0bf59e73
Merge branch 'master' into universal-playfield-adjust
2019-03-29 11:51:44 +09:00
Dan Balasescu
bab7d78130
Remove redundant cast
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-29 11:36:40 +09:00
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust
2019-03-29 11:25:54 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display
2019-03-29 11:22:59 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility
2019-03-29 11:15:34 +09:00
Dan Balasescu
772f0cac8a
Merge branch 'master' into gameplay-cursor-last-state
2019-03-29 11:01:13 +09:00
Dan Balasescu
7ab24e35f9
Merge branch 'master' into gameplay-paused-no-update
2019-03-29 10:53:32 +09:00
Dean Herbert
759c5b3db9
Restore previous resume behaviour for the time being
2019-03-29 10:52:26 +09:00
Dean Herbert
3b1f83da1d
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
2019-03-29 10:31:15 +09:00
Dan Balasescu
4c038e7f67
Merge branch 'master' into testability-improvements
2019-03-29 10:23:12 +09:00
Dan Balasescu
900c00ba59
Merge branch 'master' into drawable-clear-safety
2019-03-29 10:14:41 +09:00
Dean Herbert
8642886ffa
Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust
2019-03-29 00:39:51 +09:00
Dean Herbert
2f5668f4e7
Fix remaining framework changes
2019-03-29 00:29:14 +09:00
Dean Herbert
176b4ecc38
Merge branch 'master' into sprite-icon-compatibility
2019-03-28 23:47:44 +09:00
Dean Herbert
bca8714905
Update framework
2019-03-28 23:25:31 +09:00
Dean Herbert
70f99400ad
Fix many behavioural issues and add tests
2019-03-28 19:28:13 +09:00
Joehu
9a3528ea9d
Fix field modifier
2019-03-27 22:31:40 -07:00
Joehu
2254c572c4
Remove unnecessary newline
2019-03-27 22:21:28 -07:00
Joehu
53f3dacdfb
Fix login overlay behavior
2019-03-27 22:01:06 -07:00
smoogipoo
0066459968
Don't convert 100s/50s for catch
2019-03-28 12:55:56 +09:00
Dean Herbert
467ee12edf
Merge branch 'framed-replay-handler-fixes' into better-player-flags
2019-03-28 12:45:25 +09:00
Dean Herbert
e9eb33a1b1
Merge branch 'fix-slider-ball-positional' into better-player-flags
2019-03-28 12:45:22 +09:00
Dean Herbert
148e26a6d4
Fix FramedReplayInputHandler starting at frame 0 when it shouldn't
2019-03-28 12:42:57 +09:00
Joehu
bdb39a79a9
Fix offset of music controller when toolbar is hidden
2019-03-27 20:27:26 -07:00
Dean Herbert
253b18b92f
Merge remote-tracking branch 'upstream/master' into better-player-flags
2019-03-28 11:18:54 +09:00
Dean Herbert
23b5271ce4
Merge branch 'master' into clean-overlays-code-1
2019-03-28 11:17:29 +09:00
Dean Herbert
d756a5d987
Merge pull request #4532 from peppy/update-framework
...
Update framework
2019-03-28 10:50:20 +09:00
Joseph Madamba
cdf79ffe39
Merge branch 'master' into clean-overlays-code-1
2019-03-27 10:32:13 -07:00
Dean Herbert
dfb7d78903
Fix remaining game host regressions
2019-03-28 01:29:06 +09:00
Dean Herbert
61b8fb0366
Allow ScreenTestCase to support content
2019-03-27 22:28:32 +09:00
Dean Herbert
5c4f2cefea
Fix Loader and TestCaseLoaderAnimation
2019-03-27 22:28:25 +09:00
Dean Herbert
1a0d1b238e
Fix storage regression
2019-03-27 20:58:07 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
Unknown
fea6adbf54
fix wedge bleeding into other elements (and being misaligned)
2019-03-27 10:12:09 +01:00
smoogipoo
012dcc25c9
Rename APIScoreInfo -> APILegacyScoreInfo
2019-03-27 17:08:40 +09:00
smoogipoo
d2af2cf21d
Set legacy api score statistics directly
2019-03-27 17:08:01 +09:00
smoogipoo
eceecde0f8
Make APIScoreInfo derive LegacyScoreInfo
2019-03-27 17:07:45 +09:00
smoogipoo
977122d05f
Fix ScoreInfo not getting set
2019-03-27 16:59:29 +09:00
smoogipoo
8fcb75809d
Add LegacyScoreInfo for statistics preservation/conversion
2019-03-27 16:55:46 +09:00
smoogipoo
a5d5f469eb
Populate more hit results for catch
2019-03-27 14:52:56 +09:00
smoogipoo
7239ebf5de
Add margin for mods
2019-03-27 13:57:26 +09:00
Dean Herbert
3fcbc2eab3
Fix key counter getting overridden
2019-03-27 10:31:21 +09:00
smoogipoo
adab31fd58
Cleanup + fix up score table layout
2019-03-26 17:38:56 +09:00
Dean Herbert
15821c7511
Fix cursor adding
2019-03-26 17:04:14 +09:00
