1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 16:42:55 +08:00
Commit Graph

15549 Commits

Author SHA1 Message Date
Dean Herbert
06ea174f34
Merge branch 'master' into fix-sv 2018-10-09 18:00:34 +09:00
smoogipoo
6d24bde72b Fix beatmap details not displaying 2018-10-09 17:39:27 +09:00
smoogipoo
ccb6723711 Debounce music controller seeks 2018-10-09 16:50:29 +09:00
Dan Balasescu
a2838d32bf
Merge branch 'master' into skinnable-spritetext 2018-10-09 16:23:43 +09:00
Dan Balasescu
3322eb47b3
Merge pull request #3565 from peppy/fix-joined-channel-state
Fix joined channels not appearing as joined in the channel list
2018-10-09 16:22:53 +09:00
Dean Herbert
a171ed3500 Fix joined channels not appearing as joined in the channel list 2018-10-09 16:12:20 +09:00
smoogipoo
0a3be0d253 Adjust comments slightly 2018-10-09 12:03:47 +09:00
smoogipoo
9facf707be Add diffcalc beatmap decoder 2018-10-09 11:49:24 +09:00
smoogipoo
b7499fa956 Allow TimingControlPoint to be overridden 2018-10-09 11:34:38 +09:00
Fayne Aldan
edf87bfdd8
Merge branch 'master' into wiggle-repeat-points 2018-10-08 15:23:45 -06:00
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
HoLLy
97f8619301 Add database migration for standardizing paths 2018-10-07 21:07:30 +02:00
HoLLy
db443babb6 Fix database entries using platform-specific path separator 2018-10-07 19:15:42 +02: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
miterosan
760c88e335
Merge branch 'master' into Cakefy_osu! 2018-10-05 15:13:09 +02:00
miterosan
b394f8c5ad Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu! 2018-10-05 14:57:51 +02:00
miterosan
6977b2825f Use the coreclr instead of caketool, hoping that the version fixes running it on linux 2018-10-05 14:57:09 +02:00
miterosan
74e89fd945 Add config file 2018-10-05 14:54:11 +02: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
miterosan
12d30cec42
Merge branch 'master' into Cakefy_osu! 2018-10-04 19:07:32 +02:00
miterosan
5abe3a0233 Also rename the cake project in the bootstrap script 2018-10-04 19:02:59 +02:00
miterosan
0724b47334 Minify the buildscript and update to cake.0.30.0
Also remove the dependency on Cake.CoreCLR
cake.tool does not use the packages.config.
2018-10-04 18:57:14 +02: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
miterosan
e47be64f91
Merge branch 'master' into Cakefy_osu! 2018-10-04 16:38:10 +02: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
smoogipoo
e931aa3d9e Move positional modifications to HitCirclePlacementMask 2018-10-04 13:43:50 +09:00
smoogipoo
6a65802528 Fix hitcircle selections not responding to stacking changes 2018-10-04 12:19:11 +09:00