Commit Graph

15885 Commits

Author SHA1 Message Date
2b3a630270 add OverlayActivation enum
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
5be46307fd Fix results screen parallax being cut off
Alternative to / closes #2549.

Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.
2018-05-28 19:43:59 +09:00
1572635fc8 Merge pull request #2660 from smoogipoo/fix-holdnote-judgement
Fix mania hold notes displaying judgements
2018-05-28 18:35:02 +09:00
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +09:00
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
3a5228af43 Make GameBeatmap late-bind its AudioManager for ctor Beatmap access 2018-05-28 17:55:41 +09:00
ce8a6cfc53 Merge pull request #2603 from DrabWeb/multiplayer-lounge
Multiplayer lounge
2018-05-28 14:39:19 +09:00
ed7c860802 Adjust transitions of DrawableRoom 2018-05-28 13:30:29 +09:00
02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
0ca6d73f0e Add a delay before the osu! logo appears when exiting multiplayer 2018-05-28 13:30:17 +09:00
3c3412791c Merge remote-tracking branch 'upstream/release' into multiplayer-lounge 2018-05-28 13:30:04 +09:00
b267ec3178 Fix failing test 2018-05-28 03:48:09 +09:00
3abfd4711d Fix wrong clock being seeked when unpausing 2018-05-28 03:42:53 +09:00
8ae2a3696f Apply platform universal offset at player level 2018-05-28 03:31:46 +09:00
b2b3976e9d Merge pull request #2644 from peppy/fix-osu-autoplay
Ensure autoplay tests actually increase score above zero
2018-05-27 15:35:26 +09:00
4f0d7bd63e Update framework 2018-05-27 15:14:25 +09:00
916c9e7e89 Merge remote-tracking branch 'ppy/master' into fix-osu-autoplay 2018-05-27 15:12:52 +09:00
95315e46f0 Make drawable rooms fade in when first displayed
Stops filtered rooms from briefly displaying.
2018-05-27 14:12:20 +09:00
12b5ca1b0d Merge branch 'master' into multiplayer-lounge 2018-05-27 11:15:03 +09:00
9abde7e91a Merge pull request #2622 from smoogipoo/fix-playlist-pause
Fix selecting song in playlist not starting the audio
2018-05-27 11:13:04 +09:00
bcdbd97da9 Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
b0d2af16f1 Merge pull request #2611 from frankhjwx/catch_spinner
Fixed banana generation on catch specific maps
2018-05-26 12:48:47 +09:00
8b2a6b8cce Fix formatting 2018-05-26 12:38:33 +09:00
8a5cd85ecd Merge branch 'master' into catch_spinner 2018-05-26 12:36:42 +09:00
18c3339cd2 Merge pull request #2637 from HoutarouOreki/CursorOverrideContainer-rename
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-26 12:31:58 +09:00
79442ad238 Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
b8b7e2cd9f Merge pull request #2636 from smoogipoo/diffcalc-fixes
Bring pp calculations more in-line with osu!stable
2018-05-26 12:18:41 +09:00
e016f98841 Merge branch 'master' into diffcalc-fixes 2018-05-26 12:10:31 +09:00
a87c26028f Merge pull request #2633 from peppy/fix-failing-tests
Fix quit button test occasionally failing
2018-05-26 11:56:57 +09:00
d850e34003 Actually cast to int 2018-05-26 09:25:16 +09:00
572c3f5189 Stop preview playback when an overlay is popping out 2018-05-25 23:51:05 +03:00
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
63fb9ddec4 Forgot file name 2018-05-25 21:20:42 +02:00
e2d840c2de Rename CursorOverrideContainer to MenuCursorContainer 2018-05-25 21:13:40 +02:00
39224931f8 Try satisfying AppVeyor 2018-05-25 14:25:12 +02:00
71c04f4605 Add license header to the new file 2018-05-25 14:10:54 +02:00
29fbdf4d92 Remove horizontal white space 2018-05-25 14:05:50 +02:00
e3ebc849c5 Remove not removed comment 2018-05-25 14:04:12 +02:00
3efb51e464 Create Format(), override TooltipText.. 2018-05-25 14:00:32 +02:00
a446b627da Make TooltipText virtual 2018-05-25 13:31:12 +02:00
05b0564381 Create DrawableJoinDate somehow and remove dateFormat argument 2018-05-25 13:30:29 +02:00
9dd2c2a904 Merge branch 'master' into diffcalc-fixes 2018-05-25 20:09:20 +09:00
215cc9fba7 Change all performance calculators to use int hitwindows
Has a pretty large (>6) effect on pp for some maps.
2018-05-25 20:07:14 +09:00
765a50d007 Remove 0.5 offsets
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
2018-05-25 20:05:53 +09:00
961702aadf Apply the format fix to the tooltip text across the board 2018-05-25 13:05:41 +02:00
adeb23d54b Merge branch 'master' into fix-failing-tests 2018-05-25 19:36:05 +09:00
4392c57889 Merge branch 'master' into catch-droplet-fix 2018-05-25 19:34:59 +09:00
58317be41e Merge pull request #2499 from AlFasGD/editor-seekbar-fix
Prevent user from scrolling outside the timeline in the editor
2018-05-25 19:34:28 +09:00
22e6e016fc Merge branch 'master' of https://github.com/ppy/osu into catch-droplet-fix 2018-05-25 19:28:36 +09:00