1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:07:25 +08:00
Commit Graph

18263 Commits

Author SHA1 Message Date
Dean Herbert
9d6912a692 Update framework 2019-04-18 21:23:40 +08:00
David Zhao
037e23247f Remove unused using 2019-04-18 14:31:47 +09:00
David Zhao
dfa5beea89 Use the actual scale of Flashlight for FlashlightSize 2019-04-18 14:24:19 +09:00
Dean Herbert
d1799d197d Update resources and mods usage 2019-04-18 09:27:30 +08:00
Dean Herbert
879f6152b0 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-04-17 22:17:10 +08:00
Dean Herbert
f6cbae578b
Merge pull request #4614 from smoogipoo/player-mod-reinstantiation
Reinstantiate mods for each player instance

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-17 16:57:58 +08:00
Dean Herbert
2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation 2019-04-17 16:42:57 +08:00
Dan Balasescu
118f512d98
Merge pull request #4540 from nyquillerium/facade-container
Implement FacadeContainer for tracking logo positions in other containers
2019-04-17 17:33:08 +09:00
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
Dean Herbert
ed1f05333a
Merge pull request #4613 from smoogipoo/no-workingbeatmap-mods
Remove mods from WorkingBeatmap
2019-04-15 16:53:01 +08:00
LeNitrous
2d227d25cc fix appveyor warnings 2019-04-14 07:55:15 +08:00
LeNitrous
91c327a90f use ModDisplay 2019-04-14 07:22:31 +08:00
DrabWeb
c766631ad6 Check for breaks using GameplayClock time. 2019-04-13 11:39:22 -03:00
David Zhao
e25c7fdb9b Use absolute sequence for flashlight breaks 2019-04-12 17:39:25 +09:00
David Zhao
d9ed68b189 Add short fade to flashlight dimming 2019-04-12 15:33:31 +09:00
David Zhao
69748abedc Rename to TestCaseOsuFlashlight 2019-04-12 15:09:43 +09:00
David Zhao
dba4ccdf74 Add back flashlight testcase 2019-04-12 14:53:23 +09:00
David Zhao
846a4835ca Invert flashlight dim 2019-04-12 11:23:40 +09:00
David Zhao
664a4ba540 Implement flashlight dimming on slider slide 2019-04-12 10:47:22 +09:00
LeNitrous
01cc78108c add random button 2019-04-11 05:47:32 +08:00
LeNitrous
b4d0755818 please appveyor 2019-04-10 22:10:09 +08:00
LeNitrous
22f9339b01 let mods button have selected mod icons 2019-04-10 21:53:13 +08:00
Nathan Alo
a5ff7d58db
Merge pull request #5 from ppy/master 2019-04-10 19:33:20 +08: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