Dean Herbert
a07f6801da
Merge remote-tracking branch 'upstream/master' into timingchange-rework
2017-06-07 18:39:27 +09:00
Dean Herbert
1de296747f
Merge remote-tracking branch 'upstream/master' into social-browser
2017-06-07 17:38:06 +09:00
Dan Balasescu
f52f8326dd
Merge pull request #911 from peppy/update-framework
...
Bring framework up-to-date
2017-06-07 15:42:42 +09:00
Dean Herbert
5f537780cf
Bring framework up-to-date
2017-06-07 15:32:50 +09:00
Péter Nemes
1f311cca06
Fix cref in comment.
2017-06-06 19:09:26 +02:00
Péter Nemes
93f654a539
More docs, better docs.
2017-06-06 18:59:46 +02:00
Péter Nemes
ce0d70d651
Whitespace fix.
2017-06-06 15:52:33 +02:00
Dan Balasescu
a010e6b8db
Merge pull request #910 from peppy/warnings-as-errors
...
Treat inspectcode warnings as errors (CI)
2017-06-06 22:40:38 +09:00
Péter Nemes
01585027b1
OsuDifficultyBeatmap enumeration logic made clearer, more documentation added.
2017-06-06 15:39:37 +02:00
Dean Herbert
e727195187
Treat inspectcode warnings as errors (CI)
...
There are many instances we accidentally merge pull requests with outstanding warnings, as the fact warnings exists is not made obvious. This forces all `inspectcode` warnings to an error level.
2017-06-06 22:06:43 +09:00
Dean Herbert
fc43445063
Merge pull request #906 from Tom94/chat-focus
...
Do not release focus of the chat text box when sending a message
2017-06-06 19:24:47 +09:00
Dean Herbert
78fc36904e
Merge branch 'master' into chat-focus
2017-06-06 19:13:30 +09:00
smoogipooo
5104e65bcd
Make hold notes utilize RelativeChildOffset for tick positionings.
2017-06-06 15:57:30 +09:00
smoogipooo
e3d10fc4d3
Update with more framework changes.
2017-06-06 15:52:35 +09:00
Dan Balasescu
7ee62cc454
Merge pull request #902 from peppy/simplify-hud-overlay
...
Remove StandardHUDOverlay
2017-06-06 14:54:03 +09:00
Dan Balasescu
eb545d907d
Merge branch 'master' into simplify-hud-overlay
2017-06-06 14:31:54 +09:00
Dan Balasescu
75165857d1
Merge pull request #909 from peppy/update-resources-again
...
Update resource again (fixes filesize increase)
2017-06-06 14:23:59 +09:00
Dean Herbert
141c53c506
Update resource again (fixes filesize increase)
2017-06-06 13:54:16 +09:00
Péter Nemes
afb4443763
Capitalised protected members, added readonly modifiers.
2017-06-06 01:08:34 +02:00
Péter Nemes
f9441a7419
Fix typo and whitespace.
2017-06-06 00:07:00 +02:00
Péter Nemes
c624712f2f
Refactor ppv2 to allow integration of pp+ features.
2017-06-05 23:45:22 +02:00
Thomas Müller
fac16bdebd
Do not release focus of the chat text box when sending a message
2017-06-05 18:07:28 +02:00
Dean Herbert
2fbad58866
Merge pull request #861 from DrabWeb/channel-selection
...
Channel selection overlay
2017-06-05 23:19:02 +09:00
Dean Herbert
6b7e18a1e3
Fix not being able to change channels when channel select dialog is up
2017-06-05 23:12:39 +09:00
Dean Herbert
d9106c4e30
Temporarily disable inspection
2017-06-05 21:58:13 +09:00
Dean Herbert
57aad1311d
Merge branch 'master' into channel-selection
2017-06-05 21:46:28 +09:00
Dean Herbert
cbd0e8e375
Merge pull request #904 from Tom94/smoothly-moving-tooltips
...
Make osu tooltips move smoothly
2017-06-05 21:44:45 +09:00
Dean Herbert
dcee9dd299
Merge branch 'master' into smoothly-moving-tooltips
2017-06-05 21:11:50 +09:00
Dean Herbert
d2294cd294
Merge branch 'master' into simplify-hud-overlay
2017-06-05 21:00:04 +09:00
Dean Herbert
b9c99950da
Merge pull request #903 from peppy/update-resource
...
Update resources
2017-06-05 20:59:44 +09:00
Dean Herbert
c85a0223b0
Only instantly move tooltip is we are not visible
2017-06-05 20:52:46 +09:00
Dan Balasescu
2ca2c1e020
Merge branch 'master' into update-resource
2017-06-05 20:45:15 +09:00
Dean Herbert
04f0b5204a
Merge branch 'master' into smoothly-moving-tooltips
2017-06-05 20:42:08 +09:00
Thomas Müller
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
Dean Herbert
09e075e3fb
Allow adjusting mouse sensitivity at 0.01 increments
2017-06-05 20:22:39 +09:00
Dean Herbert
55d8b8b5f5
Merge branch 'master' into raw-input-sensitivity
2017-06-05 20:16:40 +09:00
smoogipooo
d2ced2ea79
Update with framework changes.
2017-06-05 20:16:37 +09:00
Thomas Müller
b4b3ba0787
Fix incorrect initial movement of tooltips
2017-06-05 13:07:38 +02:00
smoogipooo
4307242bb6
Update with framework changes.
2017-06-05 20:06:46 +09:00
Thomas Müller
e92c1210d1
Make osu tooltips move smoothly
2017-06-05 12:59:29 +02:00
Dean Herbert
a7c7618aa0
Update resources
2017-06-05 19:24:34 +09:00
Dean Herbert
bf971f6613
Merge branch 'master' into social-browser
2017-06-05 19:16:28 +09:00
EVAST9919
78500eec21
Applied suggested changes
2017-06-05 12:24:28 +03: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
EVAST9919
6b9d5afc4b
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
2017-06-05 11:51:45 +03: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
