1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 09:39:04 +08:00
Commit Graph

27038 Commits

Author SHA1 Message Date
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
voidedWarranties
c3f840cc1a Fix Autoplay = false and AllowFail behavior 2020-03-03 17:12:01 -08: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
Dean Herbert
08756186e9 Update resources 2020-03-03 18:35:28 +09:00
Dean Herbert
f1f4f1ffbd Add torus font 2020-03-03 18:17:51 +09:00
Dean Herbert
3eabe80adf
Merge pull request #8103 from smoogipoo/reduce-overlay-paddings
Reduce social overlay/direct overlay paddings
2020-03-03 16:58:59 +09:00
Dan Balasescu
e77cefeabe
Merge branch 'master' into fix-volume-bninding-handling 2020-03-03 16:32:18 +09:00
smoogipoo
cb11292181 Reduce social overlay/direct overlay paddings 2020-03-03 16:06:31 +09:00
Dean Herbert
655b1a9e9d
Merge pull request #8101 from smoogipoo/fix-possible-deadlock
Fix potential deadlock during gameplay tests
2020-03-03 14:19:20 +09:00
smoogipoo
2e4adc056f Fix potential deadlock during gameplay tests 2020-03-03 13:42:05 +09:00
Dean Herbert
7a71a48892
Merge branch 'master' into mod-testscene 2020-03-03 13:40:20 +09:00
smoogipoo
cc5b44e466 Add test scene 2020-03-03 13:36:55 +09:00
Dean Herbert
0eff39e3dc
Merge pull request #8091 from smoogipoo/fix-mania-performance
Prevent unnecessary auto-size computations in mania
2020-03-03 13:31:22 +09:00
smoogipoo
a1aecd4c39 Fix TrackVirtualManual not respecting rate adjustments 2020-03-03 13:01:28 +09:00
smoogipoo
1e26df64b6 Fix constructor test failures 2020-03-03 12:58:07 +09:00