1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 03:52:57 +08:00
Commit Graph

16588 Commits

Author SHA1 Message Date
smoogipoo
c0fcbc283e Merge branch 'note-placement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
2018-11-26 11:47:22 +09:00
smoogipoo
56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
smoogipoo
5d6a438f98 Make selected mania hitobjects always alive 2018-11-26 11:34:25 +09:00
smoogipoo
7229559cf7 Merge remote-tracking branch 'origin/master' into mania-selection-movement 2018-11-26 10:56:54 +09:00
smoogipoo
91aa00b0e9 Add helper method to get column by position 2018-11-26 10:54:54 +09:00
smoogipoo
4ba3fa4ab6 osuTK 2018-11-26 10:44:48 +09:00
smoogipoo
4fbe28e98f Merge remote-tracking branch 'origin/master' into note-placement 2018-11-26 10:42:20 +09:00
Dean Herbert
83b040fddc
Merge pull request #3765 from 123tris/master
Correct typo in function name
2018-11-25 21:32:03 +09:00
Dean Herbert
54a10c1284
Merge branch 'master' into master 2018-11-25 20:45:18 +09:00
Dean Herbert
99fd9e0b83
Merge pull request #3768 from naoey/fix-beatmapset-overlay-double-focus
Fix BeatmapSetOverlay focusing twice when loading from API
2018-11-25 20:44:06 +09:00
naoey
c71fc0b800 Don't focus overlay again after set is fetched 2018-11-25 14:49:09 +05:30
Dean Herbert
1682a8ce0d Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-25 17:43:10 +09:00
Dan Balasescu
b5fdbe8d87
Merge branch 'master' into master 2018-11-25 01:38:19 +09:00
123tris
b2d21e4ee0 * Corrected misspelling of function in DrawableFruit.cs and refactored all of its use cases 2018-11-24 16:50:23 +01:00
Dean Herbert
0bc4a01a6b Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-24 20:03:25 +09:00
Dan Balasescu
c22ab0a529
Merge pull request #3625 from UselessToucan/external_link_warning
Show a warning prior to opening external links
2018-11-23 15:28:50 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
smoogipoo
df004d7a49 Adjust dialog text 2018-11-23 15:19:15 +09:00
smoogipoo
ac73844fe0 Fix header potentially overflowing the dialog 2018-11-23 15:19:09 +09:00
Dean Herbert
4c0c9f0aa7
Merge pull request #3761 from peppy/fix-channelmanager-cache
Fix order of ChannelManager dependency caching
2018-11-23 11:09:23 +09:00
Dean Herbert
afa547af84 Fix order of ChannelManager dependency caching 2018-11-23 11:00:17 +09:00
Dan Balasescu
91b484a643
Merge pull request #3759 from peppy/fix-editor-precise-scroll
Fix precision scroll events being handled incorrectly by editor
2018-11-23 10:34:42 +09:00
Dan Balasescu
b446a73c0c
Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
Dean Herbert
1b76e2faf5
Merge branch 'master' into fix-editor-precise-scroll 2018-11-23 09:57:35 +09:00
Dean Herbert
b77228a338
Merge pull request #3749 from peppy/fix-channel-presence
Fix channel presence being handled incorrectly
2018-11-23 08:46:35 +09:00
Dean Herbert
a4259261e3
Merge branch 'master' into fix-channel-presence 2018-11-23 08:11:46 +09:00
Dan Balasescu
2271ca5e35
Merge pull request #3758 from peppy/fix-invalid-cached
Fix leaderboard accessing drawables in a possibly invalid state
2018-11-23 00:19:52 +09:00
Dan Balasescu
2f368a32d4
Merge branch 'master' into fix-invalid-cached 2018-11-22 23:56:20 +09:00
Dan Balasescu
0ee4b1c4ac
Merge branch 'master' into fix-channel-presence 2018-11-22 21:52:16 +09:00
Dean Herbert
10047e6815 Adjust tick-based wheel control to be more correct 2018-11-22 20:13:40 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement 2018-11-22 19:44:39 +09:00
Dean Herbert
a48c26d999 Fix precision scroll events being handled incorrectly by editor 2018-11-22 19:40:44 +09:00
Dean Herbert
72dba5d7ac
Merge pull request #3755 from smoogipoo/hide-playlist-popout
Hide playlist when MusicController is hidden
2018-11-22 19:37:07 +09:00
Dean Herbert
61fdfe39fd Add comment 2018-11-22 19:21:32 +09:00
Dean Herbert
6cd69b794d Fix leaderboard accessing drawables in a possibly invalid state 2018-11-22 19:08:46 +09:00
Dean Herbert
a144e97568 Fix crash on creating two new PM channels 2018-11-22 18:27:22 +09:00
Dean Herbert
d2119f3853 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 17:35:23 +09:00
Dean Herbert
fdba2bffb9 Ensure last state is set correctly 2018-11-22 17:33:48 +09:00
Dean Herbert
17a81259d4 Fix spacing and colouring of song bar eleemnts
Also uses MM:ss instead of ssss.
2018-11-22 17:26:19 +09:00
Dean Herbert
fb05ea3de3 Fix alignment and fonts of tem intro screen 2018-11-22 16:23:44 +09:00
Dean Herbert
4e8c7a4dc0 Adjust gameplay area to match better
Also reduces size of score display to avoid hiding combos.
2018-11-22 15:42:10 +09:00
Dean Herbert
cbf82f892d Add OD display and fix "*" difficuty modifier display 2018-11-22 14:10:33 +09:00
Dean Herbert
7d3bcdfc17 Fix stats not displaying on showcase screen 2018-11-22 13:17:51 +09:00
smoogipoo
d1ec9fc294 Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence 2018-11-22 13:04:32 +09:00
smoogipoo
5caa67d735 Hide playlist when MusicController is hidden 2018-11-22 12:12:34 +09:00
Dan Balasescu
304a731d2e
Merge pull request #3754 from peppy/match-framework-inspections
Change for-loop inspection to match framework
2018-11-22 11:15:23 +09:00
Dean Herbert
bbb36198a4 Change for-loop inspection to match framework 2018-11-22 10:26:05 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
miterosan
f8809505d9 Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection
# Conflicts:
#	osu.Game/Overlays/ChatOverlay.cs
2018-11-21 23:24:07 +01:00
miterosan
4f41512265 Lowercase the references to joinedChannel and availableChannels 2018-11-21 23:21:27 +01:00