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

11033 Commits

Author SHA1 Message Date
Dean Herbert
fee258f2f2 Rework PauseContainer to better pause 2018-02-27 17:23:38 +09:00
Dean Herbert
d4f1723ae6 Remove unnecessary secondary argument from HUDOverlay 2018-02-27 17:23:38 +09:00
Dean Herbert
0635ae2293 Include missing offset 2018-02-27 17:23:38 +09:00
Dean Herbert
9c0dfb7c8c Avoid creating an extra framed clock in SkipButton 2018-02-27 17:23:38 +09:00
Dean Herbert
73fb185132 Change the way ShouldProcessClock is specified in line with framework changes 2018-02-27 17:23:38 +09:00
Dan Balasescu
f76c6a47d2
Merge pull request #2099 from peppy/confine-mode-reset
Reset mouse confine mode on input setting reset hotkey
2018-02-26 21:25:06 +09:00
Dean Herbert
d2f98642a1
Merge branch 'master' into confine-mode-reset 2018-02-26 20:59:53 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays 2018-02-26 17:53:50 +09:00
naoey
a77d1eedae
Fix achievements parsing and add badges to recent activity. 2018-02-26 13:08:12 +05:30
Dean Herbert
0f32d2ed77
Merge pull request #2123 from smoogipoo/sliderbody-rework
Improve vector conditional
2018-02-26 16:22:53 +09:00
Dean Herbert
1218a75b7f Improve vector conditional 2018-02-26 16:11:26 +09:00
Dean Herbert
b9b5d00096
Merge pull request #2107 from smoogipoo/sliderbody-rework
Give DrawableSlider an accurate position and size
2018-02-26 16:03:47 +09:00
naoey
a20e4bc2c3
Fix typos and missing fields in JSON mappings. 2018-02-26 11:46:16 +05:30
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework 2018-02-26 15:00:18 +09:00
Dean Herbert
035157c730
Merge pull request #2098 from tgi74/taiko_legacy_rep
Fix legacy Taiko replays having reversed inputs
2018-02-26 14:28:48 +09:00
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
Dean Herbert
b9f8ed3123
Merge branch 'master' into taiko_legacy_rep 2018-02-26 13:27:37 +09:00
Dean Herbert
e7bd4ea0c7
Merge pull request #2116 from peppy/fix-slider-expiry
Fix sliders never getting a correct lifetime set
2018-02-26 13:27:03 +09:00
Dan Balasescu
edcef4e7ca
Merge branch 'master' into fix-slider-expiry 2018-02-26 12:45:56 +09:00
Dan Balasescu
dbb1d2b4aa
Merge pull request #2118 from peppy/fix-null-channels
Remove null channels from SkinnableSound playable channels
2018-02-26 12:45:35 +09:00
naoey
1ad45b0941
R# fixes. 2018-02-26 01:21:31 +05:30
naoey
75fdca928e
Handle links correctly and don't re-open profile if the user is same. 2018-02-26 01:21:29 +05:30
naoey
bb40919f9c
Add link handling to recent activities.
- Add a show user action to link handling
2018-02-26 01:21:27 +05:30
naoey
7e4bd36391
Create drawable and add response to profile.
- Add missing JSON fields to response model
- Add missing enum value
2018-02-26 01:21:24 +05:30
naoey
e3a1b07172
Create API request and reponse model. 2018-02-26 01:21:16 +05:30
Dean Herbert
ab9aed351f Remove null channels from SkinnableSound playable channels 2018-02-25 17:14:35 +09:00
Dean Herbert
f1ddfa0581 Fix sliders never getting a correct lifetime set 2018-02-25 16:25:56 +09:00
Dan Balasescu
c701b8eae5
Merge pull request #2105 from peppy/skinning-basics
Implement skin support for (most) hitsounds and (osu!) hitcircles
2018-02-24 23:18:12 +09:00
Dean Herbert
4a52df2dd4 Apply review 2018-02-24 23:07:02 +09:00
Dean Herbert
768e0a4e2a Add SkinnableSound class
Tidy things up, move logic out of SampleInfo.
2018-02-24 22:47:14 +09:00
Dean Herbert
a312fb365a Merge remote-tracking branch 'ppy/master' into skinning-basics 2018-02-24 22:41:17 +09:00
Dean Herbert
6d4016e18b Update framework 2018-02-24 22:41:04 +09:00
Dean Herbert
a70fc7c703
Merge pull request #2112 from VPeruS/fix-case
Fix migration file case
2018-02-24 21:37:22 +09:00
V.Kalyuzhny
ef6b207c7e Fix file case 2018-02-24 14:18:53 +02:00
smoogipoo
f5fc9cdfba Fix catch now having incorrect offsets 2018-02-24 02:59:55 +09:00
smoogipoo
50d1183ec2 Division-by-zero safety + reference our own size 2018-02-24 02:53:02 +09:00
smoogipoo
066abfbdbc Rename PositionAt -> CurvePositionAt to represent its new meaning 2018-02-24 02:43:36 +09:00
smoogipoo
996e605e61 Remove temporary testcase 2018-02-24 02:39:44 +09:00
smoogipoo
1e1df2aaff Fix up testcases 2018-02-23 21:04:19 +09:00
smoogipoo
8c90abe0dc Make slider control points relative to start position 2018-02-23 20:59:27 +09:00
smoogipoo
08bb25347c Make DrawableSlider contain the slider body 2018-02-23 20:27:05 +09:00
smoogipoo
278b25bcbd Fix border being the wrong size 2018-02-23 15:29:56 +09:00
smoogipoo
d72290ee24 Make ScaledContainer private 2018-02-23 15:06:08 +09:00
smoogipoo
bea9bf9dd4 Merge remote-tracking branch 'origin/master' into taiko_legacy_rep 2018-02-23 14:40:32 +09:00
smoogipoo
3fdb6845da Revert unneeded change
This was already correct as per osu-stable.
2018-02-23 14:40:25 +09:00
Dean Herbert
a36986ef5a Make ComponentName readonly 2018-02-23 14:28:57 +09:00
Dean Herbert
0e20c4e6bb Fix typo 2018-02-23 14:27:53 +09:00
Dean Herbert
ff75cf6b75 Remove unnecessary braces 2018-02-23 14:27:39 +09:00
Dean Herbert
f81eb2de65 Remove unnecessary local store 2018-02-23 14:24:32 +09:00
Dean Herbert
92d20eea8c Add missing licence header 2018-02-23 13:38:12 +09:00