1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 23:32:54 +08:00
Commit Graph

18702 Commits

Author SHA1 Message Date
Dan Balasescu
904b688b4b
Merge branch 'master' into test-scene-create-ruleset 2020-06-15 16:40:02 +09:00
Dean Herbert
1770b70b81 Change implementation to ensure flashBackground is not present by default 2020-06-15 16:14:35 +09:00
Dean Herbert
fe62b26d73 Merge branch 'master' into home-shortcut 2020-06-15 15:51:24 +09:00
Dean Herbert
92e7ef6ecb
Merge branch 'master' into home-shortcut 2020-06-15 15:34:01 +09:00
Dan Balasescu
9b31f8889b
Merge branch 'master' into fix-double-comments 2020-06-15 15:21:34 +09:00
Joehu
941fdf5e76 Fix flash background naming 2020-06-14 22:16:17 -07:00
Joehu
b41567c66c Split hover and flash to separate boxes 2020-06-14 22:02:21 -07:00
Dan Balasescu
6d38c4003e
Merge pull request #9287 from peppy/fix-zero-time-storyboard-sample
Fix storyboard sample playback failing when expected to play at 0ms
2020-06-15 12:13:08 +09:00
Dan Balasescu
f8badd77d6
Merge pull request #9275 from H2n9/osu-modtimeramp
Add an adjust pitch setting to ModTimeRamp
2020-06-15 11:56:45 +09:00
Dan Balasescu
95d828cb1f
Merge pull request #9282 from peppy/fix-editor-timeline-drag-scroll
Fix drag scroll in editor timeline no longer working correctly
2020-06-15 11:47:09 +09:00
Dan Balasescu
ac414a5db8
Merge pull request #9281 from peppy/fix-gameplay-elapsed-time
Fix gameplay clock not correctly reporting elapsed time
2020-06-15 11:22:55 +09:00
Dan Balasescu
b8bd28b7d9
Merge branch 'master' into osu-modtimeramp 2020-06-15 11:20:28 +09:00
Dean Herbert
978636b90c Fix storyboard sample playback failing when expected to play at 0ms 2020-06-15 09:38:33 +09:00
Joehu
1f7679e829 Fix home button not flashing when pressing shortcut 2020-06-14 11:24:23 -07:00
Joehu
b8fa1a2c41 Add shortcut to go home 2020-06-14 11:22:38 -07:00
Bartłomiej Dach
e6ddd0380e Rename bool arguments for readability 2020-06-14 18:50:07 +02:00
Bartłomiej Dach
5f0a345eeb Unify method naming 2020-06-14 18:48:49 +02:00
Bartłomiej Dach
9907b4763b Remove redundant default argument value 2020-06-14 18:39:41 +02:00
Dean Herbert
0d53d0ffc8 Fix back-to-front math 2020-06-15 00:46:20 +09:00
Dan Balasescu
ae851eacbe
Merge branch 'master' into fix-local-score-display 2020-06-14 14:10:23 +09:00
Dean Herbert
abe07b742e Fix drag scroll in editor timeline no longer working correctly 2020-06-14 13:20:58 +09:00
Dean Herbert
7b95c55afb Fix HardwareCorrectionOffsetClock breaking ElapsedTime readings 2020-06-14 11:33:59 +09:00
Ronnie Moir
dc5bb12fa8 Use local helper for selecting adjusted property 2020-06-13 16:32:43 +01:00
Ronnie Moir
77eb428184 Use consistent setting casing 2020-06-13 16:30:21 +01:00
Ronnie Moir
201bfda338 Give ModTimeRamp an adjust pitch setting.
Implement in ModWindDown and ModWindUp
2020-06-13 15:16:27 +01:00
BananeVolante
04c1efe298 resolved issues with inspect code script 2020-06-13 14:33:55 +02:00
Dean Herbert
b9e247da8f Simplify lookup code 2020-06-13 21:19:06 +09:00
Bartłomiej Dach
aab606b237 Cancel scheduled asynchronous load of comments 2020-06-13 13:00:05 +02:00
Power Maker
9230c148c7 Add cursor rotation on middle mouse button 2020-06-13 12:18:50 +02:00
Dean Herbert
c490dba7b3 Fix crash on local score display 2020-06-13 18:18:46 +09:00
BananeVolante
794b8673e2 formated using dotnet format 2020-06-13 10:56:02 +02:00
BananeVolante
8b8f2dfda2 Removed duplicate samplepause.stop() calls, removed test lines
Since restart() always call perform immediate exit when the function lead
to a restart, there is no need to stop the pause sample in restart
2020-06-13 10:31:54 +02:00
BananeVolante
6fd8548f79 no longer crash if the restart sample isn't found 2020-06-13 10:13:41 +02:00
clayton
7bc70e644a
Add Unspecified language 2020-06-13 00:20:34 -07:00
clayton
7212ab3a1a
Add new beatmap genres and languages 2020-06-12 23:48:30 -07:00
BananeVolante
e8db2cfd6d Merge branch 'master' of https://github.com/ppy/osu
updated local source
2020-06-12 19:31:26 +02:00
BananeVolante
2feaf2c74a added music during pause 2020-06-12 19:17:52 +02:00
mcendu
c6e087b994 remove incorrectly added key 2020-06-12 23:11:50 +08:00
mcendu
586e3d405c add proper decoding support? 2020-06-12 22:48:18 +08:00
Power Maker
aa977569e2
Merge branch 'master' into master 2020-06-12 16:41:34 +02:00
Power Maker
8924ff4ba6 Rename shouldRotateCursor() to shouldKeepRotating() 2020-06-12 15:43:19 +02:00
mcendu
7c3e7b65a8 add custom file path support for osu\!mania judgement sprite 2020-06-12 21:22:22 +08:00
Power Maker
b076cf96b7 move cursorRotate.Value check into shouldRotateCursor() method 2020-06-12 13:20:09 +02:00
Dean Herbert
273eb6f746 Merge branch 'master' into test-scene-create-ruleset 2020-06-12 19:40:12 +09:00
Dean Herbert
7ae421cc8e Revert more incorrect changes 2020-06-12 19:32:32 +09:00
Dean Herbert
f5c3863e6d Revert variable usage 2020-06-12 19:26:46 +09:00
Dean Herbert
446ce2590c Move local back in place 2020-06-12 19:25:54 +09:00
Dean Herbert
89cf146d18 Fix base UpdateManager thinking it can check for updates 2020-06-12 19:24:50 +09:00
Dean Herbert
35f577375c Restore notification code 2020-06-12 19:20:45 +09:00
Dean Herbert
4f809767a5 Disable button while update check is in progress 2020-06-12 18:36:36 +09:00
Dean Herbert
3dd642a336 Ensure only one update check can be running at a time 2020-06-12 18:29:21 +09:00
Dean Herbert
6beb28b685 Rename method to be less bad 2020-06-12 18:07:39 +09:00
Dean Herbert
95f57ca88c Remove duplicate calls to CheckForUpdatesAsync 2020-06-12 18:05:23 +09:00
Dean Herbert
6296cd62d0 Merge branch 'master' into update-button 2020-06-12 18:00:36 +09:00
Dean Herbert
0b6e8783d4
Merge branch 'master' into test-scene-create-ruleset 2020-06-12 17:06:27 +09:00
Dean Herbert
91b6979c97 Fix LoadingSpinner not always playing fade in animation 2020-06-12 13:38:20 +09:00
smoogipoo
b7c1cfbe63 Adjust display to avoid overlaps 2020-06-11 15:07:14 +09:00
smoogipoo
7b012f1def Fix test failures 2020-06-11 14:55:49 +09:00
smoogipoo
afa5b995f2 Merge branch 'fix-test-nullref' into timeshift-results-2 2020-06-11 14:05:05 +09:00
Salman Ahmed
4fb71eeb20
Move setting up the ruleset bindable to top-base test scene 2020-06-10 18:23:31 +03:00
Dean Herbert
3ae1df07b0 Fix a couple more new formatting issues 2020-06-10 00:09:29 +09:00
Dean Herbert
7dc19220e5 Apply new resharper formatting fixes 2020-06-09 23:38:54 +09:00
Dean Herbert
7274213cce Update framework 2020-06-09 23:30:42 +09:00
smoogipoo
ab10732a78 Remove usages of null-forgiving operator 2020-06-09 22:13:48 +09:00
smoogipoo
88aed1d504 Merge branch 'master' into update-inspectcode-version 2020-06-09 20:12:39 +09:00
Dan Balasescu
527577d7c3
Merge pull request #9236 from MiraiSubject/logovisualisation-subclass
Move user and skin specific settings for LogoVisualisation to a subclass
2020-06-09 19:16:24 +09:00
smoogipoo
05b1edb9d8 Fix incorrect beatmap showing 2020-06-09 19:01:02 +09:00
smoogipoo
4fd5ff61eb Add loading spinner 2020-06-09 18:53:55 +09:00
smoogipoo
44dd7d65be Fix duplicate scores showing 2020-06-09 18:21:37 +09:00
smoogipoo
7f05c16c9f Merge branch 'master' into timeshift-results-2 2020-06-09 15:59:13 +09:00
Dan Balasescu
7f72f59307
Merge branch 'master' into fetch-private-chat-history 2020-06-09 14:42:29 +09:00
Dan Balasescu
1476412eaa
Merge branch 'master' into startup-safety 2020-06-09 13:55:33 +09:00
Dean Herbert
9d68a95f3f
Merge branch 'master' into multi-room-load-spinner 2020-06-09 10:56:56 +09:00
Dean Herbert
5fdeeec8df
Merge pull request #9175 from smoogipoo/multiplayer-beatmap-checksum
Add timeshift beatmap checksum validation
2020-06-09 10:53:33 +09:00
Shivam
a60bb5feac Rename baseclass, add xmldoc & change access to internal 2020-06-08 23:45:40 +02:00
Shivam
2a5e960025 Move user and skin specific settings to a subclass 2020-06-08 21:15:51 +02:00
dependabot-preview[bot]
e0c94304c7
Bump Humanizer from 2.8.11 to 2.8.26
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.11 to 2.8.26.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.11...v2.8.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 09:45:31 +00:00
dependabot-preview[bot]
ff555c41c6
Bump Sentry from 2.1.1 to 2.1.3
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.1 to 2.1.3.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.1...2.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 08:57:44 +00:00
Dean Herbert
712fd6a944 Fetch existing private message channels on re-joining 2020-06-08 17:54:26 +09:00
Dean Herbert
dd61d6ed04 Attempt to reimport intro if a bad state is detected 2020-06-08 14:48:42 +09:00
Dean Herbert
63003757c4 Remove WorkingBeatmap cache when deleting or updating a beatmap 2020-06-08 14:48:26 +09:00
smoogipoo
443977aa8d Remove PreUpdate, update hash in Save() 2020-06-08 14:40:17 +09:00
smoogipoo
dfed27bd46 Add back stream seeking for sanity 2020-06-08 14:24:21 +09:00
Dean Herbert
72ada020a2 Don't attempt to use virtual track for intro sequence clock 2020-06-08 13:42:16 +09:00
Craftplacer
101604e741 Redesign classes and generally improve code 2020-06-08 00:39:33 +02:00
Craftplacer
e95ffcb528 Merge remote-tracking branch 'upstream/master' into update-button 2020-06-07 22:51:03 +02:00
Craftplacer
4e56981554 Merge remote-tracking branch 'upstream/master' into update-button
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
2020-06-07 22:43:53 +02:00
Dean Herbert
b41384dde8
Merge branch 'master' into multiplayer-beatmap-checksum 2020-06-07 18:05:33 +09:00
Salman Ahmed
efd5e14410
Clarify why ruleset bindable must be set at the BDL of any base test scene 2020-06-06 19:20:06 +03:00
Salman Ahmed
0f78af7252
Remove unnecessary disabled check
I have a bad memory here, til.
2020-06-06 19:19:30 +03:00
Dan Balasescu
2ad5b2065f
Merge branch 'master' into better-reimport-support 2020-06-05 20:59:55 +09:00
smoogipoo
bb89114b70 Show a loading spinner on multiplayer lounge loads 2020-06-05 20:52:27 +09:00
smoogipoo
0107e9ba16 Change lookups to use SingleOrDefault() 2020-06-05 19:18:00 +09:00
smoogipoo
caf94df0d0 Merge branch 'master' into multiplayer-beatmap-checksum 2020-06-05 19:16:05 +09:00
Dean Herbert
5d1770dec8
Merge pull request #9212 from smoogipoo/fix-scorepanel-input
Fix score panel not receiving input in some places
2020-06-05 00:26:02 +09:00
Dean Herbert
bd2e4c50dd
Merge pull request #9211 from smoogipoo/change-date-format
Change format of date on score panel
2020-06-04 23:31:28 +09:00
smoogipoo
9c1542f897 Fix crash when pressing clear button twice 2020-06-04 22:17:00 +09:00
smoogipoo
afcefe01bf Fix score panel not receiving input in some places 2020-06-04 21:48:55 +09:00
smoogipoo
5d7bb8cb4e Change format of date on score panel 2020-06-04 21:33:38 +09:00
Salman Ahmed
741fa20149
Use CreateRuleset() for editor test scenes as well 2020-06-04 00:47:10 +03:00