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

15062 Commits

Author SHA1 Message Date
smoogipoo aff5fa6169 Update with osu!-side dropdown changes 2018-11-14 18:02:38 +09:00
Dan Balasescu 4fbad65e3d
Merge pull request #2371 from miterosan/Private_Messages 
Add framework for private messaging support
 2018-11-14 15:43:46 +09:00
Dean Herbert fb22fc11f6 Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-14 13:59:17 +09:00
Dean Herbert 9a9d5e60af More refactors 2018-11-14 13:59:02 +09:00
Dean Herbert 5c66547c18
Merge pull request #3709 from smoogipoo/scrollalgorithm-timeat 
Implement IScrollAlgorithm.TimeAt()
 2018-11-14 13:50:48 +09:00
Dean Herbert 34973a3e9f
Merge branch 'master' into scrollalgorithm-timeat 2018-11-14 13:32:16 +09:00
Dean Herbert 1b936dfc17
Merge pull request #3706 from smoogipoo/no-drawable-speedchangevis 
Make scroll algorithms not tied to drawable hitobjects
 2018-11-14 13:31:35 +09:00
Dean Herbert 8d59b7299f
Merge branch 'master' into no-drawable-speedchangevis 2018-11-14 13:22:01 +09:00
Dean Herbert c4769f6802 Refactors 2018-11-14 13:19:51 +09:00
Dean Herbert 396a5b3cd0
Merge branch 'master' into Private_Messages 2018-11-14 12:49:54 +09:00
Dean Herbert 059f1d9bcb
Merge pull request #3671 from gotopie/hide-seekbar-with-no-song 
Hide seekbar when no song is playing
 2018-11-14 12:16:42 +09:00
Dean Herbert b9278b3488 Fix brackets 2018-11-14 12:05:07 +09:00
Dean Herbert 161d476091 Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song 2018-11-14 11:53:43 +09:00
Dean Herbert c77412992e Merge conditionals 2018-11-14 11:53:34 +09:00
Dean Herbert 3caf0cb0d9
Merge branch 'master' into no-drawable-speedchangevis 2018-11-13 19:42:04 +09:00
Dean Herbert 7a918b06d9
Merge pull request #3704 from smoogipoo/immutable-sliderpath 
Make SliderPath immutable
 2018-11-13 18:27:36 +09:00
Dean Herbert e7d984415b
Merge branch 'master' into immutable-sliderpath 2018-11-13 18:06:14 +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
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
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 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 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
Dan Balasescu 0833ba2692
Merge pull request #3697 from peppy/fix-compose-mode 
Fix compose mode not working
 2018-11-09 12:33:17 +09:00
Dean Herbert 4783df1d4b Fix compose mode not working 2018-11-09 11:36:06 +09:00
Dean Herbert 00749ffcec
Merge pull request #3693 from smoogipoo/manual-position-adjustments 
Let selection blueprints handle positional adjustments
 2018-11-09 11:22:13 +09:00
Dean Herbert 27549586e6
Merge branch 'master' into manual-position-adjustments 2018-11-09 10:53:41 +09:00
smoogipoo 33056b8098 Adjust namespaces 2018-11-08 14:04:21 +09:00
smoogipoo f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo 2f87f267a3 Fix height being set instead of width 2018-11-08 14:04:20 +09:00
smoogipoo 195f82fa96 Give visualiser methods range+length params again 2018-11-08 14:04:20 +09:00
smoogipoo f41bfd14ca Add some xmldocs 2018-11-08 14:04:20 +09:00