sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-28 00:47:28 +09:00
Code Issues Packages Projects Releases Wiki Activity
14,261 Commits 3 Branches 1 Tag
Commit Graph

9019 Commits

Author SHA1 Message Date
Dean Herbert
4a18951cce Report full error to log file 2018-05-29 18:37:45 +09:00
Dean Herbert
0adc16f9bd Handle online ID mismatches and clashes on beatmap import 2018-05-29 16:26:50 +09:00
Dean Herbert
47d88a48a2 Add logging on import processes 2018-05-29 16:26:42 +09:00
Dean Herbert
de8c4e6d56 Remove unique constraints on hash columns 
We are going to allow multiple instances of the same beatmap info hash as they could be in different beatmap sets.
 2018-05-29 16:26:32 +09:00
Dean Herbert
c1f416b1cc Add back missing rethrow 2018-05-29 16:23:38 +09:00
Dean Herbert
3d3026a80c Report any error during import to the write context to allow for rollback 2018-05-29 16:23:38 +09:00
Dean Herbert
72da640059 Change order of event firing in Update calls 
A remove event should not be fired before the update is successful.
 2018-05-29 16:23:38 +09:00
Dean Herbert
80806be047 Don't start transactions for migration 
It looks like transactions are used internally during migration.
 2018-05-29 16:23:38 +09:00
Dean Herbert
a3287b8cf2 Correctly rollback failed imports 2018-05-29 16:23:38 +09:00
DrabWeb
7b8211e6db Add MultiplayerScreen.Type 2018-05-29 04:23:29 -03:00
Dean Herbert
bcb04f6168 Improve transaction handling flexibility 2018-05-29 16:23:27 +09:00
Dean Herbert
d4e7f08c20 Bring entity framework up-to-date and re-enable transactions 2018-05-29 16:23:27 +09:00
Dean Herbert
2a87b851fa Add proper transaction rollback logic on exception 2018-05-29 16:23:27 +09:00
DrabWeb
9a7e5a3e2c Update TestCaseMatch. 2018-05-29 04:16:19 -03:00
DrabWeb
7edb82eb85 Add TestCaseMatchParticipants. 2018-05-29 03:53:30 -03:00
DrabWeb
b4b4a8a157 Add TestCaseMatchInfo. 2018-05-29 03:24:38 -03:00
DrabWeb
94b54a0520 Adjust design of ReadyButton. 2018-05-29 03:03:51 -03:00
DrabWeb
3915cb7f2f Add Match Participants, change Room.Users to IEnumerable. 2018-05-29 02:42:52 -03:00
DrabWeb
77ff0640c2 Add a gradient over the cover in Header. 2018-05-29 01:53:45 -03:00
DrabWeb
c8ce34b6d4 Add Match Info. 2018-05-29 01:51:04 -03:00
DrabWeb
98819880c4 Add match screen header. 2018-05-29 01:16:39 -03:00
DrabWeb
ab3ac49a2d Add empty Match screen. 2018-05-29 01:16:39 -03:00
DrabWeb
d090323c00 Add ParticipantCount to share with the Match screen. 2018-05-29 00:51:56 -03:00
DrabWeb
852d7ef48d Use ?: expression instead of if/else. 2018-05-29 00:07:33 -03:00
DrabWeb
7beac3a712 Cleanup DrawableRoom. 2018-05-28 23:56:00 -03:00
DrabWeb
dcc39d96e2 BeatmapModeInfo -> BeatmapTypeInfo. 2018-05-28 23:45:59 -03:00
DrabWeb
bd9af745dd Cleanup. 
(cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)
 2018-05-28 23:41:50 -03:00
DrabWeb
8b8d10349e Move RoomInspector info panel content to BeatmapModeInfo to share with Match. 
(cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)
 2018-05-28 23:41:42 -03:00
DrabWeb
8b36e1dad0 Add BeatmapTitle to encapsulate multiplayer beatmap title display logic. 
(cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)
 2018-05-28 23:41:07 -03:00
DrabWeb
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
DrabWeb
e920b8d577 Add UpdateableBeatmapSetCover. 2018-05-28 19:11:26 -03: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
smoogipoo
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
smoogipoo
3a5228af43 Make GameBeatmap late-bind its AudioManager for ctor Beatmap access 2018-05-28 17:55:41 +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
smoogipoo
3abfd4711d Fix wrong clock being seeked when unpausing 2018-05-28 03:42:53 +09:00
smoogipoo
8ae2a3696f Apply platform universal offset at player level 2018-05-28 03:31:46 +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
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
79442ad238
Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
Roman Kapustin
572c3f5189 Stop preview playback when an overlay is popping out 2018-05-25 23:51:05 +03:00
Roman Kapustin
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
HoutarouOreki
63fb9ddec4 Forgot file name 2018-05-25 21:20:42 +02:00