Commit Graph

11383 Commits

Author SHA1 Message Date
1f18c08cfc Update framework 2019-04-22 19:17:58 +09:00
5fe45c9bed Merge branch 'master' into update-framework 2019-04-22 19:17:14 +09:00
ffd8268076 Fix hold for menu button's icon being incorrect (#4662)
Fix hold for menu button's icon being incorrect

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-04-22 19:16:29 +09:00
5313ba2938 Merge branch 'master' into hp-rewind 2019-04-22 19:02:41 +09:00
8fc0bf24c7 Merge branch 'master' into fix-hold-for-menu-icon 2019-04-22 18:57:43 +09:00
48e82d4b1c Fix hold for menu button's icon being incorrect 2019-04-22 18:47:28 +09:00
6856571f17 Fix incorrect seek target 2019-04-22 18:45:58 +09:00
55c5ef898d Remove delay on entering player 2019-04-22 18:29:58 +09:00
908eee9942 Fix pause tests 2019-04-22 18:29:51 +09:00
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
b3c496d72c Remove delay on entering player 2019-04-22 17:06:40 +09:00
034643b835 Fix pause tests 2019-04-22 17:06:22 +09:00
fbb4e9df04 Implement hp at base ScoreProcessor 2019-04-22 16:51:38 +09:00
4cf813dc33 Merge remote-tracking branch 'upstream/master' into update-framework 2019-04-22 11:26:29 +09:00
8ffb2f4224 Remove black box blocking some visual tests from being visible 2019-04-22 10:55:01 +09:00
732c38fa79 Update framework again 2019-04-22 10:45:56 +09:00
6502e26d09 Add draw size invalidation to ZoomableScrollContainer 2019-04-19 16:21:15 +09:00
9d6912a692 Update framework 2019-04-18 21:23:40 +08:00
2d7b3094ba Merge branch 'master' into player-mod-reinstantiation 2019-04-17 16:42:57 +08:00
12b6bc48bd Use .With() wherever possible 2019-04-17 17:24:09 +09:00
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
897bfa60db Fix tracking position during 150ms state change delay 2019-04-17 17:05:35 +09:00
4106da2430 Rename facade + cleanup usage 2019-04-17 17:05:33 +09:00
3a1587fa53 Throw exception when not relatively positioned 2019-04-17 17:04:11 +09:00
9f92b3a8ba Add xmldoc 2019-04-17 16:34:53 +09:00
5a3d6a0258 Fix post-merge errors 2019-04-17 16:11:59 +09:00
ad720cedeb Merge remote-tracking branch 'origin/master' into player-mod-reinstantiation 2019-04-17 12:59:23 +09:00
b684cd49e6 Update framework 2019-04-16 22:51:57 +08:00
bb539af1a0 Merge branch 'master' into player-mod-reinstantiation 2019-04-16 22:35:21 +08:00
ac2eabc9bf Fix replay rewinding not respecting 60fps playback 2019-04-16 17:47:00 +09:00
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
7845d542e3 Cache mods as array in DrawableRuleset 2019-04-10 17:20:36 +09:00
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
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
3073508a23 Merge branch 'master' into fix-offset-seek-handling 2019-04-09 15:40:48 +09:00
4c571acd67 Reinstantiate mods for every player 2019-04-09 13:33:16 +09:00
1c952e58cc Fix testcase failures 2019-04-09 13:15:48 +09:00
56496d28ba Reset mods when exiting match 2019-04-09 12:59:32 +09:00
cbb3fdaca8 Fix various crashes due to bindable being disabled 2019-04-09 12:59:32 +09:00
ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
ca9f172a96 Use var 2019-04-09 12:58:10 +09:00
93b6cc00df Fix OsuScreenDependencies using the incorrect parent 2019-04-09 12:56:23 +09:00
8a01995668 Remove need for tracking bool and backing logo 2019-04-08 16:14:41 +09:00
376bed3a30 Merge branch 'facade-container' of https://github.com/nyquillerium/osu into facade-container 2019-04-08 15:24:59 +09:00
a690302d00 Apply reviews 2019-04-08 15:24:09 +09:00
d7655bc579 Use .Value instead of cast
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-04-08 11:22:01 +09:00
e948b11756 Merge branch 'master' into invert-login-notification-depth 2019-04-07 14:03:01 +02:00
d431ca4efc BeatmapLeaderboard: use OrderByDescending instead of negation
(suggested by peppy)
2019-04-07 13:26:35 +02:00