RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,557 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

277 Commits

Author SHA1 Message Date
Dean Herbert b225b2eb39 Rename to IsUserPaused 2019-07-11 00:18:19 +09:00
Desconocidosmh 2546f647be Completely change the way we fix the bug 2019-07-09 11:32:49 +02:00
Desconocidosmh 39f04e497d Add UserRequestedPause 2019-07-08 11:24:06 +02:00
Dean Herbert c34f6180e6
Merge branch 'master' into generic-download-model-manager 2019-06-26 20:37:56 +09:00
Dean Herbert 2707a7179e Fix MusiController holding references to beatmaps while inactive 2019-06-26 13:18:03 +09:00
Dean Herbert 9e1cb90dd8 Remove existing argument for ItemAdded event 
For all usages, it looks like this was unnecessary.
 2019-06-26 11:40:41 +09:00
Dean Herbert f2200594c9 Remove necessity for MusicController to be always visible 2019-06-20 23:40:25 +09:00
Dean Herbert 15b9b53d35 Fix IconButtons not being scaled correctly 2019-06-14 13:40:32 +09:00
Dean Herbert 609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dean Herbert a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
smoogipoo d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections 
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
 2019-05-07 13:20:17 +09:00
Dean Herbert d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo 0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
smoogipoo 0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo 4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
smoogipoo 772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability 
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
 2019-04-08 23:01:12 +09:00
Dean Herbert f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert 612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert 95bf0b9ed6 Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset 2019-03-29 13:57:02 +09:00
Joehu bdb39a79a9 Fix offset of music controller when toolbar is hidden 2019-03-27 20:27:26 -07:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dan Balasescu fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
smoogipoo 1006c539be Fix looping not being checked 2019-02-27 17:03:09 +09:00
smoogipoo 30815ace62 Fix crossthread operations due to Track.Completed 2019-02-27 16:52:34 +09:00
Dean Herbert 56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
Dean Herbert 2fbb0b4e6f Don't use `this` 2019-02-25 19:34:03 +09:00
Dean Herbert ed10024b22 Fix some formatting / variable naming 2019-02-25 19:29:09 +09:00
Dean Herbert 80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Roman Kapustin 8b4aa708fa Resolve merge conflict 2019-02-22 23:04:45 +03:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo 0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage 
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
 2019-02-20 15:04:08 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Roman Kapustin 71efbcf603 Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure 2019-02-03 16:14:04 +03:00
Dean Herbert ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo a88b69ec43 Notify of existing imports 2018-11-28 20:19:35 +09:00
Dean Herbert 61fdfe39fd Add comment 2018-11-22 19:21:32 +09:00
smoogipoo 5caa67d735 Hide playlist when MusicController is hidden 2018-11-22 12:12:34 +09:00
Dean Herbert 7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
smoogipoo 5ad96afea0 Fix crashes when importing/deleting from model managers 2018-11-20 18:09:23 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Roman Kapustin c4fc87b69a Move to next track on Completed event 2018-11-17 15:39:40 +03:00
Dean Herbert b9278b3488 Fix brackets 2018-11-14 12:05:07 +09:00
Dean Herbert c77412992e Merge conditionals 2018-11-14 11:53:34 +09:00