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 |
|
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
|
2f5668f4e7
|
Fix remaining framework changes
|
2019-03-29 00:29:14 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
9a11a08acc
|
Update textbox usages
|
2019-03-23 02:00:27 +09:00 |
|
Dan Balasescu
|
fd147dae21
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-03-05 17:25:13 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
Dean Herbert
|
80737b9ef8
|
Remove "silent" parameter; consolidate import logic
|
2019-02-25 18:24:06 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
Dean Herbert
|
452caabd40
|
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
|
2019-02-22 17:06:49 +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 |
|
Dean Herbert
|
e2e615cc5c
|
Merge branch 'master' into leased-bindables-dont-work
|
2019-02-11 16:30:12 +09:00 |
|
Roman Kapustin
|
4c866e7940
|
Add PlaylistItemHandle.HandlePositionalInput override
|
2019-02-01 22:37:27 +03:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
Dean Herbert
|
260034a80e
|
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
|
2019-01-25 19:20:29 +09:00 |
|
Dean Herbert
|
82d944dc89
|
Fix textbox colours not always being set corrrectly
|
2019-01-25 19:20:29 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
smoogipoo
|
450e4cd223
|
Hook up API
|
2018-12-12 19:04:11 +09:00 |
|
smoogipoo
|
9af2b49c01
|
Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-12-12 16:22:14 +09:00 |
|
smoogipoo
|
41c7d10dff
|
Fix compilation issues (+ use updated framework)
|
2018-12-10 13:48:05 +09:00 |
|
Dean Herbert
|
2a2561e5c8
|
Update framework and otehr nuget packages
|
2018-12-07 19:39:54 +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
|
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 |
|
smoogipoo
|
aff5fa6169
|
Update with osu!-side dropdown changes
|
2018-11-14 18:02:38 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
smoogipoo
|
28f31540c4
|
Apply changes in-line with framework localisation changes
|
2018-09-19 14:07:46 +09:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
smoogipoo
|
ff60f69f47
|
Explicitly construct local beatmaps rather than using GetBoundCopy
|
2018-06-06 20:19:30 +09:00 |
|
smoogipoo
|
72cc53aded
|
Rename GameBeatmap -> BindableBeatmap
|
2018-06-06 20:16:20 +09:00 |
|
smoogipoo
|
a3470f9ec3
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
|
2018-05-28 18:01:15 +09:00 |
|
Dean Herbert
|
bcdbd97da9
|
Merge branch 'master' into fix-playlist-pause
|
2018-05-27 11:00:50 +09:00 |
|
Dean Herbert
|
568d4882c6
|
Remove unnecessary null coalesce
|
2018-05-25 11:00:56 +09:00 |
|
smoogipoo
|
fb78854485
|
Fix audio playback getting paused if playlist changes beatmap
|
2018-05-23 19:41:13 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
smoogipoo
|
f894d73501
|
Fix possible MusicController nullref
|
2018-05-23 14:36:09 +09:00 |
|
smoogipoo
|
6eb7590ab0
|
Make MusicController handle all movement to previous/next tracks
|
2018-05-14 17:42:01 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|