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

18092 Commits

Author SHA1 Message Date
smoogipoo 12b6bc48bd Use .With() wherever possible 2019-04-17 17:24:09 +09:00
smoogipoo c145ce2d00 Remove usings 2019-04-17 17:19:55 +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 106e77c3d7 Cleanup testcase 2019-04-17 17:15:23 +09:00
smoogipoo 897bfa60db Fix tracking position during 150ms state change delay 2019-04-17 17:05:35 +09:00
smoogipoo 4106da2430 Rename facade + cleanup usage 2019-04-17 17:05:33 +09:00
smoogipoo 3a1587fa53 Throw exception when not relatively positioned 2019-04-17 17:04:11 +09:00
smoogipoo 9f92b3a8ba Add xmldoc 2019-04-17 16:34:53 +09:00
smoogipoo 5a3d6a0258 Fix post-merge errors 2019-04-17 16:11:59 +09:00
smoogipoo ad720cedeb Merge remote-tracking branch 'origin/master' into player-mod-reinstantiation 2019-04-17 12:59:23 +09:00
Dan Balasescu a10d265a90
Merge pull request #4630 from peppy/update-framework 
Update framework
 2019-04-17 10:23:16 +09:00
Dean Herbert b684cd49e6 Update framework 2019-04-16 22:51:57 +08:00
Dean Herbert bb539af1a0
Merge branch 'master' into player-mod-reinstantiation 2019-04-16 22:35:21 +08:00
Dean Herbert 63f840fc11
Merge pull request #4624 from smoogipoo/fix-rewinding-60fps 
Fix replay rewinding not respecting 60fps playback
 2019-04-16 21:03:03 +08:00
smoogipoo ac2eabc9bf Fix replay rewinding not respecting 60fps playback 2019-04-16 17:47:00 +09:00
Lucas A 5887008fb3
Merge branch 'master' into user-status-wiring 2019-04-15 11:43:53 +02:00
Dean Herbert ed1f05333a
Merge pull request #4613 from smoogipoo/no-workingbeatmap-mods 
Remove mods from WorkingBeatmap
 2019-04-15 16:53:01 +08:00
Lucas A 361c0ec9f2 Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in 2019-04-13 13:18:44 +02:00
Lucas A 5ab278f9ea Add missing user statuses to tests 2019-04-12 23:01:11 +02:00
Lucas A da5d6cb1d4 Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap 2019-04-12 22:54:35 +02:00
Lucas A 69dda0ffd4 OsuScreens can now set a per screen user status 
which defaults to UserStatusOnline
 2019-04-12 22:36:01 +02:00
smoogipoo 1db2d49696 Fix testcases 2019-04-10 17:54:57 +09:00
smoogipoo 0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo 7845d542e3 Cache mods as array in DrawableRuleset 2019-04-10 17:20:36 +09:00
smoogipoo 85d3ff4846 Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods 
# Conflicts:
#	osu.Game/Screens/Play/GameplayClockContainer.cs
 2019-04-10 12:06:51 +09:00
smoogipoo 4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
jorolf c1db635933 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-09 20:42:39 +02:00
smoogipoo 0603ed9ab7 Fix post-merge errors 2019-04-09 16:27:10 +09:00
Dan Balasescu 67a03bbc90
Merge pull request #4583 from peppy/fix-offset-seek-handling 
Fix gameplay offset handling on seeks
 2019-04-09 15:48:52 +09:00
Dan Balasescu 3073508a23
Merge branch 'master' into fix-offset-seek-handling 2019-04-09 15:40:48 +09:00
smoogipoo aa2c97b859 Add mod reinstantiation testcase 2019-04-09 15:05:03 +09:00
smoogipoo d8ec1e73a3 Cleanup TestCasePlayerLoader 2019-04-09 13:50:54 +09:00
smoogipoo 4c571acd67 Reinstantiate mods for every player 2019-04-09 13:33:16 +09:00
Dean Herbert ca251d8fa3
Merge pull request #4612 from smoogipoo/fix-osuscreen-dependencies 
Fix OsuScreenDependencies using the incorrect parent
 2019-04-09 12:28:32 +08:00
smoogipoo 1c952e58cc Fix testcase failures 2019-04-09 13:15:48 +09:00
smoogipoo 56496d28ba Reset mods when exiting match 2019-04-09 12:59:32 +09:00
smoogipoo cbb3fdaca8 Fix various crashes due to bindable being disabled 2019-04-09 12:59:32 +09:00
smoogipoo ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
smoogipoo c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
smoogipoo ca9f172a96 Use var 2019-04-09 12:58:10 +09:00
smoogipoo 93b6cc00df Fix OsuScreenDependencies using the incorrect parent 2019-04-09 12:56:23 +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 376bed3a30 Merge branch 'facade-container' of https://github.com/nyquillerium/osu into facade-container 2019-04-08 15:24:59 +09:00
David Zhao a690302d00 Apply reviews 2019-04-08 15:24:09 +09:00
Dan Balasescu d7655bc579
Use .Value instead of cast 
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
 2019-04-08 11:22:01 +09:00
Dean Herbert f2f60f6d03
Merge pull request #4603 from Game4all/invert-login-notification-depth 
Switch NotificationOverlay and LoginOverlay depth order
 2019-04-07 21:17:36 +09:00
Lucas A e948b11756
Merge branch 'master' into invert-login-notification-depth 2019-04-07 14:03:01 +02:00
Dean Herbert 869744b1ae
Merge pull request #4596 from Ferdi265/master 
BeatmapLeaderboard: fix local scores not being sorted
 2019-04-07 20:56:03 +09:00
Ferdinand Bachmann d431ca4efc
BeatmapLeaderboard: use OrderByDescending instead of negation 
(suggested by peppy)
 2019-04-07 13:26:35 +02:00