1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 21:27:25 +08:00
Commit Graph

27 Commits

Author SHA1 Message Date
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
ProgrammaticNajel
e4084b7d5d Add overflow padding in other multiplayer screen components
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
50201e602e Combine implementations of status + end date info 2018-12-27 16:19:00 +09:00
smoogipoo
1dd2a4e368 Fix host info not working 2018-12-25 18:07:19 +09:00
smoogipoo
c06cf5d379 Decouple match info from match screen 2018-12-22 14:08:00 +09:00
smoogipoo
f1a9a352fc Cleanup bindable handling 2018-12-22 14:01:06 +09:00
smoogipoo
1701af61d6 Add host avatar+username to match screen 2018-12-20 18:04:22 +09:00
smoogipoo
2e28f378de Move beatmap + mod info to header 2018-12-20 15:17:33 +09:00
smoogipoo
c544a5b9f0 Add end date to the drawable room too 2018-12-19 15:20:23 +09:00
smoogipoo
a8d88dea3b Display time remaining in the room 2018-12-19 13:07:56 +09:00
smoogipoo
2c000a9a1d Disallow starting gameplay if there's not enough time in the room 2018-12-19 10:52:15 +09:00
smoogipoo
83bf37a302 Enable/disable the view beatmap + ready buttons based on beatmap presence 2018-12-14 15:04:04 +09:00
smoogipoo
b83f99d90a Fix up header sizing + styling 2018-12-14 14:30:39 +09:00
smoogipoo
eb0e9c0bb1 Merge branch 'match-mod-display'
# Conflicts:
#	osu.Game/Screens/Multi/Match/Components/Info.cs
#	osu.Game/osu.Game.csproj
2018-12-13 17:07:31 +09:00
smoogipoo
170955110f Add mods to the match info 2018-12-12 14:38:03 +09:00
smoogipoo
bf3f5ab685 Change ready button to "Start" and make it enter player 2018-12-11 17:32:01 +09:00
smoogipoo
1ac615b490 Renamespace 2018-12-10 19:27:25 +09:00