h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 00:47:26 +08:00
Code Issues Releases Wiki Activity
20,214 Commits 3 Branches 648 Tags 271 MiB
c22633967b
Commit Graph

20214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
c22633967b Merge remote-tracking branch 'upstream/master' into user-best-score 2019-07-11 11:32:47 +09:00
Dean Herbert
85f2212ebc Reduce spacing and font for rank position 2019-07-11 11:32:42 +09:00
Dean Herbert
8f9b8ed5a1 Simplify information propagation logic 2019-07-11 11:17:33 +09:00
Dean Herbert
cc9ee472d6 Move score nulling out of loading property 2019-07-11 11:07:30 +09:00
Dean Herbert
a49bde7ed3 Move protected below public 2019-07-11 10:38:32 +09:00
Dean Herbert
f9e3b521f3
Merge pull request #5326 from iiSaLMaN/fix-beatmap-length-issues 
Use the correct property to retrieve the milliseconds for online length
 2019-07-11 08:21:31 +09:00
iiSaLMaN
b2f23a10c8 Use the correct property to retrieve the milliseconds 2019-07-10 23:12:18 +03:00
Andrei Zavatski
953d32366c Move request inside the ScoresContainer again 2019-07-10 19:40:29 +03:00
Andrei Zavatski
a041421e0d Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score 2019-07-10 19:39:41 +03:00
Dean Herbert
e23d42522c
Merge pull request #5295 from peppy/fix-misc-inspections 
Fix a few inspections from EAP r#
 2019-07-11 00:56:18 +09:00
Dean Herbert
f21e700b7a Code style cleanup 2019-07-11 00:42:14 +09:00
Dean Herbert
c76b340a28
Remember user's selected pause state when changing game screens (#5289) 
Remember user's selected pause state when changing game screens

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-07-11 00:37:09 +09:00
Dean Herbert
2285c2b1df
Merge branch 'master' into user-best-score 2019-07-11 00:31:26 +09:00
Dean Herbert
3b448b0086 Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master 2019-07-11 00:25:35 +09:00
Dean Herbert
ad873b542a Simplify editor logic 2019-07-11 00:22:40 +09:00
Dean Herbert
6819c528db Use canBeNull instead of needlessly caching MusicController for tests 2019-07-11 00:20:01 +09:00
Dean Herbert
b225b2eb39 Rename to IsUserPaused 2019-07-11 00:18:19 +09:00
Desconocidosmh
9986178bf4 Revert "Add caching MusicController in tests" 
This reverts commit fae3348a69.
 2019-07-11 00:14:45 +09:00
Dean Herbert
bcedba432e
Implement sorting by BPM and Length (#5290) 
Implement sorting by BPM and Length
 2019-07-10 23:08:05 +09:00
iiSaLMaN
c3315e805f Use milliseconds for BasicStats' beatmap length 2019-07-10 16:49:32 +03:00
Salman Ahmed
1eed6955fa
Merge branch 'master' into implement-other-sorting-criteria 2019-07-10 14:33:48 +03:00
Desconocidosmh
fae3348a69 Add caching MusicController in tests 2019-07-10 13:20:23 +02:00
Desconocidosmh
100d15e651 Move reseting tempo to Editor 2019-07-10 10:43:02 +02:00
Desconocidosmh
8b8e67fd72 Add accidentally deleted code 2019-07-10 10:41:52 +02:00
Andrei Zavatski
a0389c338b CI fixes 2019-07-09 17:56:08 +03:00
iiSaLMaN
e73f22eff8 Convert length retrieved from online to milliseconds 2019-07-09 17:53:34 +03:00
Andrei Zavatski
9907a58ec4 Revert animations and apply suggested changes 2019-07-09 17:38:17 +03:00
iiSaLMaN
1485c273ab Describe the xmldoc mo 2019-07-09 17:31:15 +03:00
iiSaLMaN
f3329f4d79 Use a more readable code for calculating length 2019-07-09 17:22:21 +03:00
iiSaLMaN
38bc652bf2 Remove sorting by length for beatmaps 2019-07-09 17:02:51 +03:00
Dean Herbert
bdcdb3a7a6
Merge branch 'master' into user-best-score 2019-07-09 22:19:31 +09:00
Dean Herbert
16ee14fd1d
Fix iOS visual tests not supporting raw keyboard handler (#5306) 
Fix iOS visual tests not supporting raw keyboard handler
 2019-07-09 22:17:28 +09:00
Oskar Solecki
2fb9b5dd69
Merge branch 'master' into master 2019-07-09 13:49:07 +02:00
iiSaLMaN
e0c1fb7818 Compare by milliseconds for length 2019-07-09 14:47:54 +03:00
Shane Woolcock
2472c6b4b1 Fix iOS visual tests not supporting raw keyboard handler 2019-07-09 21:07:29 +09:30
Oskar Solecki
3472979d0b
Make sure exiting editor doesn't unpause the music 2019-07-09 12:53:40 +02:00
Desconocidosmh
2546f647be Completely change the way we fix the bug 2019-07-09 11:32:49 +02:00
Andrei Zavatski
276873ff8a remove unused field 2019-07-09 12:28:59 +03:00
Andrei Zavatski
e8b9b1b0bf visibility logic adjustments 2019-07-09 12:16:58 +03:00
Andrei Zavatski
8d6af1625a Visibility improvements 2019-07-09 11:40:51 +03:00
Andrei Zavatski
eb4ef8f6ac CI fixes 2019-07-09 08:25:10 +03:00
Andrei Zavatski
8d46d4a28e Fix grade layout 2019-07-09 08:09:31 +03:00
Andrei Zavatski
5d81445454 Move api request outside the scores container 2019-07-09 08:05:34 +03:00
Andrei Zavatski
ebff35de66 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score 2019-07-09 06:42:39 +03:00
Oskar Solecki
8f7476e9cc
Remove unused stuff 2019-07-09 00:26:57 +02:00
Oskar Solecki
52b54506c6
Merge pull request #1 from Desconocidosmh/Fix-music-playing-while-exiting-from-editor 
Fix music playing while exiting from editor
 2019-07-09 00:11:40 +02:00
Oskar Solecki
a4957909b4
Merge branch 'master' into Fix-music-playing-while-exiting-from-editor 2019-07-09 00:11:29 +02:00
Desconocidosmh
338371c3fc Fix music playing while exiting from editor 2019-07-09 00:08:18 +02:00
Dean Herbert
e05181928e
Fix mods not being reset when leaving a replay (#5293) 
Fix mods not being reset when leaving a replay

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-07-08 22:53:34 +09:00
Dean Herbert
8a98aff318
Merge branch 'master' into replay-local-mods 2019-07-08 22:38:02 +09:00