RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 03:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,834 Commits 3 Branches 661 Tags 596 MiB
26834abd33
Commit Graph

15834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
26834abd33 Fade and no schedule 2018-12-26 21:18:55 +09:00
Dean Herbert
171287591c Merge branch 'updateable-beatmap-sprite' into timeshift-wip 
# Conflicts:
#	osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
#	osu.Game/Graphics/Containers/LinkFlowContainer.cs
 2018-12-26 20:52:36 +09:00
Dean Herbert
ae47eb61ca Fix test not working when not logged in 2018-12-26 20:42:47 +09:00
Dean Herbert
8386e206c3 Update ParticipantInfo 2018-12-26 20:35:54 +09:00
Dean Herbert
5bd3ab51dd Open -> Push 2018-12-26 20:35:54 +09:00
Dean Herbert
6f0d13e36b Move PartRoom calls 2018-12-26 20:35:54 +09:00
smoogipoo
23d412e3ff Fix post-rebase errors 2018-12-26 20:33:49 +09:00
smoogipoo
9d305ba024 Reduce code duplication 2018-12-26 20:33:19 +09:00
smoogipoo
be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +09:00
smoogipoo
052ab4763a Display room join errors as notifications 2018-12-26 20:32:36 +09:00
Dean Herbert
2353c204ee Renaming 2018-12-26 20:05:57 +09:00
Dean Herbert
532a970c0f Give leaderboard and chat more breathing room 2018-12-26 19:20:54 +09:00
Dean Herbert
0cefd4b21d Improve room padding 2018-12-26 19:14:15 +09:00
Dean Herbert
e317b047f8 Merge remote-tracking branch 'upstream/master' into updateable-beatmap-sprite 2018-12-26 18:49:41 +09:00
Dean Herbert
edfb027ff2 Update framework 2018-12-26 18:49:33 +09:00
Dan Balasescu
029bbbc869
Merge pull request #3917 from peppy/better-login-messaging 
Add better messaging when connecting or failing
 2018-12-26 18:35:34 +09:00
Dean Herbert
63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
Dean Herbert
f442e59620 Icon and beatmap title visual pass 2018-12-26 18:01:53 +09:00
Dean Herbert
c6c8c472bb Split class out 2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20 RoomSettingsOverlay -> MatchSettingOverlay 2018-12-26 16:50:50 +09:00
smoogipoo
a8d0ff67a9 Add automated match settings overlay tests 2018-12-26 16:34:38 +09:00
Dean Herbert
7c1e3d66eb
Merge pull request #3916 from smoogipoo/fix-getuser-request-failing 
Fix API get user request never failing
 2018-12-26 16:32:01 +09:00
smoogipoo
aeb2186539 Fix api get user request never failing 2018-12-26 16:06:39 +09:00
Dean Herbert
b2fb027097 Remove old testcase 2018-12-26 15:26:46 +09:00
Dean Herbert
6e8c46f00b Fix padding and use grid container for more correctness 2018-12-26 15:23:57 +09:00
Dean Herbert
755c6b9243 Make room settings scroll 2018-12-26 15:03:35 +09:00
Dean Herbert
ce33c301f6 Merge remote-tracking branch 'upstream/master' into timeshift-wip 2018-12-26 14:46:17 +09:00
Dan Balasescu
2b1466ef58
Merge pull request #3915 from peppy/rider-live-tempaltes 
Add rider live templates
 2018-12-26 14:33:53 +09:00
Dean Herbert
e9556afe22 Don't use all uppercase (is applied automatically) 2018-12-26 14:26:35 +09:00
Dean Herbert
e4a72c0c64 Fix failing testcase 2018-12-26 13:18:36 +09:00
Dean Herbert
3370de3c2e Add rider live templates 2018-12-26 11:53:24 +09:00
Dean Herbert
c902c1587a Add tests and modify fallback logic 2018-12-25 19:17:32 +09:00
Dean Herbert
c45c34d400 Make beatmap importing possible elsewhere in tests 2018-12-25 19:17:21 +09:00
smoogipoo
96c9e5f209 Make DefaultBeatmap readonly 2018-12-25 18:34:45 +09:00
smoogipoo
6a5f0eca18 Fix various elements flashing 2018-12-25 18:07:50 +09:00
smoogipoo
1dd2a4e368 Fix host info not working 2018-12-25 18:07:19 +09:00
Dean Herbert
9542e3e24a Add Updateable beatmap sprite 2018-12-25 18:04:13 +09:00
smoogipoo
2f32c4d4d1 Fix title of match song select 2018-12-25 17:17:51 +09:00
smoogipoo
d4f5a8507c Exit from match screen on escape 2018-12-25 17:14:56 +09:00
smoogipoo
91b83cd4b8 Fix leaderboard being queried on room creation 2018-12-25 13:57:25 +09:00
smoogipoo
bcd3584df0 Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-25 12:04:39 +09:00
smoogipoo
23d21a45e5 More automated tests 2018-12-25 11:59:08 +09:00
smoogipoo
626ec85ae8 Remove IHasFilterableChildren from class 2018-12-25 11:58:28 +09:00
smoogipoo
6712a68797 Create IRoomManager interface, add test for RoomsContainer 2018-12-25 11:45:50 +09:00
smoogipoo
f79aa07d02 Fix enddate not being bound to 2018-12-25 11:31:36 +09:00
smoogipoo
e0e75c7339 Fix incorrect room status 2018-12-25 11:24:46 +09:00
Dan Balasescu
9368054d47
Merge pull request #3908 from VINXIS/patch-1 
Implement MBMasher's FL change into osu!'s ppcalc
 2018-12-24 14:54:42 +09:00
VINXIS
227c63dd1c
numtotalhits -> totalHits 2018-12-23 22:23:43 -07:00
VINXIS
8020ac26fb
MBMasher's FL change 2018-12-23 22:14:28 -07:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00