1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 09:27:24 +08:00
Commit Graph

16765 Commits

Author SHA1 Message Date
Ivan Pavluk
d8b409f81f Merge branch 'master' of https://github.com/pavlukivan/osu 2018-12-12 17:18:32 +07:00
Dragicafit
c6c4bcccc3 relocate SkinnableCursor 2018-12-12 11:17:09 +01:00
Ivan Pavluk
28b033bd99 Autodetect LowestSuccessfulHitResult 2018-12-12 17:15:59 +07:00
smoogipoo
450e4cd223 Hook up API 2018-12-12 19:04:11 +09:00
smoogipoo
87ebb00f1c Make Target abstract (should absolutely always be set) 2018-12-12 19:03:27 +09:00
Ivan Pavluk
77e0d7ed8e
Fix formatting 2018-12-12 07:57:37 +00:00
smoogipoo
9af2b49c01 Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
6123a11b67 Use RoomID for creation 2018-12-12 16:20:11 +09:00
smoogipoo
439d741dee Implement basic api structure for rooms 2018-12-12 16:06:56 +09:00
Ivan Pavluk
e49e2fda9e Rename SuccessfulHitResult->LowestSuccessfulHitResult 2018-12-12 13:24:58 +07:00
Dean Herbert
ffb91b4afc
Update docstring
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:11:03 +07:00
Dean Herbert
d86cbf66a9
Update docstring
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:10:47 +07:00
smoogipoo
170955110f Add mods to the match info 2018-12-12 14:38:03 +09:00
smoogipoo
6661b5870f Merge branch 'songselect-mods' into match-mod-display
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 14:13:37 +09:00
Dean Herbert
b5c3b9e710
Merge pull request #3826 from smoogipoo/songselect-mods
Move ModOverlay to SongSelect
2018-12-12 13:59:10 +09:00
Dean Herbert
14af450ecb
Merge branch 'master' into songselect-mods 2018-12-12 13:37:04 +09:00
smoogipoo
49dd6ae9b0 Move a lot more of PlaySongSelect into SongSelect 2018-12-12 13:21:44 +09:00
Dragicafit
4b073aed83 remove spaces 2018-12-11 21:02:12 +01:00
Dragicafit
bfe3b03945 using SkinReloadableDrawable 2018-12-11 18:06:41 +01:00
Dean Herbert
7dc1f5b771 Add more tests 2018-12-11 20:12:30 +09:00
smoogipoo
497f431366 Implement RoomManager and RoomsContainer
Reduces logic from LoungeScreen
2018-12-11 19:07:40 +09:00
smoogipoo
bf3f5ab685 Change ready button to "Start" and make it enter player 2018-12-11 17:32:01 +09:00
Dragicafit
fb7d767909 adjust if position 2018-12-11 00:38:03 +01:00
Dean Herbert
ea4dce8454 Add a polling component model 2018-12-10 21:08:14 +09:00
smoogipoo
1ac615b490 Renamespace 2018-12-10 19:27:25 +09:00
smoogipoo
cd41c45686 Disable select beatmap button after room is created 2018-12-10 19:03:22 +09:00
smoogipoo
3c44f9e4f1 Make select beatmap button into a triangle button 2018-12-10 18:50:52 +09:00
smoogipoo
3f64cfc1c6 Don't add rooms to lounge until they're actually created 2018-12-10 18:35:08 +09:00
smoogipoo
ca544ef3fe Adjust match creation process 2018-12-10 18:25:32 +09:00
smoogipoo
77193eeea4 Move from lobby into match for creation process 2018-12-10 18:00:57 +09:00
smoogipoo
3b688c702c Use graying rather than alpha 2018-12-10 17:06:34 +09:00
smoogipoo
c7970e5425 Cleanup handling of readonly fields 2018-12-10 16:50:00 +09:00
Ivan Pavluk
a62b105fb5
Fix formatting 2018-12-10 05:06:18 +00:00
Ivan Pavluk
a2d1c2c096
Fix formatting 2018-12-10 05:05:03 +00:00
Ivan Pavluk
98e166a679
Merge branch 'master' into master 2018-12-10 12:00:53 +07:00
Ivan Pavluk
839e177d2a
Docstring change 2018-12-10 04:59:35 +00:00
smoogipoo
be3a912d0b Use UnbindFrom() 2018-12-10 13:48:12 +09:00
smoogipoo
41c7d10dff Fix compilation issues (+ use updated framework) 2018-12-10 13:48:05 +09:00
smoogipoo
352a758f5c Replace 3 occurrences of SpriteText.Current 2018-12-10 13:20:05 +09:00
Ivan Pavluk
8457324044 SuccessfulHitWindow->SuccessfulHitResult 2018-12-10 09:04:12 +07:00
Dan Balasescu
77a544e475
formatting fix
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:29 +07:00
Dan Balasescu
784a114eae
formatting fix
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:19 +07:00
Roman Kapustin
2d0fdc8204 Create ReplayPlayer using Score from the dummy RulesetContainer 2018-12-09 17:39:35 +03:00
Dragicafit
9afbebf560
Equals to == for string 2018-12-09 13:29:14 +01:00
Dean Herbert
7a703f9237 Fix API getting stuck in connecting state on some exceptions 2018-12-09 15:08:25 +09:00
Shane Woolcock
1268f8f3ed Add AppIcon 2018-12-08 15:52:11 +10:30
Shane Woolcock
14a4dbcc1d Fix package references 2018-12-08 15:45:19 +10:30
Shane Woolcock
f1f66b9209 Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-08 14:14:09 +10:30
Dragicafit
506f27a92e cursorExpand is now a bool 2018-12-07 23:52:57 +01:00
Dragicafit
ec3c87dbea Make Slider's CustumColors skinnable 2018-12-07 22:24:24 +01:00