h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:05:35 +08:00
Code Issues Releases Wiki Activity
15,873 Commits 3 Branches 661 Tags 368 MiB
7ecd96e329
Commit Graph

15873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipoo
e3ad226075 Use the local beatmap if existing, fixing player not loading objects 2018-12-14 16:11:00 +09:00
Dean Herbert
9072af9792 Move bulk of method into separate private method with minor clean-ups 2018-12-14 15:48:34 +09:00
Dean Herbert
a6fc128094 Fix WaveOverlayContainer always being present 2018-12-14 15:41:05 +09:00
smoogipoo
83bf37a302 Enable/disable the view beatmap + ready buttons based on beatmap presence 2018-12-14 15:04:04 +09:00
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
Dean Herbert
a1543905ae
Merge branch 'master' into fix-api-failure-fail 2018-12-14 13:19:09 +09:00
smoogipoo
8e6a85058b Fix playlist-related errors 2018-12-14 12:35:05 +09:00
Dean Herbert
4e9f727759
Merge branch 'master' into netcoreapp22 2018-12-14 11:33:41 +09:00
Dean Herbert
eb0a09576a
Merge branch 'master' into polling-component 2018-12-13 20:07:49 +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
Dean Herbert
71e5ce59da Fix crash on exiting player during results transition 2018-12-13 16:23:51 +09:00
smoogipoo
264bd0e2aa Fix invalid room values 2018-12-13 16:06:30 +09:00
Dean Herbert
ac0fc6236c Fix crash when changing beatmap toggles at loading screen 2018-12-13 14:51:18 +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
Dean Herbert
ebd9375780 Add more tests 2018-12-12 20:31:58 +09:00
smoogipoo
bac4f42eac Fix backgrounds not quite working 2018-12-12 19:34:37 +09:00
Ivan Pavluk
d5437f7b4b
Merge branch 'master' into master 2018-12-12 17:24:52 +07:00
Ivan Pavluk
d8b409f81f Merge branch 'master' of https://github.com/pavlukivan/osu 2018-12-12 17:18:32 +07: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
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