1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 02:57:51 +08:00
Commit Graph

14575 Commits

Author SHA1 Message Date
Paul Teng
8873fa3fca
Merge branch 'master' into result-no-gamemode-switch 2018-10-08 14:10:51 -04:00
smoogipoo
f8eaccddda Stable doesn't use stacked positions 2018-10-08 18:37:49 +09:00
smoogipoo
0116db95d0 Fix progress calculation 2018-10-08 18:37:30 +09:00
smoogipoo
35f45e74dc Calculate scaled positions prior to square-rooting 2018-10-08 17:39:10 +09:00
smoogipoo
1ad5090ad6 Separate travel distance from jump distance 2018-10-08 17:38:12 +09:00
smoogipoo
61e7ada977 Use ints + fix position calculation 2018-10-08 17:36:06 +09:00
smoogipoo
da97600076 Fix inaccurate section lengths for first hitobject 2018-10-08 16:46:58 +09:00
Dean Herbert
86f11777a7
Merge pull request #3553 from plankp/handle-when-open
Handle non positional input only when opened
2018-10-07 22:12:28 +09:00
Paul Teng
aedb6e3bb7 Remove dedundant this qualifier 2018-10-06 08:12:29 -04:00
Paul Teng
6b236e3f2a Handle non positional input only when opened 2018-10-06 08:06:26 -04:00
Paul Teng
ca9cbf1aea Fix rulsets being completed unselectable 2018-10-06 07:51:56 -04:00
Paul Teng
8b27741cb0 Do not propagate positional input to subtree 2018-10-05 11:37:44 -04:00
Paul Teng
8264dd49de Update bindable only if enabled 2018-10-05 07:13:18 -04:00
smoogipoo
f7ebd063c3 Make user profile graph use a smooth path 2018-10-05 15:45:53 +09:00
smoogipoo
42664f1c19 Make SliderBody use the new SmoothPath 2018-10-05 15:45:45 +09:00
Dean Herbert
4ea4a0797f
Merge pull request #3545 from smoogipoo/fix-alpha-colours
Fix colours with alpha components not being parsed
2018-10-05 15:15:15 +09:00
smoogipoo
794501cc5a Fix incorrect result of ternary 2018-10-05 12:06:24 +09:00
smoogipoo
40c17cfa5a Remove ugly if-statement 2018-10-05 11:55:59 +09:00
smoogipoo
cb1703c6e2 Fix colours with alpha components not being parsed 2018-10-05 11:19:01 +09:00
smoogipoo
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
d0007c047a PlayfieldLayer -> PlayfieldAdjustmentContainer 2018-10-05 10:39:18 +09:00
Dean Herbert
9d518ff3ab
Merge pull request #3539 from peppy/fix-last-visit-regression
Fix last visit not supporting null values
2018-10-05 00:39:43 +09:00
Dean Herbert
716eee9a5c Fix last visit not supporting null values
Can now be null if a user chooses to hide their online status
2018-10-05 00:25:40 +09:00
Dean Herbert
a4c4622070
Merge pull request #3536 from ekrctb/3533-followup
Remove duplicated code
2018-10-04 18:28:16 +09:00
ekrctb
b9d0fc927b Remove duplicated code 2018-10-04 18:03:34 +09:00
Dan Balasescu
5fd0b29d9d
Merge pull request #3533 from peppy/fix-button-disable-regression
Fix gameplay mouse button disable setting no longer having any effect
2018-10-04 16:31:30 +09:00
Dan Balasescu
20391fd28c
Merge branch 'master' into fix-button-disable-regression 2018-10-04 15:43:50 +09:00
Dean Herbert
d801ce7afb
Merge pull request #3318 from cl8n/update-user-api
Update LastVisit JSON property name
2018-10-04 13:56:37 +09:00
Dean Herbert
593dee202c Fix gameplay mouse button disable setting no longer having any effect
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
2018-10-04 03:07:00 +09:00
Dean Herbert
62a51a9ff1
Merge pull request #3521 from smoogipoo/fix-screenshot-cursor
Fix cursor not hiding in screenshots
2018-10-04 02:48:11 +09:00
Dean Herbert
88bcc48204
Merge branch 'master' into fix-screenshot-cursor 2018-10-04 02:34:19 +09:00
Dan Balasescu
dbe055a877
Merge pull request #3523 from ekrctb/handle-input-framework-update
Update framework (UIEvent arg, HandleInput usage)
2018-10-02 15:55:13 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
97c585c54c Fix cursor not hiding in screenshots 2018-10-02 10:12:07 +09:00
Dan Balasescu
0d70306794
Merge pull request #3505 from qwewqa/judgement-cleanup
Move judgement text to internal container
2018-10-02 09:50:30 +09:00
Dan Balasescu
0f51007867
Merge branch 'master' into judgement-cleanup 2018-10-02 09:37:04 +09:00
Dan Balasescu
91a90ca34a
Merge pull request #3516 from AtomCrafty/fix-3514
Hide resolution dropdown when starting in windowed mode
2018-10-02 09:34:54 +09:00
Dan Balasescu
87d8945af9
Give the body a size 2018-10-02 09:33:31 +09:00
Dan Balasescu
b1450b1f1a
Merge branch 'master' into fix-3514 2018-10-02 09:24:58 +09:00
AtomCrafty
6c55efdf20 Add true to BindValueChanged call to hide resolution dropdown when starting in windowed mode 2018-10-01 13:12:34 +02:00
Dan Balasescu
b2ad603e81
Merge pull request #3429 from Hanamuke/AR_Catch
Fix osu!catch scrolling speed
2018-10-01 18:48:56 +09:00
smoogipoo
4af885f6b1 Adjust default mania speed to match stable 2018-10-01 18:30:52 +09:00
smoogipoo
08bd363827 Adjust taiko scrolling speed 2018-10-01 18:15:55 +09:00
smoogipoo
b68eeae777 Fix scrolling rulesets not accounting for slider multiplier 2018-10-01 18:12:30 +09:00
Hanamuke
6c1b3cf1a5 Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch 2018-09-30 16:09:27 +02:00
Hanamuke
08f58047c2 Remade measurements, turns out the correction was not needed 2018-09-30 16:08:17 +02:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00