h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 11:02:55 +08:00
Code Issues Releases Wiki Activity
15,249 Commits 4 Branches 661 Tags 361 MiB
e3e92f4302
Commit Graph

15249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
e7d984415b
Merge branch 'master' into immutable-sliderpath 2018-11-13 18:06:14 +09:00
Dean Herbert
93fe3ae333
Merge branch 'master' into tournament-tools 2018-11-13 17:49:12 +09:00
Dean Herbert
72ae22b0c4 Add support for creating new PM conversations 2018-11-13 17:24:11 +09:00
Dean Herbert
82ebc74eee Fix testcase 2018-11-13 15:36:36 +09:00
Dean Herbert
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
smoogipoo
6d43baf4bf Make show/hide only invoked once each 2018-11-13 13:12:11 +09:00
smoogipoo
819cba31ce Fix spinners not starting placement with the first click 2018-11-13 12:52:44 +09:00
smoogipoo
fbc20d2d4d Hide placement when cursor is not in the playfield 2018-11-13 12:52:04 +09:00
Dean Herbert
8b9f7f6691
Merge branch 'master' into Private_Messages 2018-11-12 20:43:10 +09:00
Dean Herbert
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
Dean Herbert
302196e985
Merge pull request #3705 from peppy/update-framework 
Update framework and resources
 2018-11-12 19:58:03 +09:00
smoogipoo
e302d5d005 Separate NoteSelectionBlueprint into a note piece 2018-11-12 17:59:39 +09:00
Dan Balasescu
e885c03cfa
Merge branch 'master' into update-framework 2018-11-12 17:45:16 +09:00
smoogipoo
b9b20607af Add IScrollAlgorithm.TimeAt() 2018-11-12 17:43:22 +09:00
Dean Herbert
27a794f1d5
Merge pull request #3684 from peppy/better-rider-ignore 
Change .idea ignore rules to not ignore run configurations
 2018-11-12 17:41:31 +09:00
smoogipoo
2e0e1befe9 Add selection mask testcases 
# Conflicts:
#	osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
 2018-11-12 17:40:09 +09:00
smoogipoo
8be6e351f5 Merge branch 'fix-mania-selections' into add-mania-selection-testcase 2018-11-12 17:39:58 +09:00
smoogipoo
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
e7969ecec7 Move ScrollAlgorithm inside IScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
54668a0dec Simplify construction of ScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
48486895ba Remove unused code 2018-11-12 17:34:35 +09:00
smoogipoo
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
Dan Balasescu
5051263106
Merge branch 'master' into better-rider-ignore 2018-11-12 17:19:39 +09:00
smoogipoo
e3c60c2f96 Cleanups 2018-11-12 17:18:58 +09:00
smoogipoo
f3ba429701 Make sure control points is internally initialised 2018-11-12 17:14:06 +09:00
Dean Herbert
1101e161d9 Update framework and resources 2018-11-12 17:02:46 +09:00
smoogipoo
f4fd6189f8 Implement IEquatable 2018-11-12 16:53:30 +09:00
smoogipoo
0220ed21b0 Ignore distance for json serialisation 2018-11-12 16:38:49 +09:00
smoogipoo
0e92b385f0 Define default json deserialisation constructor 2018-11-12 16:38:33 +09:00
smoogipoo
8ad9b6a02a Safety for default(SliderPath) 2018-11-12 16:38:14 +09:00
smoogipoo
d594ce3530 Revert "Make SliderPath.ControlPoints read-only" 
This reverts commit 3b88d94793.

# Conflicts:
#	osu.Game/Rulesets/Objects/SliderPath.cs
 2018-11-12 16:20:38 +09:00
smoogipoo
77d16aa968 Add xmldocs 2018-11-12 14:16:21 +09:00
smoogipoo
4eef1134a6 Re-order file 2018-11-12 14:08:36 +09:00
smoogipoo
3aba462e52 Make Path.Distance a property again 2018-11-12 14:07:48 +09:00
smoogipoo
3b88d94793 Make SliderPath.ControlPoints read-only 2018-11-12 14:03:54 +09:00
smoogipoo
51e4feeda7 Adjust to new path structure 2018-11-12 13:55:14 +09:00
smoogipoo
54ab256c8e Instantiate a new path rather than setting properties on it 
# Conflicts:
#	osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
#	osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
#	osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/SliderPath.cs
 2018-11-12 13:50:19 +09:00
Dean Herbert
d7a086be83 Fix regression in song bar display logic 2018-11-12 01:25:31 +09:00
Dean Herbert
00731560cb Add CS display 2018-11-12 01:25:22 +09:00
Dean Herbert
123629ba9e Flash panels on select 2018-11-11 10:48:57 +09:00
Dean Herbert
be3904b647 Add win screen 2018-11-11 10:39:04 +09:00
Dean Herbert
eabcef3e12 Add schedule screen 2018-11-11 10:13:17 +09:00
Dean Herbert
949cf98d1a Adjust gameplay position ever so slightly 2018-11-11 09:23:54 +09:00
Dean Herbert
e3576572a3 Fix warmup state, automate more 2018-11-11 09:22:57 +09:00
Dean Herbert
2683b161d5 Fix missing logo 2018-11-11 09:16:46 +09:00
Dean Herbert
9c18f7a25a Fix date display 2018-11-11 09:05:36 +09:00