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

192 Commits

Author SHA1 Message Date
Dean Herbert 00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Dean Herbert 609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
smoogipoo 2b768bef96 Make CursorTrail use VertexBatch 2019-06-10 20:29:01 +09:00
Dean Herbert ff6943e170
Merge branch 'master' into fix-cursor 2019-06-07 10:43:21 +09:00
David Zhao e2118299e9 update comment 2019-06-07 10:36:36 +09:00
David Zhao ac9a3e54a6 Fix cursor issue with stopped gameplay clock 2019-06-06 18:12:59 +09:00
smoogipoo c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
smoogipoo cbf662eb56 Remove redundant else statement 2019-05-15 10:55:02 +09:00
Alten 37ec722a1d Shorten code 2019-05-14 16:18:46 -04:00
Alten ad5ad8ccb5 Fix hard crash 2019-05-13 23:29:24 -04: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 db75516e79
Merge branch 'master' into fix-lead-in-issues 2019-04-27 21:01:21 +09:00
Dean Herbert 27c1c368ac Remove unused using 2019-04-27 20:42:07 +09:00
Dean Herbert d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
Dean Herbert e69963e60e Ensure there is enough time before the first object in osu! (roughly following osu-stable specs) 2019-04-24 15:28:14 +09:00
smoogipoo 0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo 0603ed9ab7 Fix post-merge errors 2019-04-09 16:27:10 +09:00
smoogipoo c584967eb1 Remove mods from workingbeatmap 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 9802d8ab11
Rename setting 2019-04-04 17:18:53 +09:00
Dean Herbert 109f577b59 Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail 2019-04-04 17:09:38 +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
Dean Herbert 184403c7e1
Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +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
Dean Herbert 42eaabe24c Fix editor blueprints being misplaced 
Regressed with PlayfieldAdjustmentContainer changes.
 2019-03-31 01:29:37 +09:00
Dean Herbert 6949c233bf Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 15:02:12 +09:00
Dean Herbert 14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
Dean Herbert 1e369628a5 Fix incorrect type specification 2019-03-29 11:38:45 +09:00
Dean Herbert 785433bb74
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
Dean Herbert 7cfc2f7dcb Add back adjustment container 2019-03-26 17:11:14 +09:00
Dean Herbert dde7788c44 Merge branch 'universal-playfield-adjust' into resume-cursor-2 2019-03-26 13:58:48 +09:00
Dean Herbert 2951d3e0e4 Apply CI fixes 2019-03-26 13:50:30 +09:00
Dean Herbert fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
Dean Herbert ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert 82140c38fc Apply CI fixes 2019-03-25 22:00:33 +09:00
Dean Herbert a23dfb58ad Add base cursor class to retrieve true visibility state 2019-03-25 20:31:55 +09:00
Dean Herbert 9588944048 Fix multiple cursors appearing 2019-03-25 20:31:55 +09:00
Dean Herbert c79d187a89 Add final osu! resume screen implementation 2019-03-25 20:31:55 +09:00
Dean Herbert 38e481686f Make PlayfieldAdjustmentContainer universal 2019-03-25 20:31:55 +09:00
Dean Herbert 650a5c993a Add test 2019-03-25 20:31:55 +09:00
Dean Herbert 8ad4009c33 osu! resume overlay 2019-03-25 20:31:55 +09:00
Dean Herbert bc16a82494 Move osu! cursor to its own class 2019-03-25 14:19:38 +09:00
Dean Herbert 9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
Dean Herbert 7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
Dean Herbert baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert 68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
Dean Herbert 2c98ba1c0c Split out consumption and creation into two separate code paths 2019-03-08 14:59:45 +09:00
Dean Herbert 3ccc76e18f Merge remote-tracking branch 'upstream/master' into cursor-in-playfield 2019-03-08 14:50:46 +09:00