h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 18:13:22 +08:00
Code Issues Releases Wiki Activity
21,904 Commits 3 Branches 657 Tags 357 MiB
2c3f391b9e
Commit Graph

21904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dean Herbert
43d7615734 Merge remote-tracking branch 'upstream/master' into rankings-scope-selector 2019-09-13 14:07:39 +09:00
Dean Herbert
0e679fb468 Use colour constant rather than opacity helper function 2019-09-13 14:06:19 +09:00
Dean Herbert
b917f29cfe Make GradientLineTabControl abstract 2019-09-13 13:59:06 +09:00
Dean Herbert
4c76ec416a
Add spacing to mod icons on leaderboards (#6079) 
Add spacing to mod icons on leaderboards

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-13 13:44:38 +09:00
Dean Herbert
3b82c6db49
Merge branch 'master' into leaderboard-mod-icons-spacing 2019-09-13 13:27:18 +09:00
Joehu
2a8fa2f593 Refactor modsContainer on profile scores 2019-09-12 14:01:12 -07:00
Andrei Zavatski
99fc13b4d8 Update usage of the DismissableFlag 2019-09-12 19:34:58 +03:00
Andrei Zavatski
0142fcd07a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-12 19:29:05 +03:00
Andrei Zavatski
7ee01ee323 Use assignment instead of binding 2019-09-12 18:11:48 +03:00
Andrei Zavatski
b17d097a39 Simplify colour usage in GradientLine 2019-09-12 17:17:57 +03:00
Andrei Zavatski
4dd819c150 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-12 17:17:32 +03:00
Dean Herbert
586503222f
Implement DismissableFlag component for rankings overlay (#6065) 
Implement DismissableFlag component for rankings overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-12 23:16:04 +09:00
Andrei Zavatski
cafb5105bc Rename HeaderFlag to DismissableFlag 2019-09-12 16:44:15 +03:00
Dean Herbert
2cb084666b
Merge branch 'master' into rankings-scope-selector 2019-09-12 22:37:14 +09:00
Dean Herbert
5f77236c01
Merge branch 'master' into closable-flag 2019-09-12 22:27:34 +09:00
Dan Balasescu
81d2487f65
Merge pull request #6066 from peppy/mania-note-sizing 
Change some osu!mania metrics for better playability
 2019-09-12 14:35:40 +09:00
Dan Balasescu
f9b64446e9
Merge branch 'master' into mania-note-sizing 2019-09-12 14:20:28 +09:00
Dan Balasescu
2a7beb989d
Merge pull request #6067 from peppy/mania-hit-explosion 
Make osu!mania hit explosions more explodey
 2019-09-12 14:19:40 +09:00
smoogipoo
b941f12688 Cleanup 2019-09-12 14:09:21 +09:00
Dan Balasescu
141e83fada
Merge branch 'master' into mania-hit-explosion 2019-09-12 13:53:42 +09:00
smoogipoo
bbf80f63aa Publicly expose column width constant 2019-09-12 13:53:05 +09:00
smoogipoo
b1c0b080ec Fix bad hit explosion anchoring 2019-09-12 13:52:27 +09:00
Andrei Zavatski
2bbd563cb6 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-header 2019-09-12 06:38:12 +03:00
Andrei Zavatski
acdd26422d Implement Spotlights logic 2019-09-12 06:36:17 +03:00
Dean Herbert
2961cccde0
Implement RankingsRulesetSelector component for rankings overlay (#6081) 
Implement RankingsRulesetSelector component for rankings overlay
 2019-09-12 12:08:34 +09:00
Andrei Zavatski
0c6c8fdcd0 Implement RankingsHeader component 2019-09-12 05:53:18 +03:00
Andrei Zavatski
b657e31f93 Merge dependent changes 2019-09-12 05:26:10 +03:00
Andrei Zavatski
4bfb681db6 CI fixes 2019-09-12 05:16:56 +03:00