1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 09:27:34 +08:00
Commit Graph

5357 Commits

Author SHA1 Message Date
Dean Herbert
5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09: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
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
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
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
Thomas Müller
b4b3ba0787 Fix incorrect initial movement of tooltips 2017-06-05 13:07:38 +02: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
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
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