1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 01:47:31 +08:00
Commit Graph

2998 Commits

Author SHA1 Message Date
Jan Jurzitza
460c943958
Merge branch 'master' into mod-fl2 2018-10-12 11:44:55 +02:00
Dean Herbert
2babdc079c
Merge pull request #3568 from smoogipoo/fix-beatmap-details
Fix beatmap details not displaying
2018-10-10 20:14:58 +09:00
Dean Herbert
e0a8157d92
Merge branch 'master' into mod-fl2 2018-10-10 19:48:46 +09:00
Dean Herbert
d28b9860ff Don't use "beatmapset" terminology 2018-10-10 19:26:35 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
smoogipoo
6d24bde72b Fix beatmap details not displaying 2018-10-09 17:39:27 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dean Herbert
6841d5c2ec Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework 2018-09-28 18:32:59 +09:00
Dean Herbert
a4bf21268b Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-26 19:59:18 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
smoogipoo
cb500e80e4 Make BeatmapInfoWedge present until info is not null 2018-09-25 14:45:26 +09:00
Paul Teng
ed0ea3ad41
Merge branch 'master' into patch-1 2018-09-21 06:31:15 -04:00
smoogipoo
4380ef15bf Fix potential exception during async load callback 2018-09-21 16:31:09 +09:00
Paul Teng
654345f380 Remove duplicate condition test 2018-09-20 22:32:24 -04:00
Paul Teng
1644719893 Update SongSelect.cs 2018-09-20 22:29:37 -04:00
Paul Teng
49fbe8443a Test if there are beatmaps when click on delete btn 2018-09-20 22:00:20 -04:00
Dean Herbert
83bf38f4bc Make menu background blurrable
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
Dean Herbert
78d78b5510 Fade menu background a bit when menu is active 2018-09-21 03:13:15 +09:00
Dean Herbert
07a1c39fe5 Use random default background on starting the game 2018-09-21 03:12:20 +09:00
Dean Herbert
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
smoogipoo
62135c39aa Cleanup 2018-09-20 12:56:39 +09:00
smoogipoo
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
Dean Herbert
ae4c371bec Merge branch 'update-framework-event-handling' into update-framework 2018-09-20 00:29:42 +09:00
Dean Herbert
b2cf636ab5 Merge branch 'localisation-changes' into update-framework 2018-09-20 00:29:31 +09:00
smoogipoo
38a3c2a820 Fix song select wedge sometimes not updating when localisation changes 2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00
WebFreak001
040a44d42c Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2 2018-09-15 20:12:06 +02:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert
41be757a11
Merge branch 'master' into fix-logo-overhead 2018-09-15 18:33:22 +09:00
Dean Herbert
79b56cb35c Make saveState private 2018-09-15 16:34:08 +09:00
Dean Herbert
65b2bceef2 Simplify implementation 2018-09-15 14:51:04 +09:00
Dean Herbert
1662575f88
Merge branch 'master' into replay_keycounter 2018-09-14 19:08:54 +09:00
Unknown
04853b8c83 don't show StatusPill without a difficulty 2018-09-13 13:49:57 +02:00
Unknown
5414ce9932 add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet 2018-09-13 10:18:20 +02:00
Dean Herbert
7c7f0e11e3
Merge branch 'master' into fix-logo-overhead 2018-09-11 01:22:44 +09:00
smoogipoo
92386edb32 Scale the results screen score to keep it in view 2018-09-10 18:13:44 +09:00
Dean Herbert
f149a66a4d Use LargeTextureStore for all online texture retrieval
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.
2018-09-09 02:45:37 +09:00
Dean Herbert
0f9aa834e5 Fix osu! logo being present throughout the whole game 2018-09-08 16:31:59 +09:00
Roman Kapustin
125b569ccb Change AudioClock type to IFrameBasedClock and comment its usage 2018-09-07 21:39:41 +03:00
Roman Kapustin
dae54d252d Remove redundant checks in RestoreState 2018-09-07 21:35:32 +03:00
Dean Herbert
cc533a05c5 Update framework 2018-09-07 19:00:43 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete 2018-09-07 16:48:01 +09:00
Dean Herbert
a1780fddc9 DrawInfo -> DrawColourInfo 2018-09-06 18:02:04 +09:00
Dean Herbert
c23b9b61a8 Simplify implementation in line with framework improvements 2018-09-06 17:28:08 +09:00