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

32471 Commits

Author SHA1 Message Date
Dean Herbert
89beea6658
Merge pull request #10317 from smoogipoo/protect-multiple-applyresult
Safeguard againts multiple ApplyResult() invocations
2020-10-01 22:22:26 +09:00
smoogipoo
042c39ae1b Remove redundant string interpolation 2020-10-01 21:48:45 +09:00
smoogipoo
d7f9b8045c Safeguard againts multiple ApplyResult() invocations 2020-10-01 21:33:54 +09:00
Dan Balasescu
c93d1631d4
Merge pull request #10257 from hbnrmx/legacy-SpinnerNoBlink
Add support for SpinnerNoBlink to LegacyOldStyleSpinner
2020-10-01 21:25:48 +09:00
Dan Balasescu
73edb87363
Merge pull request #10303 from peppy/more-textbox-entry
Add textbox entry for speed multiplier and volume
2020-10-01 20:42:14 +09:00
Dan Balasescu
df07ca445f
Merge branch 'master' into legacy-SpinnerNoBlink 2020-10-01 20:34:23 +09:00
smoogipoo
3e6af7ce43 Refactor for readability 2020-10-01 20:09:09 +09:00
Max Hübner
7e5ecd84bc Add braces to clear up operator precedence 2020-10-01 12:41:44 +02:00
Dean Herbert
a9f76e859f
Merge pull request #10292 from smoogipoo/fix-score-recalc 2020-10-01 18:50:13 +09:00
Dean Herbert
ffc1e9c358 Update framework 2020-10-01 18:23:38 +09:00
Dan Balasescu
3a81602d0c
Merge pull request #10286 from peppy/fix-hitobject-sample-stuck-on-future-seek
Fix HitObject samples getting stuck in a playing state on seeking far into the future
2020-10-01 18:08:17 +09:00
Dean Herbert
09c5aee4df
Merge pull request #10291 from smoogipoo/adjust-hp-increases 2020-10-01 17:56:12 +09:00
Dean Herbert
a1b8ced46d
Merge branch 'master' into fix-score-recalc 2020-10-01 17:00:20 +09:00
Dean Herbert
1ec96e1bb1
Merge branch 'master' into adjust-hp-increases 2020-10-01 16:58:29 +09:00
Dean Herbert
8c5176a97b
Merge pull request #10290 from smoogipoo/adjust-hit-result-types 2020-10-01 16:57:54 +09:00
Dean Herbert
482c23901b Check RequestedPlaying state before allowing scheduled resume of looped sample 2020-10-01 16:54:58 +09:00
Dean Herbert
b7ac779760 Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek 2020-10-01 16:46:14 +09:00
smoogipoo
7890319802 Merge branch 'master' into adjust-hit-result-types 2020-10-01 16:19:07 +09:00
Dean Herbert
8654b0b0b0
Merge pull request #10288 from smoogipoo/scoring-standardisation 2020-10-01 15:56:21 +09:00
Dean Herbert
e0a0902a15 Ensure textbox always reverts to sane state on out-of-range failures 2020-10-01 13:06:24 +09:00
Dean Herbert
61e62929ee Apply changes in line with framework event logic update 2020-10-01 13:06:01 +09:00
smoogipoo
cb6b35116a Merge branch 'master' into scoring-standardisation 2020-10-01 12:28:51 +09:00
smoogipoo
c9f38f7bb6 Add obsoletion notice 2020-10-01 12:28:33 +09:00
Dean Herbert
9d07dce5e4
Merge pull request #10251 from smoogipoo/additional-hit-results 2020-10-01 12:19:48 +09:00
smoogipoo
3c9ee6abc1 Use local static to determine score per spinner tick 2020-10-01 12:15:34 +09:00
smoogipoo
3a26bd8d9b Adjust obsoletion + xmldoc of NumericResultFor() 2020-10-01 12:14:16 +09:00
smoogipoo
806d8b4b1d Make scoring int-based again 2020-10-01 12:13:24 +09:00
smoogipoo
6b416c9881 Rename method and improve method implementation 2020-10-01 12:09:12 +09:00
Bartłomiej Dach
97879c3c98
Merge pull request #10308 from GSculerlor/user-list-panel-bg
Fix UserListPanel background position
2020-10-01 01:10:08 +02:00
Bartłomiej Dach
10ae93cc2e
Merge branch 'master' into more-textbox-entry 2020-09-30 23:54:00 +02:00
Ganendra Afrasya
ca9f5b447e Fix UserListPanel background position 2020-10-01 02:02:27 +07:00
Dan Balasescu
bc09b81815
Merge pull request #10268 from bdach/taiko-explosion-rework
Rework legacy taiko strong explosions to not require frame-perfect hits to show
2020-10-01 01:04:54 +09:00
Dan Balasescu
7e34ce839e
Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek 2020-09-30 23:31:03 +09:00
Dan Balasescu
148e2769c8
Merge pull request #10304 from peppy/fix-control-point-bindable-updates
Fix control point timeline display not updating with changes
2020-09-30 23:30:35 +09:00
Dan Balasescu
5d76ce8350
Merge pull request #10285 from peppy/fix-storyboard-sample-pausing
Fix storyboard samples not pausing
2020-09-30 23:30:18 +09:00
Dan Balasescu
a6c7bc0cdb
Merge branch 'master' into taiko-explosion-rework 2020-09-30 23:02:46 +09:00
Dean Herbert
4b70fe8585 Merge branch 'fix-storyboard-sample-pausing' into fix-hitobject-sample-stuck-on-future-seek 2020-09-30 22:46:09 +09:00
Dean Herbert
367b35bb10 Merge branch 'master' into fix-storyboard-sample-pausing 2020-09-30 22:42:26 +09:00
Dan Balasescu
6def54548b
Merge branch 'master' into fix-control-point-bindable-updates 2020-09-30 21:35:36 +09:00
Dan Balasescu
db78a0edf4
Merge pull request #10282 from peppy/fix-editor-silence-on-seek
Fix hit samples playing while paused / seeking in the editor
2020-09-30 21:33:25 +09:00
Dan Balasescu
6dab5c2ceb
Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 21:33:15 +09:00
Dan Balasescu
7eb45990a4
Merge pull request #10302 from peppy/timing-screen-clean-up
Fix timing screen tests and add simple view of control points to timeline
2020-09-30 21:33:07 +09:00
smoogipoo
77651be2ca Remove padding from HitResult 2020-09-30 21:32:50 +09:00
Dan Balasescu
3af7e59103
Merge pull request #10289 from peppy/timeline-ux-improvements
Improve the usability of the editor timeline with combo colour and indices
2020-09-30 20:32:55 +09:00
Dean Herbert
fa742a2ef1 Update to consume framework fixes 2020-09-30 20:28:02 +09:00
Dean Herbert
df9d4bc2f0 Merge branch 'master' into fix-control-point-bindable-updates 2020-09-30 20:27:25 +09:00
Dean Herbert
a11c74d600 Update to consume framework fixes 2020-09-30 20:27:02 +09:00
Dean Herbert
f9d6aed2df Merge branch 'master' into timing-screen-clean-up 2020-09-30 20:26:02 +09:00
Dan Balasescu
496dd5bb2b
Merge pull request #10305 from peppy/update-framework
Update framework
2020-09-30 19:26:05 +09:00
Dean Herbert
fab11a8241 Update framework 2020-09-30 18:36:40 +09:00