1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
Commit Graph

10466 Commits

Author SHA1 Message Date
Dan Balasescu
c486609174
Merge branch 'master' into fix-replay-time-stop 2018-02-01 20:08:58 +09:00
Dean Herbert
1cb95e9a78
Merge pull request #1998 from smoogipoo/ismaskedaway-input-fix
Fix IsMaskedAway not being up-to-date when fastfowarding replays
2018-02-01 20:08:46 +09:00
Dan Balasescu
0863326b4c
Merge branch 'master' into fix-replay-time-stop 2018-02-01 20:08:07 +09:00
Dean Herbert
e5a64df113
Merge branch 'master' into ismaskedaway-input-fix 2018-02-01 19:47:16 +09:00
Dean Herbert
491ddb8607
Merge pull request #1981 from thomastanck/starrating-fix
Fix osu star rating calculation
2018-02-01 19:32:36 +09:00
Dean Herbert
71be95f743 Bring framework up-to-date 2018-02-01 19:29:35 +09:00
Dean Herbert
9d4ec6f8b5 Merge branch 'master' into ismaskedaway-input-fix 2018-02-01 19:29:10 +09:00
Dean Herbert
1d687c470c Fix clock not incrementing beyond last frame of replay 2018-02-01 18:49:14 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix 2018-02-01 18:44:04 +09:00
Dan Balasescu
9cc95e6e14
Merge pull request #1977 from Aergwyn/fix-ticks-appearing-late
Fix slider ticks appearing too late
2018-02-01 18:37:28 +09:00
Dan Balasescu
39e626f29e
Merge branch 'master' into fix-ticks-appearing-late 2018-02-01 18:28:42 +09:00
Dan Balasescu
acf92527e3
Merge pull request #1999 from peppy/fix-catch-results-screen
Fix osu!catch never reaching the result screen
2018-02-01 18:20:48 +09:00
Dean Herbert
3bd42e3c85 Fix catch never hitting result screen 2018-02-01 18:08:15 +09:00
Dean Herbert
daac7494dd Fix incorrect offset check for DrawableCatchHitObjects 2018-02-01 18:08:15 +09:00
Dean Herbert
1cc7c23982 Hits -> JudgedHits 2018-02-01 18:08:15 +09:00
Dan Balasescu
2971991dfe
Merge pull request #1879 from UselessToucan/VisualSettingsOverlay
Implement a gameplay visual settings overlay
2018-02-01 16:44:53 +09:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay 2018-02-01 16:37:04 +09:00
Dan Balasescu
f71ca65490
Merge pull request #1997 from peppy/inactive-volume-duck
Add the ability to duck volume when the game is inactive
2018-02-01 16:29:31 +09:00
Dan Balasescu
0589708da5
Merge branch 'master' into inactive-volume-duck 2018-02-01 16:21:33 +09:00
Dan Balasescu
ad510950a8
Merge pull request #1667 from FreezyLemon/url-parsing-support
Add URL handling to chat
2018-02-01 16:21:22 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support 2018-02-01 16:13:32 +09:00
smoogipoo
1b99e54005 Fix IsMaskedAway not being up-to-date when fastfowarding replays 2018-02-01 15:21:23 +09:00
Dan Balasescu
5d666547c8
Merge pull request #1994 from peppy/update-taiko-hitsounds
Update taiko hitsounds (courtesey of cYsmix)
2018-02-01 14:34:23 +09:00
Dan Balasescu
c8ccd3cfbf
Merge branch 'master' into update-taiko-hitsounds 2018-02-01 14:05:19 +09:00
Dean Herbert
080ed66f99
Merge pull request #1993 from smoogipoo/better-slider-objects
Make slider tails count towards the slider's judgement
2018-02-01 13:14:38 +09:00
Dean Herbert
cd37be9440
Merge branch 'master' into better-slider-objects 2018-02-01 08:39:39 +09:00
Dean Herbert
f78fbc32f4
Merge pull request #1980 from smoogipoo/fix-taiko-fastforwarding
Fix taiko and mania missing when fastforwarding replays
2018-01-31 18:55:33 +09:00
Aergwyn
41329052d9 Updated submodule osu-resources 2018-01-31 10:46:03 +01:00
Dean Herbert
cdf4d9b033 Remove empty line 2018-01-31 18:33:18 +09:00
Dean Herbert
46a7de1845
Merge branch 'master' into fix-taiko-fastforwarding 2018-01-31 18:30:41 +09:00
Dean Herbert
ef6adb0c27
Merge pull request #1921 from aQaTL/mute-toggle
Ability to mute the game using F4 (or button on volume control)
2018-01-31 18:30:31 +09:00
Dean Herbert
888d2362fd
Merge branch 'master' into fix-taiko-fastforwarding 2018-01-31 18:30:15 +09:00
Dean Herbert
335f0d577c Add the ability to duck volume when the game is inactive 2018-01-31 18:16:55 +09:00
Dean Herbert
fef69cea04 Revert "Add volume ducking"
This reverts commit 01325de3a2897a24b2ba0f585d7e976d0fb44b70.
2018-01-31 18:12:25 +09:00
Dean Herbert
47b92f3d1d Fix mute button not prolonging volume control display 2018-01-31 18:00:44 +09:00
Dean Herbert
93ffa1f8a2 Fix button alignment and animation 2018-01-31 17:36:53 +09:00
Dean Herbert
86f5c9d6f1 Add inactive volume ducking, rather than outright mute 2018-01-31 16:57:26 +09:00
Dean Herbert
97ae44f23c Remove outwards exposure of mute property 2018-01-31 16:56:26 +09:00
Dean Herbert
2865dd3a10 Replace missed hardcoded int with enum reference 2018-01-31 16:20:01 +09:00
Dean Herbert
5a99651561 Remove unnecessary arrays 2018-01-31 16:10:55 +09:00
Dean Herbert
042a34e1c2 Add migration to ensure database aligns to changed enum 2018-01-31 16:10:48 +09:00
Dean Herbert
b47061f43d Merge remote-tracking branch 'upstream/master' into mute-toggle 2018-01-31 14:20:15 +09:00
Dean Herbert
2ffe16d3d2 Improve clarity and coverage of unit tests 2018-01-30 18:57:42 +09:00
Dean Herbert
a94b4a9ea0
Merge branch 'master' into url-parsing-support 2018-01-30 18:55:50 +09:00
Dean Herbert
340412e470
Merge pull request #1944 from ThePyrotechnic/restart-crashfix
Fixed holding retry hotkey at end of map causing hard crash
2018-01-30 18:40:09 +09:00
Dean Herbert
df65443f07 Merge branch 'master'
Conflicts:
	osu-framework
	osu.Game/Screens/Play/Player.cs
2018-01-30 18:31:03 +09:00
Dean Herbert
9b4546bdc4 Update taiko hitsounds (courtesey of cYsmix) 2018-01-30 18:23:25 +09:00
smoogipoo
58cdb59a27 Fix failing testcase 2018-01-30 18:22:40 +09:00
smoogipoo
00001364c3 Better judgement visualisations in testcase 2018-01-30 18:10:14 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00