1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 05:22:54 +08:00
Commit Graph

24160 Commits

Author SHA1 Message Date
Dean Herbert
12f1c9e088 Fix test failure 2019-12-06 15:29:02 +09:00
smoogipoo
27dd12a66d Rewrite slider length calculation for readability 2019-12-06 15:06:31 +09:00
Dean Herbert
a883ff63bc
Make expert plus colour on tooltip more readable (#7067)
Make expert plus colour on tooltip more readable

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-06 14:50:57 +09:00
Dean Herbert
21ceb7f85d Always display skins at native sizes for now 2019-12-06 14:40:45 +09:00
Dean Herbert
04b89c8242
Merge branch 'master' into expertplus-tooltip-colour 2019-12-06 13:54:13 +09:00
Dean Herbert
48c6279e8b Only undo adjustments in GameplayClockContainer if applied at least once 2019-12-06 13:49:22 +09:00
Dean Herbert
de23364608 Add failing test 2019-12-06 13:47:34 +09:00
smoogipoo
a89a23fe08 Use linq to simplify some expressions 2019-12-06 13:08:35 +09:00
Dean Herbert
b1426d1b22 Full impossible nullref 2019-12-06 12:51:43 +09:00
smoogipoo
247609388f Clean up unused/unnecessary properties 2019-12-06 12:31:22 +09:00
Dean Herbert
9248fbe881 Remove extra checkboxes for now 2019-12-06 12:22:44 +09:00
Dean Herbert
9f4c8db395 Add xmldoc 2019-12-06 12:17:41 +09:00
Ganendra Afrasya
8be6abf607 Add param to let function return lighter colour for some diff 2019-12-06 10:07:16 +07:00
smoogipoo
23c7132c4f Add missing license header 2019-12-06 11:53:22 +09:00
Dean Herbert
28400aa865 Update test scene 2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835 Move thickness to a constant 2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64 Fix warnings 2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb Make work in editor 2019-12-05 20:12:25 +09:00
smoogipoo
3ebbf62b2a Initial game-wide update with the new SliderPath 2019-12-05 19:53:36 +09:00
Dean Herbert
e225b0032a Add basic hitobject display to timeline 2019-12-05 19:31:40 +09:00
Dean Herbert
e213b338ce
Merge pull request #7068 from peppy/update-framework
Update framework
2019-12-05 18:31:34 +09:00
smoogipoo
c9a66c0d07 Expose a version to indicate path changes 2019-12-05 18:31:28 +09:00
Dean Herbert
2419077c07 Update framework 2019-12-05 18:31:13 +09:00
smoogipoo
1585d83b96 Add legacy constructor 2019-12-05 18:19:42 +09:00
smoogipoo
986ac1cee4 Make expected distance a bindable 2019-12-05 17:51:29 +09:00
smoogipoo
2702edfa55 Rename new path, replace existing one 2019-12-05 17:49:32 +09:00
Ganendra Afrasya
0e97871461 Change colour if difficulty is ExpertPlus 2019-12-05 14:53:01 +07:00
smoogipoo
5e9b739b67 Re-implement slider paths to support multiple segments 2019-12-05 16:45:02 +09:00
Dean Herbert
aa69038be0
Merge pull request #7063 from peppy/decouple-api-room-scoreinfo
Fix multiplayer aggregate score inheriting from ScoreInfo
2019-12-05 15:11:07 +09:00
smoogipoo
0149e47673 Expose general control point change event 2019-12-05 14:38:32 +09:00
smoogipoo
3e0f499e72 Add xmldocs 2019-12-05 14:38:21 +09:00
smoogipoo
40d0700fa5 Add structure for path control points 2019-12-05 13:43:38 +09:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo 2019-12-05 12:43:43 +09:00
Dan Balasescu
1622a537c0
Merge pull request #7064 from peppy/eager-skip-filters
Optimise song select filter application to avoid unnecessary property retrieval
2019-12-05 12:43:32 +09:00
Dan Balasescu
f18519965c
Merge branch 'master' into eager-skip-filters 2019-12-05 12:27:42 +09:00
Dean Herbert
48287459a0 Optimise filters to avoid property retrieval
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
2019-12-05 01:52:22 +09:00
Dean Herbert
36224dca13 Fix multiplayer aggregate score inheriting from ScoreInfo 2019-12-05 01:45:28 +09:00
Dean Herbert
5c1305a3e7
Make player block exit if pausable (#6992)
Make player block exit if pausable

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-05 01:39:52 +09:00
Dean Herbert
5b8ca8f84a Remove test ignore rules 2019-12-05 01:17:11 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase 2019-12-05 01:00:27 +09:00
Dean Herbert
bb00b4166e
Implement CatchModRelax (#4756)
Implement CatchModRelax

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-05 00:59:55 +09:00
Dean Herbert
0ea2c55651
Update framework (#7060)
Update framework
2019-12-05 00:49:12 +09:00
Dean Herbert
15ee65b8e9
Merge branch 'master' into ctb-relax 2019-12-04 23:35:55 +09:00
Dean Herbert
0734b52483 Update framework 2019-12-04 23:33:26 +09:00
Dean Herbert
ca1f3417a3
Merge pull request #7046 from smoogipoo/fix-replay-button
Fix replay download button not working
2019-12-04 23:00:40 +09:00
Dan Balasescu
8dbb46d083
Merge pull request #7047 from peppy/decouple-legacy-score-info
Decouple LegacyScoreInfo/APILegacyScoreInfo from ScoreInfo
2019-12-04 12:24:32 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dan Balasescu
5d7c40da6e
Merge pull request #7010 from peppy/add-missing-long-running
Add some more missing LongRunningLoad flags
2019-12-04 11:47:10 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running 2019-12-04 11:29:25 +09:00
Dan Balasescu
5e56e91fe2
Merge pull request #7050 from huoyaoyuan/equals
Remove some remaining untyped boxing calls
2019-12-04 11:27:41 +09:00