|
|
9f1efeb19d
|
Move keybind to last in enum
|
2018-05-07 15:41:14 +09:00 |
|
|
|
30a3f4f29f
|
Fix not being able to convert beatmaps with 0 hitobjects
|
2018-05-07 15:27:45 +09:00 |
|
|
|
1be1b10059
|
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
|
2018-05-07 13:32:19 +08:00 |
|
|
|
68441f1ef0
|
Output ruleset instantiation info
|
2018-05-07 14:28:30 +09:00 |
|
|
|
6867886f4c
|
Give conversion-tested beatmaps a ruleset
|
2018-05-07 14:04:37 +09:00 |
|
|
|
7ee8228a37
|
Fix testcases
|
2018-05-07 13:28:01 +09:00 |
|
|
|
ad2c2a5fe6
|
Restore star difficulty calculation
|
2018-05-07 12:25:21 +09:00 |
|
|
|
268c14813b
|
Fix resharper warnings
|
2018-05-07 11:38:41 +09:00 |
|
|
|
e20323b5f6
|
Trim whitespace
|
2018-05-07 11:23:29 +09:00 |
|
|
|
794418432f
|
Fix incorrect method name
|
2018-05-07 11:22:25 +09:00 |
|
|
|
db3e48c194
|
Rename GetBeatmap() to GetPlayableBeatmap()
|
2018-05-07 10:40:30 +09:00 |
|
|
|
9128e64c9a
|
Rename OriginalBeatmap back to Beatmap
|
2018-05-07 10:29:38 +09:00 |
|
|
|
7e83c75888
|
Add xmldoc
|
2018-05-07 10:23:32 +09:00 |
|
|
|
b68ee39136
|
Reword beatmap conversion error
|
2018-05-07 10:18:47 +09:00 |
|
|
|
4ecdea8b2e
|
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
|
2018-05-07 10:17:54 +09:00 |
|
|
|
27c8591d48
|
Fix reference to old name
|
2018-05-07 10:07:50 +09:00 |
|
|
|
77e661489d
|
Merge branch 'i-beatmap' into beatmap-conversion-rework
|
2018-05-07 10:00:24 +09:00 |
|
|
|
20509b1cc2
|
Fix non-IBeatmap usage
|
2018-05-07 09:59:45 +09:00 |
|
|
|
1aefd71b65
|
Merge remote-tracking branch 'origin/master' into i-beatmap
|
2018-05-07 09:58:53 +09:00 |
|
|
|
f3aa9269ff
|
Fix mania-specific beatmap conversion
|
2018-05-07 09:17:12 +09:00 |
|
|
|
1bbeb6d70e
|
Make the sinceId readonly
|
2018-05-06 19:54:41 +02:00 |
|
|
|
ba5861b527
|
Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
|
2018-05-06 19:45:33 +02:00 |
|
|
|
c4e45e30ef
|
Solving conflict
|
2018-05-06 13:18:12 +02:00 |
|
|
|
d36d9643eb
|
Missed one white space.. I guess my editor wasn't properly configured
for this file
|
2018-05-06 13:09:46 +02:00 |
|
|
|
af85102277
|
Should be ok now
|
2018-05-06 13:04:20 +02:00 |
|
|
|
008daf9a07
|
White space trimmed
|
2018-05-06 12:57:52 +02:00 |
|
|
|
095f6e1530
|
Code sanity
|
2018-05-06 12:49:15 +02:00 |
|
|
|
393c01ba90
|
Made the changes requested
|
2018-05-06 12:38:25 +02:00 |
|
|
|
1c1d58e2cb
|
Merge branch 'master' into osu-hd-setting
|
2018-05-06 12:23:12 +02:00 |
|
|
|
b08b24b6da
|
Introduce OsuScreen.AllowBackButton property
|
2018-05-04 21:18:48 +03:00 |
|
|
|
b0e556d83f
|
Actualize QuitButton visual test
|
2018-05-04 00:01:00 +03:00 |
|
|
|
39db1e8cbb
|
Rename HoldToQuit to QuitButton
|
2018-05-03 23:50:30 +03:00 |
|
|
|
f8630115d6
|
Do not expose HoldToQuit.HoldToQuitButton
|
2018-05-03 23:29:58 +03:00 |
|
|
|
33e2b91ccc
|
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
|
2018-05-03 22:59:49 +03:00 |
|
|
|
89db7f81cb
|
Selecting a mod now triggers on mouseup
|
2018-05-02 17:11:55 +03:00 |
|
|
|
482ae2db87
|
Unify naming
|
2018-05-02 19:42:03 +09:00 |
|
|
|
d4ada3000c
|
Add keybind to disable mouse buttons
|
2018-05-02 19:37:47 +09:00 |
|
|
|
2d6b2d10f7
|
Use bindable transforms
|
2018-05-02 18:26:23 +09:00 |
|
|
|
420e50b6da
|
Merge pull request #2479 from peppy/add-net471-dep
Add squirrel dependency on net471
|
2018-05-02 17:00:02 +08:00 |
|
|
|
6ecb09431f
|
Update squirrel path
|
2018-05-02 16:37:44 +08:00 |
|
|
|
e92166b40f
|
Update csproj defaults
|
2018-05-02 16:33:48 +08:00 |
|
|
|
b37acf7510
|
Update squirrel version for net471 prereq support
|
2018-05-02 16:23:48 +08:00 |
|
|
|
8b99a3b8e6
|
Add squirrel dependency on net471
|
2018-05-02 16:23:48 +08:00 |
|
|
|
036e62e2b1
|
Merge pull request #2481 from smoogipoo/revert-useroverlay-change
Revert breaking UserProfileOverlay change
|
2018-05-02 16:19:37 +08:00 |
|
|
|
9f9447d441
|
Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"
This reverts commit 67793845b0.
|
2018-05-02 16:39:00 +09:00 |
|
|
|
084504134e
|
Merge pull request #2450 from tgi74/replay_ruleset
Fix replays being played in the selected ruleset
|
2018-05-02 15:06:24 +08:00 |
|
|
|
9f327525a7
|
Merge branch 'master' into replay_ruleset
|
2018-05-02 14:57:02 +08:00 |
|
|
|
6fe09ee544
|
Merge pull request #2458 from 4ppleCracker/patch-1
Use more inheritance for UserStatus
|
2018-05-02 14:56:46 +08:00 |
|
|
|
0ad049976b
|
Merge branch 'master' into patch-1
|
2018-05-02 14:45:30 +08:00 |
|
|
|
67793845b0
|
Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed
Stop audio playing from UserProfileOverlay when hiding
|
2018-05-02 14:02:49 +08:00 |
|
