d2294cd294
Merge branch 'master' into simplify-hud-overlay
2017-06-05 21:00:04 +09:00
b9c99950da
Merge pull request #903 from peppy/update-resource
...
Update resources
2017-06-05 20:59:44 +09:00
c85a0223b0
Only instantly move tooltip is we are not visible
2017-06-05 20:52:46 +09:00
2ca2c1e020
Merge branch 'master' into update-resource
2017-06-05 20:45:15 +09:00
04f0b5204a
Merge branch 'master' into smoothly-moving-tooltips
2017-06-05 20:42:08 +09:00
d1508f3fd4
Merge pull request #893 from peppy/raw-input-sensitivity
...
Add settings for toggling raw input and adjusting sensitivity
2017-06-05 13:38:24 +02:00
09e075e3fb
Allow adjusting mouse sensitivity at 0.01 increments
2017-06-05 20:22:39 +09:00
55d8b8b5f5
Merge branch 'master' into raw-input-sensitivity
2017-06-05 20:16:40 +09:00
d2ced2ea79
Update with framework changes.
2017-06-05 20:16:37 +09:00
b4b3ba0787
Fix incorrect initial movement of tooltips
2017-06-05 13:07:38 +02:00
4307242bb6
Update with framework changes.
2017-06-05 20:06:46 +09:00
e92c1210d1
Make osu tooltips move smoothly
2017-06-05 12:59:29 +02:00
a7c7618aa0
Update resources
2017-06-05 19:24:34 +09:00
bf971f6613
Merge branch 'master' into social-browser
2017-06-05 19:16:28 +09:00
78500eec21
Applied suggested changes
2017-06-05 12:24:28 +03:00
16fcfc473d
Fix toggle not toggling on pressing escape
...
Also add comment about hacky implementation of toggle tab.
2017-06-05 18:04:40 +09:00
6b9d5afc4b
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
2017-06-05 11:51:45 +03:00
778865b6eb
Merge remote-tracking branch 'upstream/master' into channel-selection
2017-06-05 17:36:14 +09:00
5568df1aee
Remove StandardHUDOverlay
...
This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now.
We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.
2017-06-05 17:18:07 +09:00
14e597b608
Merge pull request #785 from EVAST9919/ingame_options
...
Replay Settings
2017-06-05 17:15:42 +09:00
2712f49545
Remove bad
2017-06-05 17:06:47 +09:00
958cd9f8d8
Don't display in-game
...
Nothing does anything yet, so we can't display this. Make it functional before adding to game project.
2017-06-05 16:52:09 +09:00
af6f8bbd89
Fix namespaces and class names
2017-06-05 16:47:42 +09:00
c3c56820fa
Fix lots of small issues
2017-06-05 16:43:23 +09:00
0cb1df35e9
Merge remote-tracking branch 'upstream/master' into ingame_options
2017-06-05 14:53:37 +09:00
fb1d9fe6f0
Merge branch 'master' into raw-input-sensitivity
2017-06-05 13:39:02 +09:00
61289dcead
Update framework
2017-06-05 13:38:37 +09:00
ae7388e68f
Don't update sensitivity when dragging slider
2017-06-05 13:25:18 +09:00
ff0888449f
Disable ability to adjust sensitivity when raw input is disabled
2017-06-05 12:13:15 +09:00
a36148e57c
Merge pull request #896 from Tom94/separate-skip
...
Move skip button into its own test, because it is no longer two-layered
2017-06-05 12:10:37 +09:00
04c5fed1ad
Merge branch 'master' into separate-skip
2017-06-05 11:58:53 +09:00
01243a6e75
Update framework
2017-06-05 11:58:01 +09:00
c1e6438bec
Merge remote-tracking branch 'upstream/master' into raw-input-sensitivity
2017-06-05 11:42:26 +09:00
a3299809fe
Merge remote-tracking branch 'origin/master' into timingchange-rework
...
# Conflicts:
# osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
2017-06-05 10:19:53 +09:00
1cf10263cb
Merge pull request #890 from peppy/async-channel-load
...
Load initial channel content asynchronously
2017-06-05 10:16:06 +09:00
6bda62f260
Merge branch 'master' into async-channel-load
2017-06-05 10:02:01 +09:00
d28e8a4b51
Merge pull request #883 from Shawdooow/Daycore
...
Mod Suggestion: Daycore
2017-06-05 09:50:01 +09:00
52bb2df69b
Change to fa_question for now, pending flyte redesign.
2017-06-05 09:40:22 +09:00
d6a1205d08
Merge branch 'master' into Daycore
2017-06-05 09:33:30 +09:00
0afb188cde
Remove unused using
2017-06-03 20:05:51 +02:00
f6e0e0bc38
add caps lock warning
2017-06-03 19:24:53 +02:00
04925594ca
Merge branch 'master' into separate-skip
2017-06-03 17:45:57 +02:00
d498a4a022
Trim whitespace
2017-06-03 17:45:44 +02:00
3b987e35c9
Merge pull request #895 from Jorolf/framework-tooltips
...
update osu to use the framework's TooltipContainer
2017-06-03 17:34:43 +02:00
8cd2f509ef
Move skip button into its own test, because it is no longer two-layered
2017-06-03 17:33:24 +02:00
2c5979ea8a
Remove unnecessary usings
2017-06-03 17:29:20 +02:00
3daae480d2
Remove TestCaseTooltip
2017-06-03 17:28:34 +02:00
9c6ce230bc
Fix compile error
2017-06-03 17:17:56 +02:00
b2bbf65e39
Update framework
2017-06-03 17:01:21 +02:00
50158a1cd2
Fix incorrect proportions of menu cursor
2017-06-03 16:34:00 +02:00
