h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Code Issues Releases Wiki Activity
15,524 Commits 3 Branches 654 Tags 363 MiB
28192aef90
Commit Graph

15524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipoo
28192aef90 Fix nullref 2018-12-14 15:03:49 +09:00
smoogipoo
3de65238a2 Completely hide the select beatmap button for now 2018-12-14 14:33:50 +09:00
smoogipoo
b83f99d90a Fix up header sizing + styling 2018-12-14 14:30:39 +09:00
smoogipoo
c9c04a6200 Fix ToBeatmap not using the correct metadata 
Metadata is always come from the API via the beatmap set.
 2018-12-14 13:43:52 +09:00
smoogipoo
56fd4b95cd Fix mod/beatmap selection not always working 2018-12-14 13:38:27 +09:00
smoogipoo
2e767a5292 Fix incorrect acronym 2018-12-14 13:38:13 +09:00
smoogipoo
8e6a85058b Fix playlist-related errors 2018-12-14 12:35:05 +09:00
smoogipoo
91f6b08479 Merge branch 'timeshift-api-integration' 2018-12-13 18:38:22 +09:00
smoogipoo
680a3e2aa4 Update with proper playlist usage 2018-12-13 18:38:03 +09:00
smoogipoo
2aafaf9ce2 Merge branch 'timeshift-api-integration' 2018-12-13 17:07: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
ca87b42758 Merge branch 'timeshift-player' 
# Conflicts:
#	osu.Game/Screens/Multi/Multiplayer.cs
 2018-12-13 17:06:44 +09:00
smoogipoo
208273f16a Merge branch 'timeshift' 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2018-12-13 17:06:20 +09:00
smoogipoo
264bd0e2aa Fix invalid room values 2018-12-13 16:06:30 +09:00
Dan Balasescu
f29c6987d2
Merge pull request #3849 from peppy/fix-skin-default-revert 
Fix reverting to default skin via settings button causing a hard crash
 2018-12-13 12:19:53 +09:00
Dean Herbert
4fc9902cd2 Fix reverting to default skin via settings button causing a hard crash 2018-12-12 21:30:21 +09:00
smoogipoo
bac4f42eac Fix backgrounds not quite working 2018-12-12 19:34:37 +09: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
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
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
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
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
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
Dan Balasescu
dc6574a9cc
Merge pull request #3833 from peppy/update-framework 
Update framework and other nuget packages
 2018-12-07 21:11:59 +09:00
smoogipoo
feb1adb51d Use bindable propagation rather than properties 2018-12-07 20:18:43 +09:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
Dan Balasescu
57980e81e5
Merge pull request #3830 from peppy/channel-selector-on-none 
Select channel selector when no channel is selected
 2018-12-07 18:13:31 +09:00
smoogipoo
29263d7154 Refactor bindable shenanigans in Match 2018-12-07 16:20:05 +09:00
smoogipoo
d68b4bb8e7 Remove custom action from DrawableRoom 2018-12-07 14:28:43 +09:00
Dean Herbert
d42c45c87e Add full tests 2018-12-07 14:01:51 +09:00
Dean Herbert
2f9de149dd Add constructor to create a PM channel from a User 2018-12-07 13:56:21 +09:00