1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

17046 Commits

Author SHA1 Message Date
Dean Herbert
2c9e6adfd4
Merge branch 'master' into bindable-valuechanged 2019-02-22 17:14:05 +09:00
Dean Herbert
0f5f768112
Merge pull request #4308 from smoogipoo/disable-testcase-polling
Disable TestInstantPolling
2019-02-22 17:13:47 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
David Zhao
263972a048 Remove DimLevel bindable from ScreenWithBeatmapBackground 2019-02-22 17:00:00 +09:00
smoogipoo
d4bdae4b04 Disable TestInstantPolling 2019-02-22 16:59:52 +09:00
David Zhao
918a60ebbf Create a new player every time a test is performed. 2019-02-22 16:56:03 +09:00
DJKero
0dc998b5f9
Merge branch 'master' into master 2019-02-22 03:18:10 -03:00
Dan Balasescu
de52318ae9
Merge pull request #4306 from peppy/add-judgement-tostring
Add ToString for Judgements to ease debugging
2019-02-22 14:57:01 +09:00
David Zhao
65cdac60c3 Add tests to make sure the background is always the same through screen transitions 2019-02-22 14:43:05 +09:00
Ignacio Conde
a62f150962 Fixed Issue #4159 2019-02-22 02:28:38 -03:00
Dean Herbert
f919f2252f Add ToString for Judgements to ease debugging 2019-02-22 12:02:54 +09:00
David Zhao
94bc552282 Fix backgrounds not fading out when replaced by storyboard, add test for this 2019-02-22 11:41:28 +09:00
Dean Herbert
8f53af1c71 Update framework 2019-02-22 11:32:14 +09:00
smoogipoo
8853f7ad76 Explicitly set exo typeface in a few places 2019-02-21 19:26:02 +09:00
smoogipoo
d99eaa3fce Simplify expression 2019-02-21 19:25:08 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
David Zhao
97db8abd59 Remove unused includes 2019-02-21 18:34:11 +09:00
David Zhao
bf06674e87 Clean up test case 2019-02-21 18:19:50 +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
d637b184e4
Merge pull request #4247 from peppy/remove-pr-template
Remove github pull request template
2019-02-21 14:42:15 +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
Dean Herbert
79753919db
Merge pull request #4302 from smoogipoo/remove-legacy-diffcalc
Remove LegacyDifficultyCalculator
2019-02-21 13:19:22 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
Dean Herbert
264fa34c13
Merge pull request #4301 from peppy/fix-filename
Fix non-conforming filename
2019-02-21 11:41:36 +09:00
Dean Herbert
c96a2ac853 Fix non-conforming filename 2019-02-20 21:08:52 +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
5bf405f949 Fix bindable name in tests 2019-02-20 16:56:57 +09:00
Dean Herbert
42039a0ce9
Merge pull request #4296 from smoogipoo/isactive-changes
Update in-line with framework IsActive changes
2019-02-20 16:55:06 +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
Dean Herbert
a394e887df
Merge pull request #4290 from peppy/test-working-beatmap-clock
Give TestWorkingBeatmap a reference clock
2019-02-20 16:04:46 +09:00
Dan Balasescu
0850cb503d
Merge branch 'master' into test-working-beatmap-clock 2019-02-20 15:57:46 +09:00
Dan Balasescu
c8311dfe60
Merge pull request #4190 from HoLLy-HaCKeR/ctb-diffcalc
Fix Catch DifficultyCalculator being off
2019-02-20 15:28:40 +09:00
smoogipoo
c01b18f02f Adjust expected testcase value 2019-02-20 15:18:51 +09:00
smoogipoo
cab7a030f0 Merge remote-tracking branch 'origin/master' into ctb-diffcalc 2019-02-20 15:15:12 +09:00
Dean Herbert
34afb2d897
Merge branch 'master' into test-working-beatmap-clock 2019-02-20 15:15:08 +09:00
Dean Herbert
850a84b506
Merge pull request #4298 from smoogipoo/fix-catch-diffcalc-position
Fix position not being set for the first hitobject
2019-02-20 15:14:36 +09:00