Commit Graph

12370 Commits

Author SHA1 Message Date
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +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
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
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
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
adeb23d54b Merge branch 'master' into fix-failing-tests 2018-05-25 19:36:05 +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
8977670088 Update framework 2018-05-25 19:21:49 +09:00
699f661b02 Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix 2018-05-25 19:07:30 +09:00
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
cc69f07172 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:52:05 +09:00
1cb7d50407 Add and use default size (smaller than before) 2018-05-25 18:51:57 +09:00
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
1b5bb79fe9 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:50:30 +09:00
28aa6faef9 Merge branch 'master' into player_loader_input_toggles 2018-05-25 18:38:12 +09:00
7d06a08c3a Fix quit button test occasionally failing 2018-05-25 17:44:56 +09:00
e62718f251 Merge pull request #2587 from smoogipoo/diffcalc-double-hr
Fix double-HR application in OsuDifficultyCalculator
2018-05-25 14:17:25 +09:00
67447ef560 Merge branch 'master' into diffcalc-double-hr 2018-05-25 14:03:10 +09:00
1c947fd3a7 Merge pull request #2618 from smoogipoo/musiccontroller-nullref
Fix possible MusicController nullref
2018-05-25 11:25:05 +09:00
385c2c5c86 Merge branch 'master' into musiccontroller-nullref 2018-05-25 11:01:09 +09:00
568d4882c6 Remove unnecessary null coalesce 2018-05-25 11:00:56 +09:00
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
0c0f86fe26 fix incorrect default values keeping overlays in wrong state 2018-05-23 16:25:10 +02:00
fb78854485 Fix audio playback getting paused if playlist changes beatmap 2018-05-23 19:41:13 +09:00
fda7025ac3 Re-order positionData judgement for correct banana creation 2018-05-23 13:47:33 +08:00
28ad5398cc Remove the changes in convert spinner 2018-05-23 13:46:12 +08:00
f894d73501 Fix possible MusicController nullref 2018-05-23 14:36:09 +09:00