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

16720 Commits

Author SHA1 Message Date
Dean Herbert
f0743ebecf Merge remote-tracking branch 'upstream/master' into tournament-tools
# Conflicts:
#	osu.Game.Tournament.Tests/TestCaseDrawings.cs
#	osu.Game/osu.Game.csproj
2019-02-17 17:25:09 +09:00
Dean Herbert
bab29b94a6
Fix nullref when entering multiplayer (#4268)
Fix nullref when entering multiplayer
2019-02-16 11:25:26 +09:00
smoogipoo
134840f118 Fix nullref 2019-02-16 11:18:17 +09:00
Dean Herbert
3372a0e5a2
Merge pull request #4265 from peppy/fix-screen-tests
Fix screen tests
2019-02-15 22:26:22 +09:00
Dean Herbert
aceb8c4cb0 Fix TestCasePlaySongSelect 2019-02-15 21:50:40 +09:00
Dean Herbert
4777fd1334 Merge remote-tracking branch 'upstream/master' into fix-screen-tests 2019-02-15 21:29:44 +09:00
Dean Herbert
c607b8c979 Update framework 2019-02-15 21:28:59 +09:00
Dean Herbert
bd4e8e132b
Merge pull request #4264 from nekodex/legacy-hitcircleoverlap-support
Add support for the HitCircleOverlap property of legacy skins
2019-02-15 21:27:56 +09:00
Dean Herbert
dfb4e82125
Merge pull request #4259 from nekodex/fix-cursor-on-startup
Fix mouse cursor appearing prematurely during startup
2019-02-15 21:27:37 +09:00
Dean Herbert
90e462309f
Add newline 2019-02-15 21:16:54 +09:00
Dean Herbert
89981c02a2
Merge branch 'master' into fix-cursor-on-startup 2019-02-15 21:15:23 +09:00
Jamie Taylor
1c8212d510
Add a TestCase for looong combos 2019-02-15 21:03:55 +09:00
Jamie Taylor
38cf5a1ea4
Add support for the HitCircleOverlap property in legacy skins 2019-02-15 21:03:06 +09:00
Dan Balasescu
e9709e82b8
Merge pull request #4258 from peppy/fix-account-creation-regression
Fix account creation overlay not working
2019-02-15 19:08:21 +09:00
Dean Herbert
fc583590d3 Fix OsuGame testcase 2019-02-15 17:40:49 +09:00
Dean Herbert
5d502250d8 Fix account creation overlay not working
Regressed with screen stack changes.
2019-02-15 17:01:51 +09:00
Dean Herbert
65721a01ab Fix regressed screen test cases 2019-02-15 17:01:06 +09:00
Jamie Taylor
3ea13b1ade
Fix mouse cursor appearing prematurely during startup 2019-02-15 16:55:39 +09:00
Dean Herbert
31bbefb9a8
Merge pull request #4255 from peppy/fix-multiplayer-test-case
Fix MultiplayerTestCase not being abstract
2019-02-15 14:30:41 +09:00
Dean Herbert
490d48fa5e Fix MultiplayerTestCase not being abstract 2019-02-15 13:48:14 +09:00
Dan Balasescu
2343557517
Merge pull request #4246 from peppy/fix-silence-on-mp-exit
Don't revert beatmap on exiting leased state
2019-02-14 17:26:29 +09:00
Dean Herbert
777a606b2d Don't revert beatmap on exiting leased state 2019-02-14 17:14:58 +09:00
Dean Herbert
813b36e98e
Merge pull request #4191 from peppy/leased-bindables-dont-work
Add screen leased bindables via DependencyContainer
2019-02-14 17:05:39 +09:00
Dean Herbert
268be1c5d7
Merge pull request #4242 from UselessToucan/download_button_should_observe_beatmaps_availability
Update direct download button state on beatmapset removal
2019-02-14 16:28:44 +09:00
Dan Balasescu
9a0859464d
Merge branch 'master' into leased-bindables-dont-work 2019-02-14 16:24:10 +09:00
Dean Herbert
3c16b03c60 Merge remote-tracking branch 'upstream/master' into download_button_should_observe_beatmaps_availability 2019-02-14 16:21:06 +09:00
Dean Herbert
a5f1f9830b Fix potential schedule race case and regression in enum setting 2019-02-14 16:21:01 +09:00
Dean Herbert
532db79b03
Merge pull request #4202 from Aergwyn/dont-log-passwords
Stop logging keyboard events from password textbox
2019-02-14 16:00:54 +09:00
Dean Herbert
503219b528
Merge branch 'master' into dont-log-passwords 2019-02-14 15:52:04 +09:00
Dean Herbert
cf66fc6924 Update framework 2019-02-14 13:29:07 +09:00
Dean Herbert
94ceb1e32b Move screen change allowance to local usage 2019-02-14 13:28:21 +09:00
Roman Kapustin
a289cb7c6a Handle beatmapset removal in DownloadTrackingComposite 2019-02-13 22:11:46 +03:00
Roman Kapustin
99046f16e8 Revert "Update direct download button state on beatmap import and removal"
This reverts commit 11234d3c60.
2019-02-13 22:04:49 +03:00
Dean Herbert
5318de29b4 Fix import logic again 2019-02-13 19:57:54 +09:00
Dean Herbert
e604806398 Fix regression in screen change allowance logic 2019-02-13 19:43:01 +09:00
Dean Herbert
3ec94e4ab3 Remove disable setting 2019-02-13 15:14:34 +09:00
Dean Herbert
43843ac558 Remove explicit dispose 2019-02-13 14:58:40 +09:00
Dean Herbert
1373e0fad0 Fix BeatmapTitle not always displaying 2019-02-13 14:57:40 +09:00
Dean Herbert
166cdab2e8 Remove unnecessary null check 2019-02-13 14:14:57 +09:00
Dean Herbert
ab3adafafd Fix crashes after entering player 2019-02-13 14:13:54 +09:00
Dan Balasescu
c3ae4d7b14
Improve comment
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-13 11:34:48 +09:00
Dean Herbert
19bef01dd0 Attempt to maybe fix tests 2019-02-13 11:05:02 +09:00
Roman Kapustin
11234d3c60 Update direct download button state on beatmap import and removal 2019-02-12 21:20:49 +03:00
Dean Herbert
b967b93b88 Fix regressions in tests 2019-02-12 19:53:08 +09:00
Dean Herbert
2ea839c475 Fix crashes on beatmap not being set correctly in player 2019-02-12 19:18:22 +09:00
Dean Herbert
a28689ff4c Update framework 2019-02-12 17:58:36 +09:00
Dean Herbert
d5cce850a8 Revert some unnecessary complications in logo logic 2019-02-12 13:29:41 +09:00
Dean Herbert
272584eb79 Improve file layouts 2019-02-12 13:02:33 +09:00
Dean Herbert
78b47f9fe3 Fix starting matches not working 2019-02-12 11:19:42 +09:00
Dean Herbert
e57409fe41 Remove unnecessary bindable properties on mod lists 2019-02-12 10:51:39 +09:00