Commit Graph

23943 Commits

Author SHA1 Message Date
355705f0a5 Fix legacy tick handling 2019-03-08 19:57:30 +09:00
8e5816805c Fix showing outdated data for non-online beatmaps 2019-03-08 18:44:35 +09:00
192c257aac Add test steps for BeatmapDetailArea 2019-03-08 18:35:49 +09:00
800007c378 Set DummyWorkingBeatmap difficulties to 0 for better fallback display 2019-03-08 18:17:50 +09:00
9a05643ec9 Minor refactorings 2019-03-08 17:18:54 +09:00
a40ffcc692 Apply formatting adjustments 2019-03-08 16:44:39 +09:00
8c0e325d8b Reduce + make beatmap scores testcase work 2019-03-08 16:41:37 +09:00
a7ad29ca9d Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-08 16:32:46 +09:00
a40a0f10bd Merge pull request #4431 from peppy/gameplay-clock-container
Simplify gameplay clock logic with a dedicated container
2019-03-08 16:05:48 +09:00
d055b248ac Remove blank line 2019-03-08 15:56:36 +09:00
7c5ca67691 Merge remote-tracking branch 'origin/master' into gameplay-clock-container
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
2019-03-08 15:54:15 +09:00
253a37c8a7 Merge pull request #4436 from peppy/fix-non-async-load
Fix some non-async load scenarios
2019-03-08 15:49:02 +09:00
973f29b765 Apply review 2019-03-08 15:14:57 +09:00
c967875ff6 Merge branch 'master' into fix-non-async-load 2019-03-08 15:14:37 +09:00
e00702f4e4 Merge remote-tracking branch 'origin/master' into fix-non-async-load 2019-03-08 15:14:14 +09:00
09b5cf4891 Move sizing to ctor 2019-03-08 15:14:07 +09:00
7bf60934a5 Merge pull request #4418 from peppy/cursor-in-playfield
Fix gameplay cursor discrepancies
2019-03-08 15:12:26 +09:00
ed8c9bc88a Merge remote-tracking branch 'upstream/master' into gameplay-clock-container 2019-03-08 15:07:55 +09:00
42efea1e06 Apply review 2019-03-08 15:05:45 +09:00
a73e3d9700 Move cursor construction to BDL 2019-03-08 15:01:45 +09:00
2c98ba1c0c Split out consumption and creation into two separate code paths 2019-03-08 14:59:45 +09:00
3ccc76e18f Merge remote-tracking branch 'upstream/master' into cursor-in-playfield 2019-03-08 14:50:46 +09:00
551380dd42 Extract slider tick creation so it can be shared with osu!catch 2019-03-08 14:46:26 +09:00
398c330934 Merge pull request #4420 from nekodex/fix-roomstate-on-cancel
Fix RoomInspector image inadvertently changing when cancelling MP room creation
2019-03-08 14:30:17 +09:00
969d5bcbd0 Merge branch 'master' into fix-roomstate-on-cancel 2019-03-08 14:10:24 +09:00
93ae058681 Merge pull request #4410 from peppy/fix-cursor-in-scale-container
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-08 14:06:58 +09:00
400514630d Fix incomplete comment 2019-03-08 12:44:33 +09:00
d1c18c52ab Merge branch 'master' into fix-cursor-in-scale-container 2019-03-08 12:43:57 +09:00
c4cc72cad9 Merge pull request #4437 from peppy/fix-resharper-inspection
Fix stuck r# inspection
2019-03-08 12:43:17 +09:00
08fc42f8e9 Merge branch 'master' into fix-roomstate-on-cancel 2019-03-08 12:39:29 +09:00
3a634b7d72 Merge pull request #4419 from nekodex/fix-duplicate-bg-sprites
Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites
2019-03-08 12:34:56 +09:00
75e94eba35 Merge branch 'master' into gameplay-clock-container 2019-03-08 12:32:48 +09:00
345c7f4fa8 Fix test regression 2019-03-08 12:30:52 +09:00
5ade51f030 Merge branch 'master' into fix-resharper-inspection 2019-03-08 12:29:56 +09:00
30a0bb4a25 Merge branch 'master' into fix-duplicate-bg-sprites 2019-03-08 12:25:23 +09:00
196ebab10f Merge pull request #4434 from peppy/fix-autoplay-tests
Fix replay tests not working
2019-03-08 12:21:33 +09:00
d01b026ebd Fix stuck r# inspection 2019-03-08 12:16:12 +09:00
075ea70124 Move more toolbar to async load 2019-03-08 12:15:27 +09:00
11e5c6a2a0 Fire initial APIStateChanged on local thread 2019-03-08 12:15:27 +09:00
101009c92e Merge branch 'master' into fix-autoplay-tests 2019-03-08 12:14:40 +09:00
272ebeb23d Merge pull request #4435 from peppy/update-framework-and-prs
Update framework
2019-03-08 10:59:28 +09:00
cfac47413c Disable failing tests temporarily 2019-03-08 10:42:25 +09:00
c93adb220e Use official NuGet osu-framework build for Android 2019-03-07 10:14:19 -06:00
340997f505 Rename remaining usage of PathWidth naming convention 2019-03-07 20:21:59 +09:00
27edc41c11 Update framework 2019-03-07 20:14:43 +09:00
5ab9f45a8f Merge branch 'drawnode-changes' 2019-03-07 20:10:42 +09:00
7fa84335ce Merge branch 'line-graph-fix' 2019-03-07 20:10:11 +09:00
30c6a7c3c5 Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
2019-03-07 18:48:23 +09:00
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00