Dean Herbert
bf971f6613
Merge branch 'master' into social-browser
2017-06-05 19:16:28 +09:00
Dean Herbert
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
Dean Herbert
778865b6eb
Merge remote-tracking branch 'upstream/master' into channel-selection
2017-06-05 17:36:14 +09:00
Dean Herbert
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
Dean Herbert
14e597b608
Merge pull request #785 from EVAST9919/ingame_options
...
Replay Settings
2017-06-05 17:15:42 +09:00
Dean Herbert
2712f49545
Remove bad
2017-06-05 17:06:47 +09:00
Dean Herbert
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
Dean Herbert
af6f8bbd89
Fix namespaces and class names
2017-06-05 16:47:42 +09:00
Dean Herbert
c3c56820fa
Fix lots of small issues
2017-06-05 16:43:23 +09:00
Dean Herbert
0cb1df35e9
Merge remote-tracking branch 'upstream/master' into ingame_options
2017-06-05 14:53:37 +09:00
Dean Herbert
fb1d9fe6f0
Merge branch 'master' into raw-input-sensitivity
2017-06-05 13:39:02 +09:00
Dean Herbert
61289dcead
Update framework
2017-06-05 13:38:37 +09:00
Dean Herbert
ae7388e68f
Don't update sensitivity when dragging slider
2017-06-05 13:25:18 +09:00
Dean Herbert
ff0888449f
Disable ability to adjust sensitivity when raw input is disabled
2017-06-05 12:13:15 +09:00
Dan Balasescu
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
Dan Balasescu
04c5fed1ad
Merge branch 'master' into separate-skip
2017-06-05 11:58:53 +09:00
Dean Herbert
01243a6e75
Update framework
2017-06-05 11:58:01 +09:00
Dean Herbert
c1e6438bec
Merge remote-tracking branch 'upstream/master' into raw-input-sensitivity
2017-06-05 11:42:26 +09:00
smoogipooo
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
Dan Balasescu
1cf10263cb
Merge pull request #890 from peppy/async-channel-load
...
Load initial channel content asynchronously
2017-06-05 10:16:06 +09:00
Dan Balasescu
6bda62f260
Merge branch 'master' into async-channel-load
2017-06-05 10:02:01 +09:00
Dan Balasescu
d28e8a4b51
Merge pull request #883 from Shawdooow/Daycore
...
Mod Suggestion: Daycore
2017-06-05 09:50:01 +09:00
smoogipooo
52bb2df69b
Change to fa_question for now, pending flyte redesign.
2017-06-05 09:40:22 +09:00
Dan Balasescu
d6a1205d08
Merge branch 'master' into Daycore
2017-06-05 09:33:30 +09:00
Thomas Müller
0afb188cde
Remove unused using
2017-06-03 20:05:51 +02:00
Thomas Müller
04925594ca
Merge branch 'master' into separate-skip
2017-06-03 17:45:57 +02:00
Thomas Müller
d498a4a022
Trim whitespace
2017-06-03 17:45:44 +02:00
Thomas Müller
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
Thomas Müller
8cd2f509ef
Move skip button into its own test, because it is no longer two-layered
2017-06-03 17:33:24 +02:00
Thomas Müller
2c5979ea8a
Remove unnecessary usings
2017-06-03 17:29:20 +02:00
Thomas Müller
3daae480d2
Remove TestCaseTooltip
2017-06-03 17:28:34 +02:00
Thomas Müller
9c6ce230bc
Fix compile error
2017-06-03 17:17:56 +02:00
Thomas Müller
b2bbf65e39
Update framework
2017-06-03 17:01:21 +02:00
Thomas Müller
50158a1cd2
Fix incorrect proportions of menu cursor
2017-06-03 16:34:00 +02:00
Jorolf
a43890ffb4
update osu to use the framework's TooltipContainer
2017-06-03 14:50:35 +02:00
smoogipooo
1ed6648400
Update framework.
2017-06-03 18:19:21 +09:00
smoogipooo
e414e44428
Drastically improve mania gameplay loading time.
2017-06-03 18:18:58 +09:00
smoogipooo
d66f114b5b
Properly set starting lifetime for mania hit objects.
2017-06-03 18:18:25 +09:00
Dean Herbert
edead2ad3a
Add settings for toggling raw input and adjusting sensitivity
2017-06-02 20:24:18 +09:00
Dan Balasescu
43f73c298f
Merge branch 'master' into timingchange-rework
2017-06-02 20:19:23 +09:00
smoogipooo
7022c8d496
Move timing change stuff to osu.Game project.
2017-06-02 20:17:44 +09:00
smoogipooo
e5720b9477
CI fixes.
2017-06-02 19:53:30 +09:00
smoogipooo
d6e49b94ec
Add comment.
2017-06-02 19:36:47 +09:00
smoogipooo
c7dcb54d45
Simplify gravity.
2017-06-02 19:34:55 +09:00
smoogipooo
a4cd409835
Super huge abstraction changes to (hopefully) make this TimingChangeContainer usable for non-mania rulesets.
...
Also includes commenting improvements/fixes.
2017-06-02 19:27:22 +09:00
smoogipooo
186fecca82
Add missing license headers.
2017-06-02 18:20:14 +09:00
smoogipooo
1d3f5d8649
CI fixes.
2017-06-02 18:19:21 +09:00
smoogipooo
97dd80b874
Make life time set after children are updated (for now).
2017-06-02 18:11:36 +09:00
smoogipooo
264bf17bc2
Significantly reduce test case time.
2017-06-02 18:11:06 +09:00
smoogipooo
a96c259a8e
Fix up test case.
2017-06-02 18:07:45 +09:00
