1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 08:07:40 +08:00
Commit Graph

4209 Commits

Author SHA1 Message Date
Huo Yaoyuan
061c3cacbd CI fixes. 2017-04-26 20:04:32 +08:00
Huo Yaoyuan
3706bc8741 Merge branch 'master' into locale 2017-04-26 19:56:34 +08:00
Dean Herbert
5e76f02b4f Merge pull request #677 from peppy/fix-mouse-button-disable
Fix disabling mouse buttons causing auto to stop working.
2017-04-26 20:52:50 +09:00
Huo Yaoyuan
4cb18361c1 Use localisation engine for unicode text. 2017-04-26 19:50:38 +08:00
Huo Yaoyuan
cf3e83ca62 Save ShowUnicode in framework config. 2017-04-26 19:48:46 +08:00
Dan Balasescu
a243729a54 Merge branch 'master' into fix-mouse-button-disable 2017-04-26 20:43:56 +09:00
Dan Balasescu
ea226cff76 Merge pull request #672 from peppy/replay-playback-accuracy
Improve replay playback accuracy
2017-04-26 20:43:37 +09:00
Dan Balasescu
f261a077d2 General fixes/cleanup in Player. 2017-04-26 20:37:47 +09:00
Dan Balasescu
08b1d5beb9 Use const where it was inteded. 2017-04-26 20:15:34 +09:00
Dean Herbert
c5afb4b2a0 Merge remote-tracking branch 'upstream/master' into replay-playback-accuracy 2017-04-26 19:53:30 +09:00
Dan Balasescu
df5a95b675 Merge branch 'master' into fix-mouse-button-disable 2017-04-26 19:53:13 +09:00
Dean Herbert
bd71b23699 Update framework again. 2017-04-26 19:52:51 +09:00
Dean Herbert
eee3c9166a Merge pull request #676 from smoogipooo/taiko-fixes
Adjust Swell hit speed.
2017-04-26 19:37:13 +09:00
Dean Herbert
4087b638cf Merge branch 'master' into taiko-fixes 2017-04-26 19:27:05 +09:00
Dean Herbert
e826f17eb0 Fix get-set mismatch. 2017-04-26 19:25:41 +09:00
Dean Herbert
7ef9af92f3 Merge pull request #663 from smoogipooo/fix-drumroll-conversion
Fix drumroll conversion
2017-04-26 19:22:50 +09:00
Dean Herbert
49c02f5ad6 Merge branch 'master' into fix-drumroll-conversion 2017-04-26 19:16:40 +09:00
Dean Herbert
2d0b428a7a Merge pull request #675 from smoogipooo/taiko-difficulty-calculation
Implement Taiko difficulty calculation.
2017-04-26 19:01:01 +09:00
Dean Herbert
f48d497737 Fix disabling mouse buttons causing auto to stop working. 2017-04-26 18:56:20 +09:00
Dean Herbert
c2108b7706 Use object initialiser. 2017-04-26 18:32:47 +09:00
Dean Herbert
b6f838f536 Fix potential nullref. 2017-04-26 18:32:40 +09:00
Dean Herbert
867c16665b Update framework. 2017-04-26 18:22:09 +09:00
Dean Herbert
4656a7170a Add very basic lead-in support. 2017-04-26 18:17:25 +09:00
Dean Herbert
9d14b6e1e9 Make SongProgress return the actual time value via OnSeek. 2017-04-26 18:17:17 +09:00
Dean Herbert
01caaf44f3 Add a decoupled clock to allow for lead-in and lead-out time. 2017-04-26 18:16:55 +09:00
smoogipooo
47cd91fa63 CI fixes. 2017-04-26 17:04:57 +09:00
smoogipooo
8df3c3f736 Adjust Swell hit speed. 2017-04-26 16:28:53 +09:00
smoogipooo
d9dec9d444 Implement Taiko difficulty calculation. 2017-04-26 15:50:08 +09:00
Dan Balasescu
22be765323 Update HitObject.cs 2017-04-26 14:45:30 +09:00
smoogipooo
4c2985b6d1 Use CRLF instead of LF. 2017-04-26 14:40:40 +09:00
smoogipooo
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
smoogipooo
ac5f70b765 Fix drum roll conversion not generating strong hits. 2017-04-26 13:48:31 +09:00
smoogipooo
324d5c1093 Merge remote-tracking branch 'origin/master' into fix-drumroll-conversion 2017-04-26 13:17:28 +09:00
Dean Herbert
e003d9fc3c Add basic replay frame accurate "seeking".
Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.
2017-04-25 22:59:58 +09:00
Dean Herbert
d476482493 Add basic seeking support when a replay is loaded. 2017-04-25 22:59:51 +09:00
Dean Herbert
eb5d334838 Add non-toggle support for showing seek bar in SongProgress. 2017-04-25 22:59:46 +09:00
Dean Herbert
36c649f965 Merge pull request #673 from peppy/general-fixes
Update framework.
2017-04-25 21:51:03 +09:00
Dean Herbert
aa534ead7d Update framework. 2017-04-25 20:52:26 +09:00
Dean Herbert
73b8d58944 Merge pull request #658 from Jorolf/slider-stuff
Slider tooltip and letterboxing/dim changes
2017-04-25 20:03:59 +09:00
Dean Herbert
30e2e7bfe4 Merge branch 'master' into slider-stuff 2017-04-25 19:42:46 +09:00
Dean Herbert
8d1ad1ab8c Merge pull request #671 from peppy/general-fixes
Update README.
2017-04-25 19:42:36 +09:00
Dean Herbert
dd7c856228 Merge branch 'master' into general-fixes 2017-04-25 19:36:09 +09:00
Dean Herbert
5dddd49c96 Merge pull request #634 from ColdVolcano/intro-improvements
Bind MenuMusic and MenuVoice
2017-04-25 13:39:30 +09:00
Dean Herbert
f93adebc52 Minor style fixes. 2017-04-25 13:33:34 +09:00
ColdVolcano
51c577624b Remove BeatmapInfo field 2017-04-24 22:59:33 -05:00
ColdVolcano
1df50adc3a Post-merge fixes (and CodeFactor fixes) 2017-04-24 22:48:25 -05:00
ColdVolcano
630c556b80 Merge branch 'master' of https://github.com/ppy/osu into intro-improvements 2017-04-24 22:42:28 -05:00
ColdVolcano
12036cada5 Merge branch 'intro-improvements' of https://github.com/ColdVolcano/osu into intro-improvements 2017-04-24 22:32:23 -05:00
ColdVolcano
e6428dd0c2 Merge branch 'master' of https://github.com/ColdVolcano/osu into intro-improvements 2017-04-24 22:32:10 -05:00
Dean Herbert
b80fa74f47 Update README. 2017-04-25 11:11:57 +09:00