1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 06:02:56 +08:00
Commit Graph

25311 Commits

Author SHA1 Message Date
Dean Herbert
63de934ee5
Merge branch 'master' into sdl-arg 2020-01-14 12:45:45 +08:00
Dean Herbert
f0a65254ee
Merge branch 'master' into reverse-arrows 2020-01-14 00:51:23 +08:00
Dean Herbert
a6f247314e
Remove duplicate condition in TournamentFont (#7523)
Remove duplicate condition in TournamentFont
2020-01-14 00:49:13 +08:00
Dean Herbert
fe09e34f1b Remove limiting clause 2020-01-14 01:48:20 +09:00
Dean Herbert
ab4f31639d Remove weird time clause 2020-01-14 01:47:44 +09:00
Dean Herbert
210d06b75e Remove default value 2020-01-14 01:45:32 +09:00
Dean Herbert
c5085aea24 Use Child, not InternalChild 2020-01-14 01:45:10 +09:00
Dean Herbert
619fe29871 Make reverse arrow animate faster via divisor specification
Adds MinimumBeatLength to BeatSyncedContainer to make sure things don't get out of hand.
2020-01-14 01:39:45 +09:00
recapitalverb
af167eb719
Remove duplicate condition in TournamentFont 2020-01-13 23:28:26 +07:00
Sebastian Krajewski
45cf65a28a Merge remote-tracking branch 'upstream/master' into reverse-arrows 2020-01-13 14:15:37 +01:00
Dean Herbert
f3bb47ffce
Add benchmark project (#7474)
Add benchmark project
2020-01-13 20:12:24 +08:00
Dean Herbert
55cb17958b
Merge branch 'master' into benchmark 2020-01-13 19:46:39 +08:00
Dean Herbert
a1d603abf1
Fix song select showing incorrect key count when difficulty mod… (#7510)
Fix song select showing incorrect key count when difficulty mods applied
2020-01-13 19:22:47 +08:00
Dean Herbert
7a6215c6cf
Add global action for toggling now playing overlay (#7501)
Add global action for toggling now playing overlay
2020-01-13 15:53:35 +08:00
Dean Herbert
8059922aa4
Make gradient in NewsArticleCover be effected by hover (#7509)
Make gradient in NewsArticleCover be effected by hover
2020-01-13 15:34:46 +08:00
Dean Herbert
da47d4b521
Implement missing API code for channel read state (#7425)
Implement missing API code for channel read state
2020-01-13 11:42:10 +08:00
Dean Herbert
c190c68659 Add safety for channel with no messages 2020-01-13 12:22:44 +09:00
Dean Herbert
902e1750a8 Merge remote-tracking branch 'upstream/master' into api-chat-read 2020-01-13 12:15:45 +09:00
TheWildTree
b5ac707c6c Remove unnecessary directive 2020-01-12 21:09:48 +01:00
TheWildTree
aa2645502c Fix adjusted value always being 0 2020-01-12 20:43:48 +01:00
Craftplacer
8cc2d70df0 Reduce API calls by checking what message was last marked as read 2020-01-12 16:24:14 +01:00
Andrei Zavatski
f1b4fbb844 Make gradient in NewsArticleCover be effected by hover 2020-01-12 17:38:15 +03:00
Joehu
f43602518a Add global action for toggling now playing overlay 2020-01-11 11:43:51 -08:00
Craftplacer
ccaf4e48a1 Remove using directive 2020-01-11 20:04:58 +01:00
Craftplacer
5d5c635b1b Merge branch 'api-chat-read' of https://github.com/Craftplacer/osu into api-chat-read 2020-01-11 19:47:40 +01:00
Craftplacer
2ea1367a88 Remove message parameter and make it mark the entire channel as read 2020-01-11 19:47:35 +01:00
Dean Herbert
d73491daa9
Fix crashing when changing user status before rich presence is… (#7498)
Fix crashing when changing user status before rich presence is initialised
2020-01-12 02:37:15 +08:00
Craftplacer
7aac6deb71
Merge branch 'master' into api-chat-read 2020-01-11 19:18:50 +01:00
Craftplacer
f8a11e50b6 Remove redundant ToString() calls
as string interpolation does this automatically..
2020-01-11 18:00:34 +01:00
Craftplacer
d9c57baa89 Add test case for mismatch of channels 2020-01-11 17:48:03 +01:00
Craftplacer
50e357a799 Change method parameters, add detailed error message and method docs 2020-01-11 17:42:02 +01:00
Craftplacer
cd679707ed
Prevent channel duplicates
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-01-11 17:16:11 +01:00
Lucas A
ec95cbd0af Don't update rich presence if the rpc client isn't initialized. 2020-01-11 16:03:00 +01:00
Dean Herbert
9a9c01bc92
Fix user status dropdown having no padding around items (#7491)
Fix user status dropdown having no padding around items
2020-01-11 22:04:33 +08:00
Dean Herbert
e7502e783f
Move hit target bar height constant to more local class (#7497)
Move hit target bar height constant to more local class
2020-01-11 21:52:04 +08:00
mcendu
76c70a7622 Move hit target bar height def to defaulthittarget 2020-01-11 21:19:46 +08:00
Dean Herbert
811716ce18
Merge pull request #7490 from peppy/update-framework
Update framework
2020-01-11 19:20:14 +08:00
Dean Herbert
0c995244b2
Merge branch 'master' into update-framework 2020-01-11 17:47:11 +08:00
Dean Herbert
5cffc81e1c
Fix default button absorbing drag scroll on settings (#7494)
Fix default button absorbing drag scroll on settings
2020-01-11 17:24:03 +08:00
Joehu
820f9f2273 Fix default button absorbing drag scroll on settings 2020-01-10 20:16:46 -08:00
Joehu
19033e0ef8 Fix user status dropdown having no padding around items 2020-01-10 19:25:33 -08:00
Dean Herbert
bd175118e9 Update framework 2020-01-11 04:16:07 +08:00
Huo Yaoyuan
c4131e01da Downgrade NUnit for now. 2020-01-10 20:20:44 +08:00
Huo Yaoyuan
20f426cda0 Add beatmap parsing as sample benchmark. 2020-01-10 20:20:04 +08:00
Dean Herbert
f745d74666
Add ability to delete individual scores (#7252)
Add ability to delete individual scores

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-10 01:58:35 +08:00
Dean Herbert
14829837c4 Update namespace specifications 2020-01-10 01:38:03 +08:00
Dean Herbert
66a61c80ba
Merge pull request #7484 from turbedi/Remove_osuTK.MathHelper
Remove remaining usage of osuTK.MathHelper
2020-01-10 01:34:19 +08:00
Dean Herbert
87645f6a41 Remove excess namespace specification 2020-01-10 01:13:42 +08:00
Dean Herbert
56724d2580
Merge branch 'master' into #7146 2020-01-10 01:08:20 +08:00
Dean Herbert
3be2fc27f3
Merge branch 'master' into Remove_osuTK.MathHelper 2020-01-10 00:28:46 +08:00