1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 00:27:25 +08:00
Commit Graph

13413 Commits

Author SHA1 Message Date
Andrei Zavatski
fc521ac93b Expose BoxColour property 2019-08-12 13:08:15 +03:00
Andrei Zavatski
144d41f143 Add ability to not add all the items if enum 2019-08-12 12:33:01 +03:00
Andrei Zavatski
2bbac7cdfc Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-scope-selector 2019-08-12 12:18:32 +03:00
Lucas A
9c15024014 Reword and add missing xmldoc to OnScreenDisplay 2019-08-12 10:53:06 +02:00
dependabot-preview[bot]
1bbd0ca54e
Bump ppy.osu.Game.Resources from 2019.731.1 to 2019.809.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.731.1 to 2019.809.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.731.1...2019.809.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 08:30:26 +00:00
Andrei Zavatski
982066dfdf Convert to method group 2019-08-12 10:38:34 +03:00
Dean Herbert
75cb0d093b Use description correctly
Required for localisation
2019-08-12 16:10:48 +09:00
Andrei Zavatski
cb910a6518 Replace if/else statement 2019-08-12 10:02:45 +03:00
Andrei Zavatski
5b68a2f34a Rename trackManager to previewTrackManager 2019-08-12 09:50:49 +03:00
Dean Herbert
a83afd00b5
Merge branch 'master' into beatmap-scope-selector 2019-08-12 15:48:53 +09:00
Andrei Zavatski
520924b440 Don't create a new request if onlineId is null 2019-08-12 09:45:21 +03:00
Andrei Zavatski
6095480a54 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-12 09:36:15 +03:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim 2019-08-12 05:46:15 +09:00
Dean Herbert
ea4a97ebd9
Merge branch 'master' into refactor-osd 2019-08-12 02:27:02 +09:00
Dean Herbert
9ac4870a21
Merge branch 'master' into triangles 2019-08-12 02:24:45 +09:00
Lucas A
e4eed83d85 Add dual bindings for Jukebox hotkeys 2019-08-11 19:14:49 +02:00
Dean Herbert
359261d4a4 Fix game not starting if intro music is disabled 2019-08-12 02:04:06 +09:00
Dean Herbert
ff4b271f64 Add extra quotations around output 2019-08-12 01:42:05 +09:00
Dean Herbert
ce62f6b56e ToString should never return null 2019-08-12 01:40:11 +09:00
Andrei Zavatski
e7964c165f Make judgement lines alive for a bit longer 2019-08-11 19:09:50 +03:00
Andrei Zavatski
3136d46c7f Do not generate new judgement line on miss 2019-08-11 19:04:56 +03:00
Andrei Zavatski
5e0ac28ca8 Add basic colours 2019-08-11 18:30:03 +03:00
Andrei Zavatski
177a317a48 rename AccuracyBar to HitErrorDisplay 2019-08-11 18:11:49 +03:00
Andrei Zavatski
2a35c3c3e2 Calculate real position for judgement lines 2019-08-11 18:04:54 +03:00
Unknown
cc4ee2df05 add ToString() override to Beatmap class 2019-08-11 16:41:56 +02:00
Andrei Zavatski
0a255fe4d1 Add moving arrow 2019-08-11 16:38:03 +03:00
Andrei Zavatski
ed409d113b Add judgement lines generator 2019-08-11 15:53:15 +03:00
Andrei Zavatski
fd334e0319 Implement basic layout for AccuracyBar 2019-08-11 14:57:21 +03:00
Dean Herbert
684c37bf05 Rename class to better match usage 2019-08-11 16:19:40 +09:00
Dean Herbert
c2e2c1e67e
Merge branch 'master' into refactor-osd 2019-08-11 13:13:12 +09:00
Lucas A
7825923cb6 Use media keys as default bindings for jukebox. 2019-08-10 16:33:16 +02:00
Lucas A
fdf76be967 Merge branch 'master' into music-controller-hotkeys 2019-08-10 16:29:02 +02:00
Lucas A
8c630b4f4c Merge branch 'refactor-osd' into music-controller-hotkeys 2019-08-10 16:25:59 +02:00
Lucas A
d55f9404da Fix CI issues 2019-08-10 14:23:37 +02:00
Lucas A
8eb3409a64 Add missing licence header 2019-08-10 14:03:44 +02:00
Lucas A
b0a7177987 Add ScreenTitleIcon class, used for displaying custom specific icons on overlays. 2019-08-10 13:26:19 +02:00
Lucas A
fc4c0cc2e7 Fix visual discrepancies with master 2019-08-10 10:52:37 +02:00
Dean Herbert
caf13ae52d Update framework 2019-08-09 23:29:32 +09:00
Dean Herbert
8e6a3162ab Update resources 2019-08-09 20:05:36 +09:00
Dean Herbert
cb0cd7ed58 Add triangles intro 2019-08-09 20:05:28 +09:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
dependabot-preview[bot]
ca33efead4
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.702.0 to 2019.731.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.702.0...2019.731.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 03:58:06 +00:00
Dean Herbert
dbb3b583cf
Log error for invalid beatmap/storyboard events instead of thro… (#5611)
Log error for invalid beatmap/storyboard events instead of throwing

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-09 12:56:47 +09:00
Dean Herbert
7e9c100c9b Apply new resharper refactors 2019-08-09 12:29:33 +09:00
iiSaLMaN
565034e658 Remove unnecessary using directive 2019-08-08 22:14:51 +03:00
iiSaLMaN
0fcc6c1676 Add DimLevel property 2019-08-08 22:13:48 +03:00
Dean Herbert
c02d83e72a
Merge branch 'master' into fix-async-score-imports 2019-08-08 23:34:31 +09:00
iiSaLMaN
a3d90da7d4 Remove unnecessary check 2019-08-08 17:29:52 +03:00
iiSaLMaN
bedb744a2e Add parentheses 2019-08-08 17:11:26 +03:00
iiSaLMaN
88b9942b2a Move EnableUserDim check to defualt value of ShowDimContent 2019-08-08 17:07:06 +03:00
Dan Balasescu
bb90a273ac
Merge branch 'master' into system-user-color 2019-08-08 19:02:24 +09:00
smoogipoo
3ebfa0505c Don't share single scheduler across all model managers 2019-08-08 18:26:07 +09:00
Andrei Zavatski
9ab132520c Testcase improvements 2019-08-08 12:25:46 +03:00
Andrei Zavatski
e9b5c91690 Fade out existing panel on beatmap change 2019-08-08 12:08:51 +03:00
Andrei Zavatski
08a92c38d7 adjust naming 2019-08-08 12:04:44 +03:00
Andrei Zavatski
1b559c1585 Use async loading 2019-08-08 12:01:33 +03:00
Andrei Zavatski
0ec45e2a8b Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 11:54:11 +03:00
Dan Balasescu
0cd6ba2950
Merge branch 'master' into score-processor-xmldoc 2019-08-08 17:32:14 +09:00
Dean Herbert
a3dbaef4ca Adjust background gradient 2019-08-08 17:29:50 +09:00
Dean Herbert
a76d3f1218
Add chat /join command (#5602)
Add chat /join command
2019-08-08 17:11:44 +09:00
Dean Herbert
6d5a7041fd Move system user colour assignment to ensure consistency 2019-08-08 17:10:06 +09:00
Max Hübner
0bed3bfece formatting inspection 2 2019-08-08 09:02:09 +02:00
Max Hübner
bcd443a3aa remove /j 2019-08-08 08:56:52 +02:00
Andrei Zavatski
8668bce25d Fix preview can be played on start 2019-08-08 09:52:42 +03:00
Andrei Zavatski
cbcdc28900 Fix hard crash when clicking on a preview button 2019-08-08 09:04:24 +03:00
Andrei Zavatski
f5cd0eae48 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 09:04:06 +03:00
smoogipoo
de4ad1f625 Fix bad log message 2019-08-08 14:44:49 +09:00
smoogipoo
ac2060f1cf Throw exceptions and let LegacyDecoder handle them 2019-08-08 14:44:04 +09:00
Dan Balasescu
54ee0cabd8
Merge branch 'master' into beatmap-events 2019-08-08 14:25:41 +09:00
Dean Herbert
2172c5a52b
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 14:24:52 +09:00
Dean Herbert
a345955f45 Add mentions linking ScoreProcessor apply/revert methods together 2019-08-08 13:57:04 +09:00
Andrei Zavatski
4a38c4f9d1 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 07:36:53 +03:00
Dean Herbert
f774c46f57
Remove linq usage in BreakOverlay update (#5641)
Remove linq usage in BreakOverlay update
2019-08-08 13:33:23 +09:00
Joehu
77df6a0cb7 Remove unused direct placeholder screen 2019-08-07 21:16:36 -07:00
Andrei Zavatski
a4459972b6 Remove ViewBeatmapButton 2019-08-08 07:15:30 +03:00
Andrei Zavatski
ffed642929 Implement MatchBeatmapPanel 2019-08-08 07:08:51 +03:00
Dean Herbert
7d42561da9 Remove linq usage in BreakOverlay update 2019-08-08 12:58:20 +09:00
Salman Ahmed
3f9f9e7bc9
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 05:36:45 +03:00
Dean Herbert
99f5ca07ce Remove redundant comment 2019-08-08 10:42:54 +09:00
Dean Herbert
40a33b3382 Move IsLoaded check to more correct place 2019-08-08 10:41:23 +09:00
Dean Herbert
a2e3ab6463
Merge branch 'master' into add-bindable-for-break-times 2019-08-08 10:13:14 +09:00
iiSaLMaN
d5b26b86da Fix storyboard not showing on disabled user dim 2019-08-07 22:18:10 +03:00
iiSaLMaN
ba269a49ee Expose break fade duration and add it in the calculation 2019-08-07 16:59:35 +03:00
iiSaLMaN
d3657d82cd Simplify final check for break time 2019-08-07 16:28:16 +03:00
iiSaLMaN
c2b3c28c79 Use IsBreakTime for checking if currently in a break
Rather than iterating over all breaks to find which is in current time
2019-08-07 16:15:53 +03:00
Dean Herbert
ab252b27d5
Merge branch 'master' into update-framework 2019-08-07 21:27:02 +09:00
Dan Balasescu
1454c1320f
Merge branch 'master' into fix-cursor-scale 2019-08-07 20:05:24 +09:00
Dean Herbert
754fbf3acf
Merge branch 'master' into update-framework 2019-08-07 19:58:37 +09:00
Dean Herbert
2ab2889027 Update framework 2019-08-07 19:56:17 +09:00
David Zhao
bde89adcb7 show exception message 2019-08-07 19:45:29 +09:00
Dan Balasescu
df784e1d8e
Merge branch 'master' into mod-icon-improvements 2019-08-07 19:43:52 +09:00
David Zhao
b8ccba02f2 Log to runtime instead 2019-08-07 19:33:54 +09:00
David Zhao
15a592e25e Just assert doesn't throw and don't catch at LegacyDecoder 2019-08-07 19:25:40 +09:00
Dean Herbert
ec13143ab3 Add further xmldoc 2019-08-07 18:45:56 +09:00
David Zhao
da15e19912 return on storyboard side 2019-08-07 18:40:58 +09:00
Dan Balasescu
18ac5b31a1
Merge branch 'master' into move-quadbatch-local 2019-08-07 18:01:56 +09:00
Dean Herbert
b0e0659715 Dispose instead 2019-08-07 17:33:30 +09:00
David Zhao
7bcec31ea3 mention that the event was the type 2019-08-07 17:08:41 +09:00
Dean Herbert
c6d481238d Move QuadBatch to a local variable to stop resharper complaining 2019-08-07 16:56:22 +09:00
David Zhao
669c2462ec Don't consider the type 2019-08-07 16:25:38 +09:00
Andrei Zavatski
67e009b000 Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded 2019-08-07 09:08:58 +03:00
Andrei Zavatski
1d42f0959a ModIcon improvements 2019-08-07 08:46:27 +03:00
Andrei Zavatski
b064df91a7 Initial implementation 2019-08-07 08:33:55 +03:00
Andrei Zavatski
b9384d7a53 Remove unnecessary null check 2019-08-07 07:00:50 +03:00
Andrei Zavatski
2c9ce4335c Merge remote-tracking branch 'refs/remotes/ppy/master' into fix-scores-loading 2019-08-07 06:59:26 +03:00
Andrei Zavatski
b1c78c43f3 Simplify target string 2019-08-07 06:57:46 +03:00
Andrei Zavatski
2e3deb46d5 Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded 2019-08-07 06:51:11 +03:00
Andrei Zavatski
24f9872315 Fix unnecessary scores loading 2019-08-07 06:45:39 +03:00
Dean Herbert
6ed9c983ff Rename shear variable 2019-08-07 12:36:00 +09:00
Andrei Zavatski
c16e84e5e6 Fix unability to get local user with specific ruleset 2019-08-07 06:35:57 +03:00
Dean Herbert
f2861c0c7d Merge remote-tracking branch 'upstream/master' into fix-back-button-hover-sounds 2019-08-07 12:34:30 +09:00
Andrei Zavatski
2d0f555048 Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded 2019-08-07 06:33:54 +03:00
Dean Herbert
616de1830a Less sheep 2019-08-07 12:20:49 +09:00
Dean Herbert
9033327923 Merge remote-tracking branch 'upstream/master' into fix-footer-button-hover-sounds 2019-08-07 12:19:25 +09:00
Andrei Zavatski
3cfbbac5dc Expand requests 2019-08-06 17:47:31 +03:00
Max Hübner
ffb6794b4e formatting inspection 2019-08-06 16:11:13 +02:00
Dean Herbert
dda078277a Minor variable name changes 2019-08-06 23:05:12 +09:00
Dean Herbert
5cbd887ee8
Merge branch 'master' into safely-cancel-completion-event 2019-08-06 22:59:06 +09:00
Dean Herbert
e3f88a83a0
Fix drawable channels remaining in memory after being closed (#5607)
Fix drawable channels remaining in memory after being closed
2019-08-06 22:58:14 +09:00
iiSaLMaN
2a68bb2749 onCompletionEvent -> pushResults 2019-08-06 14:11:43 +03:00
iiSaLMaN
dd701eaa62 Safely cancel the completion task on restart or immediate exit 2019-08-06 14:10:03 +03:00
Joehu
11aa3544c4 Fix shear width naming 2019-08-05 20:57:17 -07:00
Joehu
ee6a90c48d Fix back button hover sounds playing in unclickable area 2019-08-05 20:43:30 -07:00
David Zhao
66b02c0283 log type as well 2019-08-06 12:27:10 +09:00
Joehu
1fc7ddf621 Fix text depth regression 2019-08-05 18:14:41 -07:00
David Zhao
cd6fe91882 Log error for invalid events 2019-08-06 10:05:21 +09:00
Joehu
a7ac411c25 Fix footer button hover sounds playing in unclickable area 2019-08-05 17:57:04 -07:00
smoogipoo
11916782ba Fix drawable channels remaining in memory after being closed 2019-08-05 19:23:13 +09:00
Andrei Zavatski
749a00cc2f Force bindable change 2019-08-05 12:49:54 +03:00
Andrei Zavatski
c591cb83eb Merge remote-tracking branch 'refs/remotes/ppy/master' into move-graph-data-to-statistics 2019-08-05 12:45:29 +03:00
Dean Herbert
bf0f6e1053
Fix memory leaks from download buttons (#5606)
Fix memory leaks from download buttons
2019-08-05 11:31:04 +02:00
smoogipoo
ee9e8f6261 Fix memory leaks from download buttons 2019-08-05 17:58:16 +09:00
Dean Herbert
4df3a5ba04
Merge branch 'master' into conversion-test-mods 2019-08-05 10:57:37 +02:00
Dan Balasescu
cd27e1eb70
Merge branch 'master' into update-direct-categories-sorting 2019-08-05 17:11:48 +09:00
Dean Herbert
431834fc2f Merge remote-tracking branch 'upstream/master' into conversion-test-mods 2019-08-05 09:50:43 +02:00
Dean Herbert
9fab345d79
Refactor beatmap conversion testing (#5555)
Refactor beatmap conversion testing

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-05 09:45:30 +02:00
Dan Balasescu
b20f1d1717
Merge branch 'master' into fix-settings-sidebar-max-ui-scale 2019-08-05 13:42:04 +09:00
Dan Balasescu
b9c406f3b2
Merge branch 'master' into profile-ruleset-selector-improvements 2019-08-05 13:31:23 +09:00
smoogipoo
d839717131 Remove unnecessary intermediate method 2019-08-05 13:18:29 +09:00
Max Hübner
2f5d23b354 add join command 2019-08-05 01:02:42 +02:00
Dean Herbert
d5be87c06a
Update heart colour of supporter icon (#5594)
Update heart colour of supporter icon
2019-08-04 16:07:25 +02:00
Andrei Zavatski
d693a54c84 Move RankHistoryData to User Statistics 2019-08-04 14:35:26 +03:00
Dean Herbert
b0a27161c6
Merge pull request #5588 from UselessToucan/update_ef_core
Update Entity Framework Core
2019-08-04 13:16:00 +02:00
Andrei Zavatski
3ae5428dad ProfileRulesetSelector improvements 2019-08-04 14:15:16 +03:00
Andrei Zavatski
fd44ca3233 Rename Animation to Layer 2019-08-04 13:54:23 +03:00
Andrei Zavatski
a30d7912b1 Move DimmedLoadingAnimation to it's own file 2019-08-04 11:09:12 +03:00
Andrei Zavatski
c8acbdb1d9 Update the colour 2019-08-04 06:15:15 +03:00
Joehu
f6f96658c7 Fix settings sidebar being behind toolbar 2019-08-03 15:22:06 -07:00
Joehu
115cf47ed5 Fix settings sidebar showing scrollbar at max ui scale 2019-08-03 15:20:44 -07:00
Roman Kapustin
c8dd29067b Update Entity Framework Core 2019-08-04 00:34:51 +03:00