1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 05:57:24 +08:00
Commit Graph

4324 Commits

Author SHA1 Message Date
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Dean Herbert
2172c5a52b
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 14:24:52 +09:00
Dean Herbert
f774c46f57
Remove linq usage in BreakOverlay update (#5641)
Remove linq usage in BreakOverlay update
2019-08-08 13:33:23 +09:00
Joehu
77df6a0cb7 Remove unused direct placeholder screen 2019-08-07 21:16:36 -07:00
Dean Herbert
7d42561da9 Remove linq usage in BreakOverlay update 2019-08-08 12:58:20 +09:00
Salman Ahmed
3f9f9e7bc9
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 05:36:45 +03:00
Dean Herbert
99f5ca07ce Remove redundant comment 2019-08-08 10:42:54 +09:00
Dean Herbert
40a33b3382 Move IsLoaded check to more correct place 2019-08-08 10:41:23 +09:00
Dean Herbert
a2e3ab6463
Merge branch 'master' into add-bindable-for-break-times 2019-08-08 10:13:14 +09:00
iiSaLMaN
ba269a49ee Expose break fade duration and add it in the calculation 2019-08-07 16:59:35 +03:00
iiSaLMaN
d3657d82cd Simplify final check for break time 2019-08-07 16:28:16 +03:00
iiSaLMaN
c2b3c28c79 Use IsBreakTime for checking if currently in a break
Rather than iterating over all breaks to find which is in current time
2019-08-07 16:15:53 +03:00
Dean Herbert
616de1830a Less sheep 2019-08-07 12:20:49 +09:00
Dean Herbert
9033327923 Merge remote-tracking branch 'upstream/master' into fix-footer-button-hover-sounds 2019-08-07 12:19:25 +09:00
Dean Herbert
dda078277a Minor variable name changes 2019-08-06 23:05:12 +09:00
iiSaLMaN
2a68bb2749 onCompletionEvent -> pushResults 2019-08-06 14:11:43 +03:00
iiSaLMaN
dd701eaa62 Safely cancel the completion task on restart or immediate exit 2019-08-06 14:10:03 +03:00
Joehu
1fc7ddf621 Fix text depth regression 2019-08-05 18:14:41 -07:00
Joehu
a7ac411c25 Fix footer button hover sounds playing in unclickable area 2019-08-05 17:57:04 -07:00
Dan Balasescu
cd27e1eb70
Merge branch 'master' into update-direct-categories-sorting 2019-08-05 17:11:48 +09:00
Andrei Zavatski
fd44ca3233 Rename Animation to Layer 2019-08-04 13:54:23 +03:00
Andrei Zavatski
a30d7912b1 Move DimmedLoadingAnimation to it's own file 2019-08-04 11:09:12 +03:00
Joehu
0082695cd8 Choose default category sorting instead of being always first 2019-08-02 13:22:58 -07:00
Dean Herbert
4c6cccb3a3 Update settings in line with framework changes 2019-07-30 23:31:21 +09:00
iiSaLMaN
e6e315e07b Expose current break index 2019-07-30 13:29:41 +03:00
Salman Ahmed
c8b7cf8672
Merge branch 'master' into add-bindable-for-break-times 2019-07-30 06:23:47 +03:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence (#5275)
Improve testability of intro sequence
2019-07-29 18:56:38 +09:00
Dan Balasescu
0dc25d7a35
Merge branch 'master' into exit-multi-from-null 2019-07-29 13:52:26 +09:00
David Zhao
26fc782de9 Don't exit if screenstack is null 2019-07-29 10:35:51 +09:00
Dean Herbert
088c04a20f Revert "Fix BackButton handling escape before all other elements (#5440)"
This reverts commit 17a6563f4c.
2019-07-28 23:38:55 +09:00
iiSaLMaN
5bf0277fd4 Remove unnecessary quick check
Not saving for anything
2019-07-28 09:17:13 +03:00
iiSaLMaN
1dd3a66300 Remove unnecessary index resets 2019-07-28 09:16:19 +03:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority 2019-07-28 12:50:18 +09:00
iiSaLMaN
95b568eb46 Remove unnecessary condition 2019-07-27 15:52:30 +03:00
iiSaLMaN
6c580ac9d5 Use while loops instead 2019-07-27 15:52:01 +03:00
Dean Herbert
3571cb96b0 Fix broken merge 2019-07-27 12:56:55 +09:00
David Zhao
57e6c388a1
Merge branch 'master' into carousel-sizing 2019-07-27 11:40:07 +09:00
Salman Ahmed
934439e138
Merge branch 'master' into add-bindable-for-break-times 2019-07-26 12:57:52 +03:00
Dean Herbert
392e1cbafb
Merge pull request #5456 from peppy/fix-import-select
Fix beatmap present failing directly after an import
2019-07-26 18:48:49 +09:00
Dean Herbert
4d49aad153 Start not visible 2019-07-26 15:51:51 +09:00
Dean Herbert
7fa419a38b Fix file layout order 2019-07-26 15:49:21 +09:00
iiSaLMaN
4c9e8527d8 Modify global index directly in the for loop
Moves the global index to a near break if not in a break yet
2019-07-26 09:24:53 +03:00
David Zhao
0f6c6c7de0 consolidate halfheight as well 2019-07-26 15:22:29 +09:00
Joehu
0b6cfec21c Hide leaderboard mod filter when on details tab 2019-07-25 23:20:56 -07:00
iiSaLMaN
5a94a22314 Add a quick check if we're not in a break with current index 2019-07-26 09:17:39 +03:00
David Zhao
6765e9f7fa Combine into properties and update for framework changes 2019-07-26 15:13:10 +09:00
iiSaLMaN
3fa6804501 Use better loops for moving index
Easy to read, suggested by peppy
2019-07-26 08:12:32 +03:00
iiSaLMaN
806d41daf4 Add function to reset break index 2019-07-26 08:11:13 +03:00
iiSaLMaN
91fa8a6552 Simplify null and any check 2019-07-26 08:09:18 +03:00
David Zhao
c89830f3d8 move constants, combine local vars into properties 2019-07-26 13:07:28 +09:00