1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-12 19:27:24 +08:00

10887 Commits

Author SHA1 Message Date
David Zhao
97db8abd59 Remove unused includes 2019-02-21 18:34:11 +09:00
David Zhao
0677194f46 Move all storyboard show logic into UserDimContainer 2019-02-21 18:14:58 +09:00
David Zhao
ad5e81f0cd Add test case for background preview, fix unit tests 2019-02-21 15:24:26 +09:00
Dean Herbert
bbeecd6c26
Merge pull request #4299 from nekodex/fix-flying-logo
Fix osu! logo traveling in a weird direction on entering gameplay
2019-02-21 14:39:35 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo
be9be5dee2 Add some xmldocs 2019-02-20 21:04:18 +09:00
smoogipoo
062196c7da Cleanup 2019-02-20 20:52:56 +09:00
smoogipoo
cc33f230b4 Merge remote-tracking branch 'origin/master' into osu-fontusage 2019-02-20 20:37:48 +09:00
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
David Zhao
f5d8700920 Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic 2019-02-20 17:40:13 +09:00
David Zhao
25e7dcb375 Remove unused includes 2019-02-20 17:39:35 +09:00
David Zhao
49c5a9fc30
Merge branch 'master' into UserDimLogic 2019-02-20 17:30:34 +09:00
David Zhao
d703a9511a Fix background dim previews 2019-02-20 17:20:45 +09:00
David Zhao
3f000dfe2e Remove unnecessary region 2019-02-20 16:58:12 +09:00
David Zhao
1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
smoogipoo
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
Dean Herbert
b1337ed07f Update framework 2019-02-20 16:09:29 +09:00
Dean Herbert
a4768a75e2 Merge remote-tracking branch 'upstream/master' into isactive-changes 2019-02-20 16:09:24 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dan Balasescu
f6d70e687b
Use correct local variable
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-20 12:27:25 +09:00
Dean Herbert
a6e055b1f8 Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock 2019-02-20 12:08:37 +09:00
Dean Herbert
b4bb87fee3 Make TrackVirtualTracking more accurate on seeks/stops 2019-02-20 12:08:30 +09:00
Dan Balasescu
96590156cd
Merge branch 'master' into add-button-tooltip 2019-02-20 11:37:55 +09:00
Dean Herbert
f2ad2931c7 Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock 2019-02-20 11:37:33 +09:00
smoogipoo
49eadcb575 Update active state immediately + fix potential nullref 2019-02-19 19:44:09 +09:00
smoogipoo
703df77000 Update in-line with framework IsActive changes 2019-02-19 19:16:03 +09:00
smoogipoo
b7b1f0ef0c Merge branch 'remove-populateattributes' into new-diffcalc-mania 2019-02-19 17:55:56 +09:00
smoogipoo
4dcf39846d Pass beatmap to CreateSkills() 2019-02-19 17:52:59 +09:00
smoogipoo
1efc5179aa Merge branch 'remove-populateattributes' into new-diffcalc-mania 2019-02-19 17:46:52 +09:00
smoogipoo
ca8b7f24b4 Remove PopulateAttributes() 2019-02-19 17:36:33 +09:00
smoogipoo
8104c45c25 Merge remote-tracking branch 'origin/master' into new-diffcalc-mania
# Conflicts:
#	osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs
2019-02-19 16:30:05 +09:00
Dean Herbert
151388dfad
Merge branch 'master' into diffcalc-merging-2 2019-02-19 15:42:15 +09:00
smoogipoo
7ed461aa8c XMLDoc DifficultyHitObject 2019-02-19 14:30:59 +09:00
smoogipoo
93b7b51d0a timeRate -> clockRate 2019-02-19 14:29:23 +09:00
smoogipoo
3784b673ae History -> LimitedCapacityStack + re-xmldoc 2019-02-19 13:51:19 +09:00
smoogipoo
af0bb4d5e8 Remove mods from constructor 2019-02-19 13:40:39 +09:00
Dean Herbert
87dd7bcf6b Fix one more test regression 2019-02-19 13:02:33 +09:00
Dean Herbert
0fce23a36b Fix test regression 2019-02-19 12:38:45 +09:00
Dean Herbert
62fe5ad481 Nest class 2019-02-19 12:35:52 +09:00
Dean Herbert
f8033a3b35 Give TestWorkingBeatmap a reference clock 2019-02-19 12:27:30 +09:00
Dean Herbert
133c002d02 Fix test dlls being loaded as actual rulesets (and failing) 2019-02-19 12:13:55 +09:00
David Zhao
af049004dd Add test cases for transitioning into pause overlay and into results 2019-02-18 19:53:55 +09:00
David Zhao
4e07aba548 Make it so visual tests only load the osu ruleset 2019-02-18 18:12:45 +09:00
David Zhao
1d80674fbd Fix fadecontainer being added to multiple containers 2019-02-18 17:11:38 +09:00
David Zhao
af30aefe77
Merge branch 'master' into UserDimLogic 2019-02-18 16:56:16 +09:00
David Zhao
80800f2931 Match up fade behavior with current master 2019-02-18 16:34:11 +09:00
David Zhao
9be25c3758 Fix unit tests 2019-02-18 16:00:59 +09:00
David Zhao
f241d67e5f Use conditional operator isntead of if 2019-02-18 15:23:03 +09:00