1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 14:27:31 +08:00
Commit Graph

22012 Commits

Author SHA1 Message Date
Dean Herbert
2cd3657b5e
Merge branch 'master' into beatmap-video 2019-09-13 23:08:57 +09:00
Dean Herbert
624e5644a4 Change osu!catch key trigger to occur on frame before positional change 2019-09-13 23:06:35 +09:00
Dan Balasescu
e536d97255
Merge pull request #6032 from peppy/fix-catch-rewind
Fix osu!catch rewind handling
2019-09-13 23:00:33 +09:00
Dean Herbert
82561aa44a Fix catcher additive sprite rewinding and remove unnecessary update code 2019-09-13 22:44:40 +09:00
Dean Herbert
efadbefc3b Merge remote-tracking branch 'upstream/master' into fix-catch-rewind 2019-09-13 22:23:28 +09:00
Dean Herbert
9e53c091a3
Merge pull request #6095 from peppy/fix-test-dummy-api
Fix incorrect DI usage of IAPIProvider in many tests
2019-09-13 22:22:07 +09:00
Dean Herbert
2379b665e3 Use InvalidOperationException 2019-09-13 22:15:11 +09:00
Dean Herbert
d385c35955
Apply suggestions from code review
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-13 21:55:45 +09:00
Dean Herbert
744085fa54 Fix exploding fruit not getting correct lifetime 2019-09-13 20:25:08 +09:00
Andrei Zavatski
9e742839ac Use correct database migration 2019-09-13 13:57:55 +03:00
Dean Herbert
8ba12fc91f Merge remote-tracking branch 'upstream/master' into fix-catch-rewind 2019-09-13 19:49:36 +09:00
Andrei Zavatski
fb9b25b786 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:48:14 +03:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes 2019-09-13 19:43:33 +09:00
Andrei Zavatski
c13950fbbf Remove custom db additions 2019-09-13 13:43:21 +03:00
Dan Balasescu
2e86185ccc
Merge pull request #6086 from peppy/improve-catch-replay-frames
Improve how osu!catch stores and replays key actions
2019-09-13 19:43:16 +09:00
Andrei Zavatski
437e121056 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:39:58 +03:00
Dean Herbert
a6420def99 Make hyperdash test automatic 2019-09-13 19:29:49 +09:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames 2019-09-13 19:23:15 +09:00
Dean Herbert
1b9ef6a8e7
Merge branch 'master' into fix-catch-rewind 2019-09-13 19:10:11 +09:00
Dean Herbert
e1ed5dfa7d
Reset DrawableHitObject lifetimes on state change (#6028)
Reset DrawableHitObject lifetimes on state change

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-13 19:10:02 +09:00
smoogipoo
5c2c055614 Set lifetime on initial state update 2019-09-13 18:49:21 +09:00
Dean Herbert
ceee132345
Implement RankingsHeader component for rankings overlay (#6082)
Implement RankingsHeader component for rankings overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-13 18:23:31 +09:00
Dean Herbert
614e68cdf9 Remove redundant BindTarget usage 2019-09-13 18:11:17 +09:00
Dean Herbert
031f0ee1e7 Consume ValueChanged and inline some pointless constants 2019-09-13 18:09:15 +09:00
Dean Herbert
1e4f3507ed Fix layout not matching web 2019-09-13 18:07:52 +09:00
Dean Herbert
2c3f391b9e
Merge branch 'master' into rankings-header 2019-09-13 17:53:53 +09:00
Dean Herbert
e68f0d7ba8
Bump ppy.osu.Game.Resources from 2019.904.0 to 2019.913.0 (#6096)
Bump ppy.osu.Game.Resources from 2019.904.0 to 2019.913.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-13 17:49:18 +09:00
Dean Herbert
a7c59098ce Fix missing assignment 2019-09-13 17:38:04 +09:00
dependabot-preview[bot]
d681f43e29
Bump ppy.osu.Game.Resources from 2019.904.0 to 2019.913.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.904.0 to 2019.913.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.904.0...2019.913.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-13 08:38:02 +00:00
Dean Herbert
0cc21c9c74 Fix changelog overlay potentially adding children after disposal 2019-09-13 17:21:47 +09:00
Dean Herbert
7cb79dd760 Fix incorrect DI usage of IAPIProvider in many tests 2019-09-13 17:15:33 +09:00
Andrei Zavatski
9a9654dbd1 Fix the Test Scene 2019-09-13 10:59:09 +03:00
Andrei Zavatski
6867b3c232 Update resources 2019-09-13 10:56:21 +03:00
Andrei Zavatski
c9ae4336f9 Fix RankingsScope test 2019-09-13 10:50:26 +03:00
Andrei Zavatski
51f17ccb1b Remove test duplicate 2019-09-13 10:48:02 +03:00
Andrei Zavatski
cb98b07e33 Merge master with conflicts resolved 2019-09-13 10:45:01 +03:00
Dean Herbert
0231984127
Merge pull request #6076 from EVAST9919/rankings-title
Implement HeaderTitle component for rankings overlay
2019-09-13 16:39:16 +09:00
Dean Herbert
ffd205f470 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6076 2019-09-13 16:25:30 +09:00
Dean Herbert
78e7be919f Remove unnecessary container 2019-09-13 16:25:25 +09:00
Dean Herbert
c4f9be5913
Merge pull request #6093 from smoogipoo:fix-player-restart
Fix player not correctly restarting after an unpause
2019-09-13 16:09:41 +09:00
Dean Herbert
268b39eb7d
Merge pull request #6078 from Joehuu:properly-fix-dialog-double-samples
Fix dialog overlay playing double samples on show/hide
2019-09-13 16:09:23 +09:00
Dean Herbert
7818ecd71c Forward ValueChangedEvent instead 2019-09-13 16:03:44 +09:00
Dean Herbert
a05ae2c1b2 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6082 2019-09-13 15:53:11 +09:00
smoogipoo
cf2f841b4d Fix player not correctly exiting after an unpause 2019-09-13 15:42:58 +09:00
Dean Herbert
c66e963705 Make constructor private 2019-09-13 15:42:36 +09:00
Dean Herbert
dc8c7a5041 Add null check for safety 2019-09-13 15:27:42 +09:00
Dean Herbert
44947aa9ed Make PopupDialog abstract 2019-09-13 15:27:29 +09:00
Dean Herbert
e2e87d5268
Merge branch 'master' into properly-fix-dialog-double-samples 2019-09-13 14:53:29 +09:00
Andrei Zavatski
5a72083c13 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-13 08:32:06 +03:00
Dean Herbert
fd758c77d2
Implement RankingsScopeSelector (#6052)
Implement RankingsScopeSelector

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-13 14:27:56 +09:00