1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Commit Graph

26937 Commits

Author SHA1 Message Date
Andrei Zavatski
f8f13a2f28 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-cards-update 2020-03-04 14:57:44 +03:00
Dean Herbert
94d5cc593d
Merge pull request #8118 from smoogipoo/fix-followpoint-stacking
Fix follow points using unstacked hitobject positions
2020-03-04 20:28:15 +09:00
Andrei Zavatski
1bdbe7c823 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-cards-update 2020-03-04 13:43:28 +03:00
Andrei Zavatski
e7e759cc92 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-cards-update 2020-03-04 13:15:51 +03:00
Dan Balasescu
fe7f13cb77
Merge pull request #8128 from mcendu/beatmap-status
Fix beatmap status always using "ranked" for Ranked field
2020-03-04 18:54:45 +09:00
Andrei Zavatski
8a437e1b54 Add ability to send pm via context menu 2020-03-04 12:42:21 +03:00
Andrei Zavatski
15e47d8432 Implement layout for UserGridCard 2020-03-04 12:20:49 +03:00
Dan Balasescu
fa7f8de4e3
Merge branch 'master' into beatmap-status 2020-03-04 18:11:59 +09:00
mcendu
eaa77bce14 Use ToString().ToLowerInvariant()
* https://github.com/ppy/osu/pull/8128#issuecomment-594360083
2020-03-04 16:43:35 +08:00
Dan Balasescu
30426fbf30
Merge pull request #8106 from peppy/owc-2019
Update tournament client to 2019 design language
2020-03-04 17:27:59 +09:00
Dan Balasescu
029494aac3
Merge branch 'master' into owc-2019 2020-03-04 16:45:31 +09:00
Andrei Zavatski
6ea3af1951 Implement layout for UserListCard 2020-03-04 10:35:43 +03:00
Dean Herbert
090e23787f
Merge pull request #8125 from mcendu/issue-template
Comment out log locations in crash report template
2020-03-04 16:33:09 +09:00
Dan Balasescu
5eeed3faa1
Merge branch 'master' into owc-2019 2020-03-04 16:27:46 +09:00
Dean Herbert
a3194b3fec
Merge pull request #8105 from peppy/tournament-seeding-screen
Add tournament seeding screen
2020-03-04 16:27:15 +09:00
Dean Herbert
c306d3de2e
Fix typo in button
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-04 16:03:43 +09:00
杜Nate
fbd0dfd71b
add blank lines 2020-03-04 14:55:51 +08:00
Dan Balasescu
dadf151e7c
Merge branch 'master' into tournament-seeding-screen 2020-03-04 15:42:44 +09:00
Dan Balasescu
5651b54dce
Merge pull request #8104 from peppy/add-torus-font
Add torus font
2020-03-04 15:37:30 +09:00
mcendu
416b9e4e6f fix beatmap status display 2020-03-04 14:28:18 +08:00
Andrei Zavatski
b7d34b399d Adjust background presentation for UserListCard 2020-03-04 09:10:51 +03:00
Andrei Zavatski
1b5222f396 Baisc UserListCard implementation 2020-03-04 08:53:14 +03:00
Andrei Zavatski
f425233527 Basic UserCard implementation 2020-03-04 08:41:21 +03:00
mcendu
a3709ae268 Also comment out log locations in crash template 2020-03-04 13:39:37 +08:00
Dan Balasescu
6f5d2da03e
Merge branch 'master' into add-torus-font 2020-03-04 13:56:30 +09:00
Dean Herbert
72fba177bb
Merge pull request #8121 from mcendu/issue-template
Comment out log locations in bug report template
2020-03-04 13:32:08 +09:00
Dean Herbert
003aeeb052 Add test scene for seedings editor 2020-03-04 13:26:25 +09:00
Dean Herbert
dade58adf3 Fix crash from editor screen test scene when trying to view seeding editor 2020-03-04 13:21:14 +09:00
Dean Herbert
6b7144e21b Fix non-matching filename 2020-03-04 13:19:52 +09:00
Dean Herbert
22c4c515f5
Merge pull request #8123 from smoogipoo/fix-ladderscreen-nullref
Fix nullref when deleting teams in the ladder screen
2020-03-04 13:18:07 +09:00
Dan Balasescu
aa17a64a0e
Apply missed xmldoc suggestion 2020-03-04 12:47:01 +09:00
Dean Herbert
e9b0770f64
Apply suggestions from code review
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-04 12:44:44 +09:00
Dan Balasescu
94488a3979
Merge pull request #8122 from peppy/split-out-files
Split out LadderEditorSetings into multiple files
2020-03-04 12:41:17 +09:00
smoogipoo
fc0821f194 Fix nullref when deleting teams in the ladder screen 2020-03-04 12:37:42 +09:00
Dean Herbert
23091cb25e Merge branch 'split-out-files' into tournament-seeding-screen 2020-03-04 12:11:17 +09:00
Dean Herbert
0f7316d41d Move file to other file 2020-03-04 12:08:44 +09:00
Dean Herbert
c8ee529fa3 Merge branch 'add-torus-font' into tournament-seeding-screen 2020-03-04 12:03:16 +09:00
Dean Herbert
d88c5896da Merge branch 'master' into tournament-seeding-screen 2020-03-04 12:02:12 +09:00
mcendu
275d075acd comment out log locations in bug report template 2020-03-04 10:53:30 +08:00
Dean Herbert
75968fb4ba Update resources once more 2020-03-04 11:50:22 +09:00
Dean Herbert
4294ed4b64 Better align fonts to weights 2020-03-04 11:45:19 +09:00
smoogipoo
5e218697c5 Use stacked positions 2020-03-04 09:46:53 +09:00
Dean Herbert
db56fb5759 Fix venera font usage 2020-03-03 22:28:47 +09:00
Dean Herbert
e678a068b6 Bring design up-to-date with 2019 standards 2020-03-03 19:20:42 +09:00
Dean Herbert
1b355d02d6 Update video resource paths 2020-03-03 19:20:42 +09:00
Dean Herbert
b6edd17242 Fix TeamWin test scene 2020-03-03 19:20:42 +09:00
Dean Herbert
093f2affdf Add seeding screen 2020-03-03 19:19:03 +09:00
Dean Herbert
740eb9ff53
Merge pull request #8090 from peppy/fix-volume-bninding-handling
Add SelectPrevious and SelectNext bindings / Change volume bindings to be truly global
2020-03-03 18:58:49 +09:00
Dean Herbert
372060bc2b Only trigger changes if new user information is actually populated 2020-03-03 18:57:00 +09:00
Dean Herbert
a2273234cb Better handle startup when ladder cannot be read correctly 2020-03-03 18:57:00 +09:00