RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,628 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

17628 Commits

Author SHA1 Message Date
Dean Herbert fc59e6dec5
Merge pull request #4494 from Joehuu/clean-overlays-code-1 
Remove specified depths of overlays
 2019-03-28 11:27:36 +09:00
Dean Herbert 253b18b92f Merge remote-tracking branch 'upstream/master' into better-player-flags 2019-03-28 11:18:54 +09:00
Dean Herbert 23b5271ce4
Merge branch 'master' into clean-overlays-code-1 2019-03-28 11:17:29 +09:00
Dean Herbert d756a5d987
Merge pull request #4532 from peppy/update-framework 
Update framework
 2019-03-28 10:50:20 +09:00
Joseph Madamba cdf79ffe39
Merge branch 'master' into clean-overlays-code-1 2019-03-27 10:32:13 -07:00
Dean Herbert dfb7d78903 Fix remaining game host regressions 2019-03-28 01:29:06 +09:00
Dean Herbert cd65ea4865 Fix TestCaseDrawings regression 2019-03-28 01:24:48 +09:00
Dean Herbert 61b8fb0366 Allow ScreenTestCase to support content 2019-03-27 22:28:32 +09:00
Dean Herbert 5c4f2cefea Fix Loader and TestCaseLoaderAnimation 2019-03-27 22:28:25 +09:00
Dean Herbert a14701619e Update icon test case 2019-03-27 21:44:13 +09:00
Dean Herbert 1a0d1b238e Fix storage regression 2019-03-27 20:58:07 +09:00
Dean Herbert 842231e820
Merge pull request #4541 from nyquillerium/background-test-fix 
Fix TestCaseBackgroundScreenBeatmap getting stuck
 2019-03-27 20:27:32 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Unknown fea6adbf54 fix wedge bleeding into other elements (and being misaligned) 2019-03-27 10:12:09 +01:00
David Zhao 2c059efbab Rename to BlockLoad 2019-03-27 17:34:58 +09:00
smoogipoo 012dcc25c9 Rename APIScoreInfo -> APILegacyScoreInfo 2019-03-27 17:08:40 +09:00
smoogipoo d2af2cf21d Set legacy api score statistics directly 2019-03-27 17:08:01 +09:00
smoogipoo eceecde0f8 Make APIScoreInfo derive LegacyScoreInfo 2019-03-27 17:07:45 +09:00
smoogipoo 977122d05f Fix ScoreInfo not getting set 2019-03-27 16:59:29 +09:00
smoogipoo 5c8e8a1697 Fix license header 2019-03-27 16:56:15 +09:00
smoogipoo 8fcb75809d Add LegacyScoreInfo for statistics preservation/conversion 2019-03-27 16:55:46 +09:00
smoogipoo 1a6c2022ea Fix up/adjust counts 2019-03-27 14:53:29 +09:00
smoogipoo a5d5f469eb Populate more hit results for catch 2019-03-27 14:52:56 +09:00
David Zhao be62cd9d72 Fix TestCaseBackgroundsScreenBeatmap 2019-03-27 14:33:50 +09:00
smoogipoo 2dc5447928 Merge remote-tracking branch 'origin/master' into ctb-pp 2019-03-27 14:01:02 +09:00
Dan Balasescu 4e8945a2aa
Merge pull request #4538 from peppy/fix-test-working-clock 
Fix TestWorkingBeatmap not running for times below zero
 2019-03-27 12:04:05 +09:00
Dean Herbert 3fcbc2eab3 Fix key counter getting overridden 2019-03-27 10:31:21 +09:00
Dean Herbert 6ac49fed75 Remove broken frame 2019-03-26 17:40:22 +09:00
Dean Herbert 7cfc2f7dcb Add back adjustment container 2019-03-26 17:11:14 +09:00
Dean Herbert 15821c7511 Fix cursor adding 2019-03-26 17:04:14 +09:00
Dean Herbert a88f23e555 Convert remaining two flags to ctor parameters 2019-03-26 16:53:44 +09:00
Dean Herbert 83076e32c7 Fix TestWorkingBeatmap not running for times below zero 2019-03-26 16:35:34 +09:00
Dean Herbert 83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
Dean Herbert 8658de5108 Rename KeyCounterCollection -> KeyCounterDisplay 
Also fix not working
 2019-03-26 13:52:48 +09:00
Dean Herbert 2951d3e0e4 Apply CI fixes 2019-03-26 13:50:30 +09:00
Dean Herbert fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
Dean Herbert b4d785c76c Don't update gameplay loop while paused 2019-03-26 13:36:17 +09:00
Dean Herbert ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert e512d88899 Apply required refactor 2019-03-26 13:29:26 +09:00
Dean Herbert 5d166a011d Update framework 2019-03-26 13:28:59 +09:00
Dean Herbert 868367511e Add ManualInputManager to screen tests 
Also sanitises content init order (ctor for content; bdl for other)
 2019-03-26 13:26:55 +09:00
Dean Herbert fa7a0a0742
Merge branch 'master' into drawable-clear-safety 2019-03-25 13:58:57 +09:00
Dean Herbert a63bcff5cc
Merge pull request #4525 from LeNitrous/skinnable-scaling-container-background 
Make the scaling background customisable to current skin background

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-03-25 13:49:52 +09:00
Dean Herbert 39df8cce19 Fix incorrect usage of InternalChildren 
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
 2019-03-25 13:48:55 +09:00
Dean Herbert 5b83e97e9d
Fix typo 2019-03-25 13:38:50 +09:00
Dean Herbert c97116c91a Add safety against DrawableHitObject implementations clearing children 2019-03-25 13:34:22 +09:00
Dean Herbert fcc91efc1a
Merge branch 'master' into skinnable-scaling-container-background 2019-03-25 13:33:39 +09:00
Dean Herbert cd1b171df7 Refactor async load logic (not required due to stack presence) 2019-03-25 13:28:51 +09:00
Dean Herbert 1155dba195
Merge pull request #4451 from nyquillerium/multi-background-stack 
Centralise BackgroundScreenStack handling

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-03-25 13:12:01 +09:00
Dean Herbert e705eb586d Revert unintentional change 2019-03-25 12:51:54 +09:00