1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:07:26 +08:00
Commit Graph

12380 Commits

Author SHA1 Message Date
Dean Herbert
6000a90721
Merge branch 'master' into overlay-activation 2018-05-30 13:59:20 +09:00
Dean Herbert
e8cc3294d7
Merge pull request #2663 from smoogipoo/fix-results-parallax
Fix results screen parallax being cut off
2018-05-30 10:44:25 +09:00
Dean Herbert
2dc7bb523b
Merge branch 'master' into fix-results-parallax 2018-05-30 10:15:20 +09:00
Dean Herbert
165e5b8518
Merge pull request #2677 from Tom94/fix-vscode
Fix Debug mode instead of Release mode for mono debug target
2018-05-29 19:32:20 +09:00
Thomas Müller
6f72e5a876 Fix Debug mode instead of Release mode for mono debug target 2018-05-29 10:27:21 +02:00
Dan Balasescu
f6f18e2fe2
Merge pull request #2671 from Tom94/fix-vscode
Add build tasks for visual tests and fix broken launch tasks
2018-05-29 15:49:44 +09:00
Thomas Müller
4f73f6e0e0 Add build tasks for visual tests and fix broken launch tasks 2018-05-29 08:38:43 +02:00
Aergwyn
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
smoogipoo
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
Dean Herbert
1572635fc8
Merge pull request #2660 from smoogipoo/fix-holdnote-judgement
Fix mania hold notes displaying judgements
2018-05-28 18:35:02 +09:00
smoogipoo
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +09:00
Dean Herbert
ce8a6cfc53
Merge pull request #2603 from DrabWeb/multiplayer-lounge
Multiplayer lounge
2018-05-28 14:39:19 +09:00
Dean Herbert
ed7c860802 Adjust transitions of DrawableRoom 2018-05-28 13:30:29 +09:00
Dean Herbert
02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
Dean Herbert
0ca6d73f0e Add a delay before the osu! logo appears when exiting multiplayer 2018-05-28 13:30:17 +09:00
Dean Herbert
3c3412791c Merge remote-tracking branch 'upstream/release' into multiplayer-lounge 2018-05-28 13:30:04 +09:00
Dan Balasescu
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
Dean Herbert
4f0d7bd63e Update framework 2018-05-27 15:14:25 +09:00
Dean Herbert
916c9e7e89 Merge remote-tracking branch 'ppy/master' into fix-osu-autoplay 2018-05-27 15:12:52 +09:00
Dean Herbert
95315e46f0 Make drawable rooms fade in when first displayed
Stops filtered rooms from briefly displaying.
2018-05-27 14:12:20 +09:00
Dean Herbert
12b5ca1b0d
Merge branch 'master' into multiplayer-lounge 2018-05-27 11:15:03 +09:00
Dean Herbert
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
Dean Herbert
bcdbd97da9
Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
Dean Herbert
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
Dean Herbert
b0d2af16f1
Merge pull request #2611 from frankhjwx/catch_spinner
Fixed banana generation on catch specific maps
2018-05-26 12:48:47 +09:00
Dean Herbert
8b2a6b8cce Fix formatting 2018-05-26 12:38:33 +09:00
Dean Herbert
8a5cd85ecd
Merge branch 'master' into catch_spinner 2018-05-26 12:36:42 +09:00
Dean Herbert
18c3339cd2
Merge pull request #2637 from HoutarouOreki/CursorOverrideContainer-rename
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-26 12:31:58 +09:00
Dean Herbert
79442ad238
Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
Dean Herbert
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
Dean Herbert
e016f98841
Merge branch 'master' into diffcalc-fixes 2018-05-26 12:10:31 +09:00
Dan Balasescu
a87c26028f
Merge pull request #2633 from peppy/fix-failing-tests
Fix quit button test occasionally failing
2018-05-26 11:56:57 +09:00
smoogipoo
d850e34003 Actually cast to int 2018-05-26 09:25:16 +09:00
HoutarouOreki
63fb9ddec4 Forgot file name 2018-05-25 21:20:42 +02:00
HoutarouOreki
e2d840c2de Rename CursorOverrideContainer to MenuCursorContainer 2018-05-25 21:13:40 +02:00
Dan Balasescu
9dd2c2a904
Merge branch 'master' into diffcalc-fixes 2018-05-25 20:09:20 +09:00
smoogipoo
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
smoogipoo
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
Dean Herbert
adeb23d54b
Merge branch 'master' into fix-failing-tests 2018-05-25 19:36:05 +09:00
Dean Herbert
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
Dean Herbert
8977670088 Update framework 2018-05-25 19:21:49 +09:00
Dean Herbert
699f661b02 Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix 2018-05-25 19:07:30 +09:00
Dean Herbert
b474dca09a
Merge pull request #2612 from jorolf/open-external
Add icon next to beatmap title/username to open in browser
2018-05-25 19:01:27 +09:00
Dean Herbert
cc69f07172 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:52:05 +09:00
Dean Herbert
1cb7d50407 Add and use default size (smaller than before) 2018-05-25 18:51:57 +09:00
Dean Herbert
78ca111d69
Merge pull request #2504 from UselessToucan/player_loader_input_toggles
Add input toggles to the PlayerLoader screen
2018-05-25 18:50:45 +09:00
Dean Herbert
1b5bb79fe9 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:50:30 +09:00
Dean Herbert
28aa6faef9
Merge branch 'master' into player_loader_input_toggles 2018-05-25 18:38:12 +09:00
Dean Herbert
7d06a08c3a Fix quit button test occasionally failing 2018-05-25 17:44:56 +09:00
Dean Herbert
e62718f251
Merge pull request #2587 from smoogipoo/diffcalc-double-hr
Fix double-HR application in OsuDifficultyCalculator
2018-05-25 14:17:25 +09:00