1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
Commit Graph

15353 Commits

Author SHA1 Message Date
Dan Balasescu
a47a951ccd
Merge pull request #3776 from peppy/fix-skin-duplication
Fix skin duplication
2018-11-30 16:56:42 +09:00
Dan Balasescu
f496bdba69
Merge branch 'master' into fix-skin-duplication 2018-11-30 16:20:03 +09:00
Dan Balasescu
abc82dd480
Merge pull request #3788 from peppy/editor-keyboard-seek
Add support for keyboard seeking in the editor
2018-11-30 16:13:10 +09:00
smoogipoo
bc3fcb87b7 Use input events rather than scene graph traversals 2018-11-30 15:47:55 +09:00
Dan Balasescu
e83f6707bf
Merge branch 'master' into editor-keyboard-seek 2018-11-30 15:17:06 +09:00
Dan Balasescu
51543d034b
Merge pull request #3787 from peppy/editor-space-bar
Toggle pause in editor with spacebar
2018-11-30 15:16:53 +09:00
Dean Herbert
705ef5e3ac Fix hash function 2018-11-30 15:10:56 +09:00
Dean Herbert
ab621bd873 Toggle pause in editor with spacebar 2018-11-30 14:58:09 +09:00
Dean Herbert
0ee5a5bdb4 Add support for keyboard seeking in the editor 2018-11-30 14:57:25 +09:00
Dean Herbert
02ef187c04
Merge pull request #3736 from smoogipoo/inter-column-movements
Implement inter-column note movements
2018-11-30 14:48:57 +09:00
Dean Herbert
b3a55a26d7
Merge branch 'master' into inter-column-movements 2018-11-30 14:31:44 +09:00
Dean Herbert
7543af07dd
Remove weird reference 2018-11-30 14:30:50 +09:00
Dean Herbert
a1666fb7fa MouseDownPosition -> DragPosition 2018-11-30 14:21:20 +09:00
Dean Herbert
d64275b489
Merge pull request #3718 from Scotsoo/keypad-enter
Allowing keypad enter to be used along with normal enter
2018-11-30 13:08:13 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
Jack Scotson
e11b2218cb
Merge branch 'master' into keypad-enter 2018-11-29 13:51:07 +00:00
Dean Herbert
e0854254e7
Merge pull request #3738 from smoogipoo/hold-note-placement
Implement hold note placement
2018-11-29 21:53:26 +09:00
Dean Herbert
085acf29a0 Fix blueprints behaving incorrectly 2018-11-29 19:29:36 +09:00
Dean Herbert
ab0ce46362 Make hold note placement blueprints look a bit more blueprint-y 2018-11-29 18:13:15 +09:00
Dean Herbert
132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
Dean Herbert
08c8d7adb3
Merge pull request #3711 from smoogipoo/note-placement
Implement mania note placement
2018-11-29 15:13:48 +09:00
Dean Herbert
7ffc597a8e Fix one-frame issues 2018-11-29 14:55:20 +09:00
Dean Herbert
d1c976880c Fix incorrect margin/spacing handling 2018-11-29 14:15:28 +09:00
Dean Herbert
3d46ac7d35 Remove unnecessary high frequency input 2018-11-29 13:21:11 +09:00
Dean Herbert
8fd04cb47b Fix mania placement blueprints appearing outside valid stage placement area 2018-11-29 13:20:37 +09:00
Dean Herbert
86a0f8d2a9
Merge branch 'master' into note-placement 2018-11-29 13:06:11 +09:00
Dean Herbert
c577e317fb
Merge pull request #3780 from smoogipoo/fix-taiko-completions
Fix taiko not completing to results screen
2018-11-29 13:00:58 +09:00
Dean Herbert
097c8e0155
Merge branch 'master' into fix-taiko-completions 2018-11-29 12:17:37 +09:00
smoogipoo
aea84f737b Fix taiko hitobjects potentially disappearing before being judged 2018-11-29 12:12:29 +09:00
smoogipoo
52bc47499f Fix spinners not having proper lifetimes 2018-11-29 12:11:45 +09:00
Dean Herbert
6e9da49a61
Merge pull request #3775 from peppy/add-api-scope
Add wildcard scope to oauth requests
2018-11-29 00:27:24 +09:00
Dean Herbert
ab2b2493a1 Move hashing functionality to ArchiveModelManager 2018-11-28 19:21:36 +09:00
Dean Herbert
0384f3549f Add hash and missing indices to SkinInfo 2018-11-28 19:15:56 +09:00
Dean Herbert
f42d4a9382 Add wildcard scope to oauth requests 2018-11-28 19:02:23 +09:00
Dean Herbert
ce660b6d67 Add skin de-duplication 2018-11-28 19:01:22 +09:00
Dan Balasescu
0bb8d5217c
Merge pull request #3772 from peppy/fix-volume-precision
Fix volume adjustment precision regressing
2018-11-27 20:52:10 +09:00
Dean Herbert
6647fcd299 Fix volume adjustment precision regressing 2018-11-27 18:05:38 +09:00
Dean Herbert
cd513e6e91
Merge branch 'master' into note-placement 2018-11-26 23:12:25 +09:00
Dean Herbert
1ddb98e409
Merge pull request #3739 from UselessToucan/fix_idle_tracker
Fix idle tracker
2018-11-26 17:54:20 +09:00
Dean Herbert
da79292250
Merge branch 'master' into fix_idle_tracker 2018-11-26 17:41:45 +09:00
Dean Herbert
77090500e8 Merge branch 'fix_idle_tracker' of https://github.com/UselessToucan/osu into fix_idle_tracker 2018-11-26 17:41:22 +09:00
Dean Herbert
bf2ecef6d8 Add comprehensive tests 2018-11-26 17:40:25 +09:00
Dan Balasescu
033026c138
Merge pull request #3229 from DrabWeb/multiplayer-room-settings
Multiplayer room settings
2018-11-26 17:07:32 +09:00
Dean Herbert
32b36f2883 Use IBindable<> 2018-11-26 17:07:30 +09:00
Dean Herbert
266873740d Specify RelativeSizeAxes in ctor
This is basically always the behaviour we want.
2018-11-26 17:07:20 +09:00
Dean Herbert
626048038c Handle the null case 2018-11-26 16:50:41 +09:00
Dan Balasescu
38ef1d1f03
Merge branch 'master' into multiplayer-room-settings 2018-11-26 16:46:27 +09:00
Dean Herbert
b751a0d918
Merge branch 'master' into fix_idle_tracker 2018-11-26 16:44:04 +09:00
Dean Herbert
87da7b05a6 Remove unnecessarily specified RelativeSizeAxes 2018-11-26 16:39:11 +09:00
Dean Herbert
68f0d25550 Mvoe private method to bottom 2018-11-26 16:33:58 +09:00