|
|
c24c8543bb
|
Merge branch 'master' into mod-grow
|
2019-02-03 13:41:39 +08:00 |
|
|
|
85f3ad4576
|
Merge pull request #4199 from Joehuu/move-regular-issue-template
Move regular issue template to .github
|
2019-02-03 14:37:32 +09:00 |
|
|
|
cb23918512
|
Changes for mania world cup
|
2019-02-03 11:24:43 +09:00 |
|
|
|
257321b500
|
Move regular issue template to .github
|
2019-02-02 12:26:23 -08:00 |
|
|
|
482a01e7ba
|
Merge branch 'master' into tournament-tools
# Conflicts:
# osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
# osu.Game/OsuGameBase.cs
# osu.Game/Overlays/ChatOverlay.cs
# osu.Game/Screens/Menu/MainMenu.cs
# osu.Game/Screens/Tournament/Drawings.cs
# osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
# osu.Game/osu.Game.csproj
# osu.sln
|
2019-02-02 19:09:48 +09:00 |
|
|
|
e01f342ab0
|
wip
|
2019-02-02 17:11:25 +09:00 |
|
|
|
4c866e7940
|
Add PlaylistItemHandle.HandlePositionalInput override
|
2019-02-01 22:37:27 +03:00 |
|
|
|
f6318d3670
|
Add comment explaining *= 0.8f
|
2019-02-01 13:06:36 +01:00 |
|
|
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
|
|
52110e5dc0
|
Merge remote-tracking branch 'upstream/master' into android
|
2019-01-31 11:19:03 -06:00 |
|
|
|
be6b5419c4
|
Remove uncommented line
Didn't mean to push this
|
2019-01-31 18:10:44 +01:00 |
|
|
|
30292f44da
|
Fix Catch diffcalc being off
|
2019-01-31 17:57:59 +01:00 |
|
|
|
499e06797a
|
Merge pull request #4114 from peppy/fix-replay-multiplier-text
Fix replay playback speed not being displayed initially
|
2019-01-31 22:24:42 +09:00 |
|
|
|
ccc6968697
|
Merge pull request #4092 from peppy/download-tracking-component
Add a download tracking component
|
2019-01-31 22:24:32 +09:00 |
|
|
|
f25c61bee4
|
remove blank line
|
2019-01-31 13:50:31 +01:00 |
|
|
|
484b5dedbc
|
fix merge mistakes
|
2019-01-31 13:36:02 +01:00 |
|
|
|
e6fa78109d
|
Merge branch 'master' into correct-preview-loop
|
2019-01-31 13:30:55 +01:00 |
|
|
|
9968bdc0e4
|
Merge branch 'master' into download-tracking-component
|
2019-01-31 21:18:03 +09:00 |
|
|
|
3da851d93e
|
Merge branch 'master' into fix-replay-multiplier-text
|
2019-01-31 21:17:40 +09:00 |
|
|
|
67bb7b4db7
|
Merge pull request #4188 from peppy/fix-osu-logo
Fix osu! logo potentially appearing during game load in a weird place
|
2019-01-31 21:17:12 +09:00 |
|
|
|
7ce9a915b7
|
Merge branch 'master' into fix-osu-logo
|
2019-01-31 21:08:49 +09:00 |
|
|
|
011d8606c0
|
Merge pull request #4179 from peppy/reg-screen-focus-fix
Allow deselection of textboxes on registration screen on mobile devices
|
2019-01-31 21:08:34 +09:00 |
|
|
|
e59abac347
|
Merge branch 'master' into fix-osu-logo
|
2019-01-31 21:08:27 +09:00 |
|
|
|
b85e119bae
|
Merge branch 'master' into reg-screen-focus-fix
|
2019-01-31 21:08:12 +09:00 |
|
|
|
8c1f8ee596
|
restart correctly when leaving player (without noises)
|
2019-01-31 12:33:08 +01:00 |
|
|
|
cea82708ee
|
Merge branch 'master' into use-lifetime-optimization
|
2019-01-31 20:20:40 +09:00 |
|
|
|
befd40e545
|
Merge branch 'master' into download-tracking-component
|
2019-01-31 19:44:30 +09:00 |
|
|
|
f12d74774b
|
Merge remote-tracking branch 'upstream/master' into mod-grow
|
2019-01-31 19:43:18 +09:00 |
|
|
|
94b505fd7d
|
Merge pull request #4106 from ekrctb/catch-slider-conversion-tweak
Fix catch slider conversion for last droplets
|
2019-01-31 19:40:26 +09:00 |
|
|
|
981564d425
|
Merge branch 'master' into catch-slider-conversion-tweak
|
2019-01-31 19:40:16 +09:00 |
|
|
|
a5c1ef03f9
|
Merge branch 'master' into catch-slider-conversion-tweak
|
2019-01-31 19:27:08 +09:00 |
|
|
|
d1c8ee65a5
|
Fix osu! logo potentially appearing during game load in a weird place
|
2019-01-31 19:22:29 +09:00 |
|
|
|
e191609067
|
Merge remote-tracking branch 'upstream/master' into download-tracking-component
|
2019-01-31 19:17:48 +09:00 |
|
|
|
c7cf3ef1cd
|
Update licence headers
|
2019-01-31 19:17:42 +09:00 |
|
|
|
7860b2c3dc
|
Merge pull request #4173 from peppy/resources-via-nuget
Move osu-resources to nuget
|
2019-01-31 19:16:30 +09:00 |
|
|
|
7c6512118e
|
Fix importing progress bar not displaying
|
2019-01-31 19:15:17 +09:00 |
|
|
|
0b8bd520ab
|
Shake in all cases
|
2019-01-31 19:15:04 +09:00 |
|
|
|
b89694a969
|
Fix "importing" state display
|
2019-01-31 19:09:04 +09:00 |
|
|
|
041e3bf823
|
Handle unbinding better
|
2019-01-31 19:08:54 +09:00 |
|
|
|
b69a19f810
|
Attach progress immediately
|
2019-01-31 19:08:45 +09:00 |
|
|
|
121fb22da3
|
Merge branch 'master' into mod-grow
|
2019-01-31 17:59:50 +08:00 |
|
|
|
7e2f4af00d
|
remove whitespaces
|
2019-01-31 17:58:09 +08:00 |
|
|
|
e2347ae7bf
|
Merge branch 'master' into correct-preview-loop
|
2019-01-31 10:53:09 +01:00 |
|
|
|
c54a515b3e
|
Change where BindValueChange is immediately run
|
2019-01-31 18:49:54 +09:00 |
|
|
|
7f2fdac50e
|
Update signatures
|
2019-01-31 18:47:30 +09:00 |
|
|
|
327a34f12a
|
Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
|
2019-01-31 18:45:09 +09:00 |
|
|
|
09056fd0d8
|
Merge branch 'master' into resources-via-nuget
|
2019-01-31 18:40:45 +09:00 |
|
|
|
9b12803e96
|
Merge pull request #4181 from smoogipoo/iscreen
Make everything use the IScreen interface
|
2019-01-31 18:39:44 +09:00 |
|
|
|
ba6176fd03
|
Fix major regression in scaling behaviour
|
2019-01-31 18:28:46 +09:00 |
|
|
|
668a39ac6d
|
Merge branch 'master' into iscreen
|
2019-01-31 18:19:50 +09:00 |
|
