Commit Graph

15342 Commits

Author SHA1 Message Date
ab621bd873 Toggle pause in editor with spacebar 2018-11-30 14:58:09 +09:00
02ef187c04 Merge pull request #3736 from smoogipoo/inter-column-movements
Implement inter-column note movements
2018-11-30 14:48:57 +09:00
b3a55a26d7 Merge branch 'master' into inter-column-movements 2018-11-30 14:31:44 +09:00
7543af07dd Remove weird reference 2018-11-30 14:30:50 +09:00
a1666fb7fa MouseDownPosition -> DragPosition 2018-11-30 14:21:20 +09:00
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
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
e11b2218cb Merge branch 'master' into keypad-enter 2018-11-29 13:51:07 +00:00
e0854254e7 Merge pull request #3738 from smoogipoo/hold-note-placement
Implement hold note placement
2018-11-29 21:53:26 +09:00
085acf29a0 Fix blueprints behaving incorrectly 2018-11-29 19:29:36 +09:00
ab0ce46362 Make hold note placement blueprints look a bit more blueprint-y 2018-11-29 18:13:15 +09:00
132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
08c8d7adb3 Merge pull request #3711 from smoogipoo/note-placement
Implement mania note placement
2018-11-29 15:13:48 +09:00
7ffc597a8e Fix one-frame issues 2018-11-29 14:55:20 +09:00
d1c976880c Fix incorrect margin/spacing handling 2018-11-29 14:15:28 +09:00
3d46ac7d35 Remove unnecessary high frequency input 2018-11-29 13:21:11 +09:00
8fd04cb47b Fix mania placement blueprints appearing outside valid stage placement area 2018-11-29 13:20:37 +09:00
86a0f8d2a9 Merge branch 'master' into note-placement 2018-11-29 13:06:11 +09:00
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
097c8e0155 Merge branch 'master' into fix-taiko-completions 2018-11-29 12:17:37 +09:00
aea84f737b Fix taiko hitobjects potentially disappearing before being judged 2018-11-29 12:12:29 +09:00
52bc47499f Fix spinners not having proper lifetimes 2018-11-29 12:11:45 +09:00
6e9da49a61 Merge pull request #3775 from peppy/add-api-scope
Add wildcard scope to oauth requests
2018-11-29 00:27:24 +09:00
f42d4a9382 Add wildcard scope to oauth requests 2018-11-28 19:02:23 +09:00
0bb8d5217c Merge pull request #3772 from peppy/fix-volume-precision
Fix volume adjustment precision regressing
2018-11-27 20:52:10 +09:00
6647fcd299 Fix volume adjustment precision regressing 2018-11-27 18:05:38 +09:00
cd513e6e91 Merge branch 'master' into note-placement 2018-11-26 23:12:25 +09:00
1ddb98e409 Merge pull request #3739 from UselessToucan/fix_idle_tracker
Fix idle tracker
2018-11-26 17:54:20 +09:00
da79292250 Merge branch 'master' into fix_idle_tracker 2018-11-26 17:41:45 +09:00
77090500e8 Merge branch 'fix_idle_tracker' of https://github.com/UselessToucan/osu into fix_idle_tracker 2018-11-26 17:41:22 +09:00
bf2ecef6d8 Add comprehensive tests 2018-11-26 17:40:25 +09:00
033026c138 Merge pull request #3229 from DrabWeb/multiplayer-room-settings
Multiplayer room settings
2018-11-26 17:07:32 +09:00
32b36f2883 Use IBindable<> 2018-11-26 17:07:30 +09:00
266873740d Specify RelativeSizeAxes in ctor
This is basically always the behaviour we want.
2018-11-26 17:07:20 +09:00
626048038c Handle the null case 2018-11-26 16:50:41 +09:00
38ef1d1f03 Merge branch 'master' into multiplayer-room-settings 2018-11-26 16:46:27 +09:00
b751a0d918 Merge branch 'master' into fix_idle_tracker 2018-11-26 16:44:04 +09:00
87da7b05a6 Remove unnecessarily specified RelativeSizeAxes 2018-11-26 16:39:11 +09:00
68f0d25550 Mvoe private method to bottom 2018-11-26 16:33:58 +09:00
8d65d49126 Use bindable flow for checking idle time 2018-11-26 16:32:59 +09:00
dea387c31e Fix post-merge issues 2018-11-26 16:29:56 +09:00
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
f58f3e22c7 Merge pull request #3753 from miterosan/ChatManager_with_BindableCollection
Chat manager with bindable collection
2018-11-26 16:24:41 +09:00
efdad3a3a7 Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection 2018-11-26 16:12:55 +09:00
f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
fe5b043a59 Merge branch 'master' into fix_idle_tracker 2018-11-26 15:24:44 +09:00
4cfeb1b9a1 Merge branch 'master' into note-placement 2018-11-26 14:35:31 +09:00
e94c5dfabe Merge pull request #3744 from smoogipoo/fix-deletion-crash
Implement mania note deletion
2018-11-26 14:28:39 +09:00
c944e8bb29 Merge branch 'master' into fix-deletion-crash 2018-11-26 14:20:02 +09:00
bfebed053d Merge branch 'master' into note-placement 2018-11-26 14:19:46 +09:00