1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 02:22:59 +08:00
Commit Graph

10485 Commits

Author SHA1 Message Date
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
Dean Herbert
3db75cd2fc
Merge pull request #2017 from ppy/osu/master
Stopping non-url text from being hyperlinks
2018-02-04 11:50:25 +09:00
Imnooby
c4f3223e34 Stops non-url text from being hyperlinks
Fixed crash when you attempted to click one
2018-02-03 18:24:49 -06:00
Dan Balasescu
a9148d81d2
Merge pull request #2011 from peppy/new-restore-default-design
Update design of "revert to default" button
2018-02-02 16:11:26 +09:00
Dean Herbert
39160d895c Update design of "revert to default" button
Also fixes some inconsistencies in padding
2018-02-02 15:18:39 +09:00
Dan Balasescu
c25acd831b
Merge pull request #2005 from tgi74/PlayerSettigsOverlay_InputHandle
Fix PlayerSettingsOverlay not able to reappear after being hidden
2018-02-02 11:21:37 +09:00
Dan Balasescu
2c45fc67a4
Merge branch 'master' into PlayerSettigsOverlay_InputHandle 2018-02-02 11:12:33 +09:00
Dean Herbert
86eaf9872f
Merge pull request #2004 from ppy/osu/SH_SSH_support
Store and show SSPlus and SPlus statistics on user page
2018-02-02 10:49:46 +09:00
tgi74000
b0fbae9dfc Fix PlayerSettingsOverlay not reappearing when Hidden 2018-02-01 16:07:49 +01:00
tgi74000
e08a9350a0 Store and show SSPlus and SPlus statistics 2018-02-01 15:19:49 +01:00
Dean Herbert
d9654e4d64
Merge pull request #2003 from smoogipoo/catmull-sliders
Implement Catmull-Rom curve approximator
2018-02-01 21:41:01 +09:00
Dean Herbert
002fe45741
Merge branch 'master' into catmull-sliders 2018-02-01 21:21:25 +09:00
Dean Herbert
dea49932a3
Merge pull request #2001 from peppy/fix-catch-autoplay-misses
Fix osu!catch autoplay missing bananas when running above 1x playback speed
2018-02-01 21:20:52 +09:00
Dean Herbert
5ba84a67f1
Merge branch 'master' into catmull-sliders 2018-02-01 20:58:33 +09:00
Dean Herbert
4002b3123c
Merge branch 'master' into fix-catch-autoplay-misses 2018-02-01 20:24:10 +09:00
Dean Herbert
79288bcbe0
Merge pull request #2000 from peppy/fix-replay-time-stop
Fix clock not incrementing beyond last frame of replay
2018-02-01 20:24:01 +09:00
Dean Herbert
c08fadb191
Merge branch 'master' into fix-catch-autoplay-misses 2018-02-01 20:10:39 +09:00
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
smoogipoo
13f16077d4 Implement Catmull-Rom curve approximator 2018-02-01 20:04:41 +09:00
Dean Herbert
468205d450 Fix osu!catch autoplay missing bananas when running above 1x playback speed 2018-02-01 19:52:36 +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