Commit Graph

14261 Commits

Author SHA1 Message Date
1670f4fe31 Merge branch 'master' into fix-osd-fade-in 2018-07-09 19:10:57 +09:00
37f0095ae5 Merge pull request #2980 from peppy/fix-exit-race-condition
Fix pressing escape too fast causing multiple exit attempts at song select
2018-07-09 19:10:41 +09:00
ee4607c86e Merge branch 'master' into fix-exit-race-condition 2018-07-09 19:02:37 +09:00
34db414672 Merge pull request #2981 from peppy/fix-early-player-entry
Fix being able to trigger player before carousel is ready
2018-07-09 19:02:09 +09:00
49e94850b6 Fix being able to trigger player before carousel is ready
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
ce0a7d7760 Merge pull request #2978 from HoutarouOreki/removeAge
Remove unused age display code
2018-07-09 18:17:12 +09:00
09b3375a9d Fix pressing escape too fast causing multiple exit attempts at song select 2018-07-09 18:12:23 +09:00
df67c0498d Fix OSD fade-in not correctly debouncing
It could potentially never fade in on quick presses.
2018-07-09 17:53:39 +09:00
6ced51bb67 Merge branch 'master' into removeAge 2018-07-09 17:43:23 +09:00
10cc95427d Merge pull request #2977 from smoogipoo/fix-nullrefs
Fix some possible null reference exceptions
2018-07-09 17:43:01 +09:00
10aae3b0ee Remove age from User class 2018-07-09 10:33:46 +02:00
930667d0f9 Remove unused age display code 2018-07-09 10:12:10 +02:00
0a67e5a274 Fix some possible null reference exceptions 2018-07-09 17:09:17 +09:00
1444715641 Merge pull request #1 from ppy/master
Sync to upstream repo
2018-07-09 09:07:59 +02:00
b20afb915d Fix right mouse activated absolute scroll not working 2018-07-09 15:26:22 +09:00
157ca8b2a4 Change osu key bindings 2018-07-08 11:47:39 -07:00
e223074876 Fix import failures if single set has multiple conflicting OnlineBeatmapIDs
Resolves #2970.
2018-07-09 00:24:55 +09:00
91777b04d8 Merge branch 'master' into download-button-state 2018-07-08 14:15:47 +09:00
27311ce1fc Update nuget restore instructions 2018-07-08 11:21:18 +09:00
f92a90c098 Update README.md 2018-07-08 02:03:42 +09:00
c194618df3 Merge pull request #2876 from smoogipoo/more-mania-conversion-fixes
Fix more instances of osu!mania beatmap conversion failing
2018-07-08 01:54:59 +09:00
ad51d95c1a Merge branch 'master' into more-mania-conversion-fixes 2018-07-08 01:44:06 +09:00
7bfd82a417 Merge branch 'master' into hit-shake 2018-07-06 18:42:18 +09:00
f872c56deb Merge branch 'master' into improve-button-system 2018-07-06 18:25:34 +09:00
d1846e6128 Merge pull request #2933 from ekrctb/fix-menu-cursor-animation
Fix menu cursor not highlighting when pressing multiple buttons
2018-07-06 17:56:38 +09:00
0b30e6eb6a Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system 2018-07-06 17:55:02 +09:00
c025158735 Give VisibleState a default rather than nullable 2018-07-06 17:53:06 +09:00
c4952569cc Merge branch 'master' into fix-menu-cursor-animation 2018-07-06 17:46:29 +09:00
54db287791 Remove casting 2018-07-06 17:45:39 +09:00
3005259d50 Add test for shaking 2018-07-06 17:38:58 +09:00
79af5cb0a0 Limit shake duration to ensure it doesn't overlap miss window 2018-07-06 17:24:30 +09:00
a300b5c924 Merge pull request #2946 from peppy/go-forward
Add "Select" action
2018-07-06 16:48:37 +09:00
7120408a63 Add fallback "updater", which prompts the user to update 2018-07-06 16:46:22 +09:00
b8d314a809 Tidy up updater namespace 2018-07-06 16:39:27 +09:00
8f3f872182 Merge branch 'master' into go-forward 2018-07-06 14:29:26 +09:00
a1d2092cc9 Fix incorrect default drain time 2018-07-06 13:29:40 +09:00
290812cf65 Merge branch 'master' into more-mania-conversion-fixes 2018-07-06 13:29:16 +09:00
98410dbb6d Reduce shake transform count by one for more aesthetic behaviour 2018-07-06 13:24:02 +09:00
92be9bface Merge branch 'master' into hit-shake 2018-07-06 13:20:53 +09:00
7da5a2fec9 Merge pull request #2964 from johnneijzen/JSON-format-fix
Remove extra commas in vscode build configuration
2018-07-06 13:20:38 +09:00
e041352690 Add comment regarding add/clear/remove overrides 2018-07-06 13:19:43 +09:00
48d90a67ae xmldoc and formatting 2018-07-06 12:13:23 +09:00
0ecbc5945f Adjust transform to look better 2018-07-06 12:07:39 +09:00
aa96d91762 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-07-06 11:57:32 +09:00
d453414070 Forward shakes from slider head objects to sliders 2018-07-06 11:52:58 +09:00
56196885e6 Merge branch 'master' into JSON-format-fix 2018-07-06 11:41:28 +09:00
dffe6af5d9 Merge branch 'master' into fix-menu-cursor-animation 2018-07-06 11:29:53 +09:00
7a09108387 Remove extra , make this valid JSON file 2018-07-05 22:38:34 +08:00
fa6ffe9a34 Merge pull request #2890 from ekrctb/fix-volme-meter
Update volume controls to use mouse wheel actions
2018-07-05 22:59:50 +09:00
558b2622a7 Move the Shake logic to a new ShakeContainer 2018-07-05 15:48:54 +02:00