1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:42:56 +08:00
Commit Graph

26914 Commits

Author SHA1 Message Date
Dean Herbert
7464a486d9 Fix DummyWorkingBeatmap's track completion attempting to change game-wide beatmap 2020-03-04 16:35:45 +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
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
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
Dean Herbert
db56fb5759 Fix venera font usage 2020-03-03 22:28:47 +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
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
Dan Balasescu
101f207040
Merge pull request #8031 from EVAST9919/changelog-stream-area-refactor
Fix double-dimming in changelog stream badge area
2020-03-03 12:39:43 +09:00
Dan Balasescu
3ef490689e
Merge branch 'master' into changelog-stream-area-refactor 2020-03-03 11:52:03 +09:00
Dean Herbert
513bfc1cbc
Merge pull request #8088 from ppy/dependabot/nuget/Sentry-2.1.0
Bump Sentry from 2.0.3 to 2.1.0
2020-03-02 21:10:12 +09:00
Dean Herbert
769b7582e3
Merge branch 'master' into dependabot/nuget/Sentry-2.1.0 2020-03-02 20:24:28 +09:00
Dean Herbert
69b4713731 Refactor everything so I can read the code 2020-03-02 20:16:58 +09:00
smoogipoo
9f73b2960d Prevent unnecessary auto-size computations in mania 2020-03-02 20:08:04 +09:00
Dean Herbert
23068034b1 Rename bool and make property for legibility 2020-03-02 19:51:06 +09:00
Dean Herbert
df4de4a090
Merge branch 'master' into changelog-stream-area-refactor 2020-03-02 19:48:04 +09:00
Dean Herbert
e890e45420 Fix Ctrl+Enter behaviour regression 2020-03-02 19:44:25 +09:00
Dean Herbert
48f2f615cd
Merge branch 'master' into fix-volume-bninding-handling 2020-03-02 19:28:36 +09:00
Dean Herbert
81191a3d20 Handle SelectPrevious/SelectNext locally to volume meter when hovered 2020-03-02 18:59:55 +09:00
Dean Herbert
e608d807f4 Handle SelectPrevious / SelectNext as volume change operations if nothing else handled game-wide 2020-03-02 18:59:38 +09:00
Dean Herbert
6989738710 Change default global bindings for volume changing to include the alt key prefix 2020-03-02 18:59:05 +09:00
Dean Herbert
88583b5c79 Remove any existing bindings to increase/decrease volume 2020-03-02 18:56:41 +09:00
Dean Herbert
ed516f05c2 Forward any unhandled scroll events to volume overlay 2020-03-02 18:56:09 +09:00