smoogipoo
|
e8007ac37f
|
Implement multiplayer room leaderboard
|
2018-12-14 21:08:55 +09:00 |
|
Dean Herbert
|
0b5f3c00bf
|
Revert "Fix WaveOverlayContainer always being present"
This reverts commit a6fc128094.
|
2018-12-14 20:50:27 +09:00 |
|
Dean Herbert
|
4a408b7750
|
Merge pull request #3779 from pavlukivan/master
Fix multiple taiko objects behaviour
|
2018-12-14 20:05:27 +09:00 |
|
Dean Herbert
|
13cabac386
|
Update in line with framework changes
|
2018-12-14 19:56:21 +09:00 |
|
Dean Herbert
|
13f461099f
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2018-12-14 19:51:41 +09:00 |
|
smoogipoo
|
d9fc7c7d66
|
Separate out Leaderboard into BeatmapLeaderboard
|
2018-12-14 19:51:27 +09:00 |
|
Dean Herbert
|
2fe642a12b
|
Merge branch 'master' into master
|
2018-12-14 19:49:08 +09:00 |
|
Dean Herbert
|
fc5d5a7752
|
Merge branch 'master' into user-registration
|
2018-12-14 19:45:27 +09:00 |
|
Dean Herbert
|
79ae5e6fa5
|
Merge pull request #3855 from peppy/fix-waver-overlay-presence
Fix WaveOverlayContainer always being present
|
2018-12-14 19:42:01 +09:00 |
|
Dean Herbert
|
dfe60f6318
|
Merge pull request #3823 from peppy/netcoreapp22
Update projects to target .NET core 2.2
|
2018-12-14 19:41:52 +09:00 |
|
Dean Herbert
|
ec793bd708
|
Merge pull request #3848 from peppy/polling-component
Polling component
|
2018-12-14 19:41:36 +09:00 |
|
Dean Herbert
|
59a56b1a56
|
Merge pull request #3850 from peppy/fix-hitsound-change-crash
Fix crash when changing beatmap toggles at loading screen
|
2018-12-14 19:41:13 +09:00 |
|
Dean Herbert
|
578f7ff459
|
Merge pull request #3852 from peppy/fix-exit-crash
Fix crash on exiting player during results transition
|
2018-12-14 19:40:54 +09:00 |
|
Dean Herbert
|
4fb9a39038
|
Merge branch 'master' into fix-waver-overlay-presence
|
2018-12-14 19:40:36 +09:00 |
|
Dean Herbert
|
0610c34c98
|
Merge pull request #3838 from peppy/fix-api-failure-fail
Fix API getting stuck in connecting state on some exceptions
|
2018-12-14 19:40:28 +09:00 |
|
Dean Herbert
|
38fd35a0cf
|
Add polling time to ctor
|
2018-12-14 19:17:21 +09:00 |
|
Dean Herbert
|
64626f62db
|
Update framework
|
2018-12-14 19:02:25 +09:00 |
|
Dean Herbert
|
3fda40c4ac
|
Ignore annoying tests for now
|
2018-12-14 17:42:47 +09:00 |
|
smoogipoo
|
de0fc2a0de
|
Fix beatmap + ruleset being changeable
|
2018-12-14 17:35:18 +09:00 |
|
smoogipoo
|
5f0069eb83
|
Fix incorrect ruleset being sent to API
|
2018-12-14 17:35:05 +09:00 |
|
smoogipoo
|
edefdb18f8
|
Fix beatmap not having any mods when going into play
|
2018-12-14 16:16:38 +09:00 |
|
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 |
|
Dean Herbert
|
3110427eaf
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2018-12-12 19:54:56 +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 |
|