1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 15:02:56 +08:00
Commit Graph

13551 Commits

Author SHA1 Message Date
Roman Kapustin
498244a308 Introduce PreviewTrack class 2018-05-25 00:37:53 +03:00
UselessToucan
d6076eb591
Merge branch 'master' into multiple_previews_different_overlays 2018-05-24 20:51:54 +03:00
ekrctb
be323c7147 Fix InspectCode issues. 2018-05-25 02:14:56 +09:00
ekrctb
99c0e19189 Fix build error 2018-05-25 01:52:15 +09:00
ekrctb
38e5e35743 modify catch hyperdash behavior 2018-05-25 01:20:05 +09:00
smoogipoo
b649025e86 beginUserDrag/endUserDrag 2018-05-24 14:36:48 +09:00
smoogipoo
d4f68e0b67 Fix possible NaN values due to trackvirtual infinite length 2018-05-24 14:31:31 +09:00
smoogipoo
f1ac84d95b Fix base.CreateLocalDependencies sometimes not being called 2018-05-24 13:03:25 +09:00
smoogipoo
5a517bad63 Move beatmap cleanup to Dispose() 2018-05-24 12:53:32 +09:00
smoogipoo
542eb848b0 Fix GetBoundCopy on IGameBeatmap not working 2018-05-24 12:42:58 +09:00
Dean Herbert
6d6cea19ec
Merge pull request #2624 from Aergwyn/hide-toolbar-after-play
Fix incorrect default values keeping overlays in wrong state
2018-05-24 09:43:52 +09:00
Aergwyn
0c0f86fe26 fix incorrect default values keeping overlays in wrong state 2018-05-23 16:25:10 +02:00
Jacob
a2527495ff
Merge branch 'master' into ParallaxContainerImprovement 2018-05-23 16:21:31 +02:00
smoogipoo
fb78854485 Fix audio playback getting paused if playlist changes beatmap 2018-05-23 19:41:13 +09:00
HoutarouOreki
6d222a36b2 Merge branch 'unifyDates' of https://github.com/HoutarouOreki/osu into unifyDates 2018-05-23 12:08:16 +02:00
HoutarouOreki
29de8e5e2d Document parameters more properly 2018-05-23 12:07:28 +02:00
smoogipoo
a5d2d74447 Remove whitespace 2018-05-23 19:01:27 +09:00
smoogipoo
a25462e10f Fix testcase audio + dependency overrides not working 2018-05-23 18:52:09 +09:00
Jarosław Zgierski
cf5232586e
Trim whitespace that I couldn't remove in VS? 2018-05-23 11:27:11 +02:00
HoutarouOreki
10bc3917b5 Apply suggested changes 2018-05-23 11:17:13 +02:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
smoogipoo
6c0c932c48 Reorder OsuGameBase methods 2018-05-23 14:56:40 +09:00
frankhjwx
fda7025ac3 Re-order positionData judgement for correct banana creation 2018-05-23 13:47:33 +08:00
frankhjwx
28ad5398cc Remove the changes in convert spinner 2018-05-23 13:46:12 +08:00
smoogipoo
f894d73501 Fix possible MusicController nullref 2018-05-23 14:36:09 +09:00
smoogipoo
a30f72b477 Add helper methods for seeking/scrolling 2018-05-23 14:32:00 +09:00
smoogipoo
6b0eeb3436 Rework seeking interactions to support smooth scrolling 2018-05-23 14:14:32 +09:00
smoogipoo
f18677382c Update framework 2018-05-23 12:00:23 +09:00
smoogipoo
49f893d5e4 Couple the timeline to the audio 2018-05-23 12:00:11 +09:00
Dean Herbert
194710eae4
Merge pull request #2613 from Aergwyn/fix-disclaimer-allowing-notifications
Fix disclaimer allowing notifications
2018-05-23 11:22:49 +09:00
frankhjwx
6ee96c758f
Merge branch 'master' into catch_spinner 2018-05-23 10:02:11 +08:00
HoutarouOreki
8e9dde97ce Better match join and last seen texts and tooltips with osu-web 2018-05-23 03:24:37 +02:00
HoutarouOreki
6cf227a7af Allow formatting for DrawableDate class 2018-05-23 03:24:18 +02:00
Vidalee
d73c3d0da6
resolving the lost code problem 2018-05-22 23:40:23 +02:00
Vidalee
7a31986812 resolving the lost code problem 2018-05-22 22:39:55 +02:00
Vidalee
08e423ac5b code sanity 2018-05-22 21:35:17 +02:00
Vidalee
50e2871c89 why this line was ommited 2018-05-22 21:29:41 +02:00
Aergwyn
76fbc656a1 fix disclaimer allowing notifications 2018-05-22 17:53:36 +02:00
Jacob
b328957557
Merge branch 'master' into ParallaxContainerImprovement 2018-05-22 16:32:05 +02:00
jorolf
8fbda5bc59 add license header 2018-05-22 15:41:10 +02:00
jorolf
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
frankhjwx
be0fc24ad4 Fixed banana generation on catch specific maps 2018-05-22 20:51:37 +08:00
jorolf
a7bdaf75b0 Ensure badges are ordered correctly 2018-05-22 13:05:15 +02:00
Dean Herbert
088deee70a
Merge pull request #2601 from Aergwyn/respect-showoverlay-bindable
FIx overlays from not hiding when returning to initial main menu state
2018-05-22 19:19:00 +09:00
Jacob
caad47b569
Merge branch 'master' into ParallaxContainerImprovement 2018-05-22 12:10:50 +02:00
Dean Herbert
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable 2018-05-22 19:00:42 +09:00
Dean Herbert
52230d6279
Merge pull request #2600 from peppy/fix-main-menu-escape
Fix escape not working to go backwards in menus before finally exiting the game
2018-05-22 18:58:48 +09:00
smoogipoo
1dfa3ff995 Merge remote-tracking branch 'origin/master' into editor-timeline-rework 2018-05-22 18:30:29 +09:00
Dan Balasescu
99163ca8ba
Merge branch 'master' into fix-main-menu-escape 2018-05-22 18:17:51 +09:00
Dan Balasescu
c0802b5646
Merge pull request #2430 from UselessToucan/exit_replay_button
Add hold-to-quit button for gameplay/replays
2018-05-22 18:17:40 +09:00