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

13453 Commits

Author SHA1 Message Date
smoogipoo
87e8074cd2 Use a const for excess length 2018-06-28 11:46:56 +09:00
smoogipoo
c0c94e24b9 Use VirtualBeatmapTrack in testcases 2018-06-28 11:45:48 +09:00
Dean Herbert
ac7ee59d50 Add migration for previous incorrectly imported beatmaps 2018-06-28 10:48:01 +09:00
Dean Herbert
5ad122bfec Fix beatmaps importing with -1 as online set ID 2018-06-28 10:28:35 +09:00
Joehu
8518fce4a9 Fix osu!supporter naming 2018-06-27 17:57:55 -07:00
Dean Herbert
e197ebe4c5 Fix slider heads displaying in incorrect colour 2018-06-28 01:55:09 +09:00
ekrctb
1ed6a672f2 Update volme control
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
2018-06-27 18:43:29 +09:00
smoogipoo
5640385f48 Update the length once during construction 2018-06-27 16:12:49 +09:00
smoogipoo
b4b28f8ae8 Make GetWaveform() not hard bail if errors occur 2018-06-27 16:07:18 +09:00
smoogipoo
b88c4464cb Make virtual beatmap tracks approximate beatmap length 2018-06-27 16:02:49 +09:00
Dean Herbert
527d7c29f2
Merge branch 'master' into fix-background-screen-crash 2018-06-27 16:00:59 +09:00
Dan Balasescu
6eb3e6c541
Merge pull request #2857 from peppy/make-loading-more-visible
Improve the visibility of the global loading animation
2018-06-27 13:06:43 +09:00
smoogipoo
f8acd9e451 Cleanup 2018-06-27 12:59:19 +09:00
Dean Herbert
0866dd11bd DefaultBackAction -> BackAction, defaults to last button
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
smoogipoo
ede59f63f6 Merge remote-tracking branch 'origin/master' into make-loading-more-visible 2018-06-27 12:52:06 +09:00
Dean Herbert
d7ce4ab6fd Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player 2018-06-27 12:36:10 +09:00
Dean Herbert
2bb1550040
Merge pull request #2794 from smoogipoo/legacy-slider-offset
Add legacy slider offsets to osu!/osu!catch
2018-06-27 12:25:38 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-27 12:21:29 +09:00
Dean Herbert
10220a61a5 Use playfield size constants where possible 2018-06-27 12:18:00 +09:00
smoogipoo
0e6cc78d9a Add slider ticks conversion test 2018-06-27 12:09:40 +09:00
smoogipoo
6f65ad33f0 Output one value per slider nested hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
0366b0f081 The tail circle will always be the last hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
de3708ea3a Public + explicitly define test fixtures 2018-06-27 12:09:39 +09:00
smoogipoo
8e4dd58e68 Restore ignored unit tests 2018-06-27 12:09:39 +09:00
smoogipoo
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
Dean Herbert
0f123734f5
Merge pull request #2827 from smoogipoo/editor-seek-snapping-fix
Fix editor not always scrolling beyond timing point beats
2018-06-27 12:03:46 +09:00
Dean Herbert
ac1bf3b092
Merge branch 'master' into editor-seek-snapping-fix 2018-06-27 11:08:19 +09:00
Dean Herbert
73994482d5
Merge pull request #2860 from peppy/fix-unauthorized-request
Fix API getting stuck in an endless loop under a certain unauthorized scenario
2018-06-26 22:37:50 +09:00
Dean Herbert
1b050ca68e
Merge branch 'master' into fix-unauthorized-request 2018-06-26 22:25:19 +09:00
Dan Balasescu
c58728d72e
Merge pull request #2883 from peppy/update-framework
Update framework and other nuget dependencies
2018-06-26 20:54:59 +09:00
Dan Balasescu
830ce0da4c
Merge branch 'master' into update-framework 2018-06-26 20:41:08 +09:00
smoogipoo
8a81fba1ea Other input states need to be considered for wheel bindings 2018-06-26 20:34:22 +09:00
Dean Herbert
f9e2aabbdb
Merge pull request #2635 from ekrctb/catch-droplet-fix
Use FastRandom for catch droplets and bananas positions
2018-06-26 20:32:50 +09:00
Dean Herbert
1a8aa6eab1 Fix regression causing new combos to once again not be respected 2018-06-26 20:13:55 +09:00
smoogipoo
f1dfe04bd9 Fix broken conditional 2018-06-26 20:13:44 +09:00
smoogipoo
02b733a42e Merge remote-tracking branch 'origin/master' into fix-unauthorized-request 2018-06-26 19:58:51 +09:00
Dean Herbert
f7f17bab78
Merge branch 'master' into catch-droplet-fix 2018-06-26 19:29:15 +09:00
Dean Herbert
018dcc98b4 Fix failing tests 2018-06-26 19:17:34 +09:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad Fix review issues 2018-06-26 17:01:40 +09:00
Dean Herbert
13480feb4f Remove error logging
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
Dean Herbert
388ca5d572 Move leaderboard update scheduling to a more central method 2018-06-26 16:33:22 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
a8579c49f9
Merge pull request #2628 from ekrctb/catch-stable-hyper
Modify catch hyperdash behavior to match to stable
2018-06-26 13:29:35 +09:00
Dean Herbert
cc746c0dde Merge remote-tracking branch 'upstream/master' into ekrctb-catch-stable-hyper 2018-06-26 13:02:39 +09:00
Dean Herbert
96191fc3ce Move transition variable back to being local to function 2018-06-26 13:02:29 +09:00
Dean Herbert
563cb46b4a Update framework and other nuget dependencies 2018-06-26 12:10:56 +09:00
Roman Kapustin
2a72062c33 Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part. 2018-06-26 00:53:31 +03:00
smoogipoo
cd74ec705e Fix possible mis-ordering of scroll position updates
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.

2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
Dean Herbert
6736f2988e
Merge pull request #2803 from smoogipoo/more-diffcalc-attributes
Move beatmap difficulty attributes to the difficulty calculators
2018-06-25 20:04:45 +09:00