1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 16:25:32 +08:00
Commit Graph

504 Commits

Author SHA1 Message Date
smoogipoo
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
Joehu
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
Dean Herbert
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
830ddbc2de Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-13 12:49:52 +09:00
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-12 00:22:47 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
smoogipoo
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
smoogipoo
53a39e9142 Merge remote-tracking branch 'origin/master' into audio-refactor-update 2019-06-04 10:50:33 +09:00
David Zhao
465aa4e0f6 Prevent idle state from being updated incorrectly 2019-05-31 14:06:18 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dean Herbert
e93fea7dc3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-18 19:20:44 +09:00
Dean Herbert
958598d13b Fix crash on switching from main menu to gameplay too fast 2019-05-15 19:39:36 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +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
12b6bc48bd Use .With() wherever possible 2019-04-17 17:24:09 +09:00
smoogipoo
09568be270 Merge remote-tracking branch 'origin/master' into facade-container
# Conflicts:
#	osu.Game/Screens/Play/PlayerLoader.cs
2019-04-17 17:17:33 +09:00
smoogipoo
897bfa60db Fix tracking position during 150ms state change delay 2019-04-17 17:05:35 +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
David Zhao
8a01995668 Remove need for tracking bool and backing logo 2019-04-08 16:14:41 +09:00
David Zhao
a690302d00 Apply reviews 2019-04-08 15:24:09 +09:00
Lucas A
3f2e6a9376 Allow loginOverlay to be null if there's no cached instance in DI (for testing cases) 2019-04-06 18:52:30 +02:00
Lucas A
394f14965b Make appveyor happy with whitespaces 2019-04-06 18:23:56 +02:00
Lucas A
59410dbe3b Open login overlay when notification asking for signing in to play multi is clicked 2019-04-06 18:05:13 +02:00
Dean Herbert
46ecaf3d6c
Merge branch 'master' into facade-container 2019-04-05 21:14:21 +09:00
David Zhao
0208526837 Fix button system visual issue 2019-04-05 18:21:54 +09:00
David Zhao
b1d74e57e5 Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size 2019-04-05 13:56:08 +09:00
David Zhao
7047f305a1 Apply reviews, add safety for multiple facades 2019-04-05 12:02:47 +09:00
David Zhao
15b2b6af7d Clean up remaining assignments of logo relativePositionAxes 2019-04-04 11:28:36 +09:00
David Zhao
8a40b27e8f Remove need for logo relativePositionAxes none 2019-04-03 20:32:53 +09:00
David Zhao
2ed945605e Fix Axes.None requirement for FacadeContainer 2019-04-03 19:57:22 +09:00
Dean Herbert
1ef2a4c46f Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-04-03 16:23:33 +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
smoogipoo
d8af5e1c5a Update in-line with drawnode changes 2019-04-02 11:56:22 +09:00
David Zhao
020be50f03 Merge remote-tracking branch 'upstream/master' into facade-container 2019-04-02 11:28:44 +09:00
Dean Herbert
2b3c70b2d2 Refactor with constants and better method names 2019-04-01 13:13:56 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
LeNitrous
698e38c4e0 make menu flashes and visualisation colourable by skin 2019-03-31 20:10:44 +08:00
David Zhao
f066bd1138 Adjust facade scale now that the size is different 2019-03-28 16:35:15 +09:00
David Zhao
bfe44eb33d Remove SizeForFlow magic number 2019-03-28 15:40:58 +09:00
David Zhao
9b047d9b90 Add back menu logo transform 2019-03-28 12:00:50 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
David Zhao
ca7a20585d Apply reviews, delete playerloader test 2019-03-27 17:28:53 +09:00
David Zhao
efeed71517 Add comment 2019-03-27 11:37:16 +09:00