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

166 Commits

Author SHA1 Message Date
Dean Herbert 184403c7e1
Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +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
Dan Balasescu d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-08 12:43:57 +09:00
smoogipoo 04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00
smoogipoo e430b8a640 Merge remote-tracking branch 'nekodex/master' into drawnode-changes 2019-03-07 18:15:12 +09:00
Dean Herbert 7aa30ca3f6 Change method of cursor creation 2019-03-06 17:41:54 +09:00
Dean Herbert 18826b3a59 Adjust cursor scale for its new surroundings 2019-03-06 17:41:54 +09:00
Dean Herbert acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
Dean Herbert 5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
Dean Herbert fc0b297232 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-05 18:06:24 +09:00
smoogipoo 78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings 
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
 2019-03-05 13:25:03 +09:00
smoogipoo bf8360636a Adjust drawnodes to use the new shared data structure 2019-03-01 17:25:15 +09:00
Dean Herbert 2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo c13a5184f3 Add more explanation 2019-02-27 16:35:11 +09:00
smoogipoo 32bf940aa5 Adjust comment for readability 2019-02-27 15:43:20 +09:00
smoogipoo a07d797d75 Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization 2019-02-27 12:08:43 +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
Dean Herbert c96a2ac853 Fix non-conforming filename 2019-02-20 21:08:52 +09:00
Dan Balasescu c9c8cccd68
Merge branch 'master' into use-lifetime-optimization 2019-02-18 15:22:34 +09:00
Dean Herbert ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
ekrctb 504e79b968 Merge branch 'master' into use-lifetime-optimization 2019-01-29 12:15:02 +09:00
Unknown 4a916b2dee replace license headers with new ones 2019-01-25 11:17:48 +01:00
Unknown 8ddff673b7 revert previous rename and rename ruleset specific classes instead 2019-01-25 11:14:37 +01:00