1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 10:17:38 +08:00
Commit Graph

8438 Commits

Author SHA1 Message Date
Dean Herbert
ae6d4aa38d Merge remote-tracking branch 'upstream/master' into fix-replay-clock 2017-11-13 20:03:29 +09:00
Dean Herbert
46ad986301
Merge branch 'master' into profile-beatmaps-section 2017-11-13 20:02:40 +09:00
Dan Balasescu
dbcf876294
Merge branch 'master' into fix-player-loader-song-playback 2017-11-13 19:52:28 +09:00
Dan Balasescu
082e51969d
Merge pull request #1493 from smoogipoo/rewinding-robustness
Fix nested hit object judgements not being reverted
2017-11-13 19:52:14 +09:00
Dean Herbert
a2cb9d4086 Fix audio not playing during player loading
Regression due to changed audio initialisation logic.
2017-11-13 19:43:00 +09:00
Dean Herbert
e12d0c5875
Merge branch 'master' into rewinding-robustness 2017-11-13 19:35:48 +09:00
smoogipoo
495155874c Make sure that the clock is only updated once per time value 2017-11-13 19:30:57 +09:00
Dan Balasescu
c52da05b42
Merge pull request #1497 from peppy/logo-fixes
Fix multiple order-of-execution issues with osu! logo
2017-11-13 19:20:44 +09:00
Dean Herbert
49a5af60e2 Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
2017-11-13 18:43:16 +09:00
smoogipoo
0cec51110a Fix replay clock always running 1 frame behind
* Fixes swells never completing.
* Fixes forward playback missing notes every now and then.
* Probably more stuff.
2017-11-13 17:55:21 +09:00
Dean Herbert
615984ca9c
Merge pull request #1492 from peppy/performance-improvements
Fix some startup stutters
2017-11-13 14:04:31 +09:00
smoogipoo
ae8407a3f3 Fix nested hitobject judgements not being removed 2017-11-13 14:00:35 +09:00
smoogipoo
8adf0a6db3 Null-check in disposal of DatabasedKeyBindingInputManager 2017-11-13 13:58:44 +09:00
Dean Herbert
ee3a5b38f4
Merge branch 'master' into performance-improvements 2017-11-13 13:50:57 +09:00
Dan Balasescu
9056f2d978
Merge pull request #1491 from EVAST9919/replay-setting-visual
Replay speed setting visual improvements
2017-11-13 13:33:22 +09:00
Dean Herbert
e006090c5b Fix SpriteIcon loading textures on the update thread 2017-11-13 13:13:43 +09:00
EVAST9919
51adea2a60 Convert text to a local variable 2017-11-13 05:58:19 +03:00
EVAST9919
89e9f84753 Add padding to the text container 2017-11-13 05:52:05 +03:00
EVAST9919
ec75837965 Replay speed setting visual improvements 2017-11-13 05:04:21 +03:00
Dean Herbert
11077546d1 Load logo async 2017-11-13 09:50:37 +09:00
Dean Herbert
067985cad3
Merge pull request #1489 from peppy/update-framework
Update framework
2017-11-12 21:20:47 +09:00
Dean Herbert
ae9b7518e0 Update framework 2017-11-12 21:07:14 +09:00
EVAST9919
f5e510cdf2 CI fixes 2017-11-12 09:09:54 +03:00
EVAST9919
96e99d996b Add TestCase 2017-11-12 09:01:13 +03:00
EVAST9919
1792075cf9 Loading animation fix 2017-11-12 07:50:01 +03:00
EVAST9919
7c0b13f9ef CI fixes and minor visual improvements 2017-11-12 07:31:08 +03:00
EVAST9919
569780d37b Move Api request outside the scores container itself 2017-11-12 07:05:50 +03:00
EVAST9919
bc45843def Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-12 06:21:53 +03:00
EVAST9919
36ac002820 Fix incorrect null check 2017-11-11 18:25:16 +03:00
Dean Herbert
6300e182e2
Merge pull request #1487 from smoogipoo/version-overlay-switch
Add startup argument to disable the version overlay
2017-11-11 23:26:58 +09:00
smoogipoo
3d6bb3befe Add startup argument to disable the version overlay 2017-11-11 22:56:02 +09:00
Dean Herbert
9a8d9aa781
Merge pull request #1486 from peppy/update-frameworks
Update framework and resources
2017-11-11 15:58:43 +09:00
Dean Herbert
9e447fcb27 Update framework an resources 2017-11-11 15:53:01 +09:00
EVAST9919
74bcc61a67 Fix possible overlapping 2017-11-11 07:51:07 +03:00
EVAST9919
057ada0183 Fix nulls 2017-11-11 07:50:40 +03:00
EVAST9919
072e5db6ef Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-11 07:16:26 +03:00
Dean Herbert
855b849e84
Merge pull request #1336 from EVAST9919/replay_speed
Add replay speed adjustment setting
2017-11-11 13:09:49 +09:00
EVAST9919
944bdc1c25 CI fixes 2017-11-11 07:07:41 +03:00
Dean Herbert
7d4e1b6f22 Don't require a local storage variable for restoring playback speed 2017-11-11 13:03:46 +09:00
Dean Herbert
3142832693 Add precision to playback speed 2017-11-11 13:00:29 +09:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
Dean Herbert
3d1d66d886
Merge branch 'master' into replay_speed 2017-11-11 10:41:38 +09:00
Dean Herbert
fd5113ac3c
Merge pull request #1453 from smoogipoo/replay-rewinding
Implement the necessary interfaces to allow replay rewinding
2017-11-11 10:34:44 +09:00
EVAST9919
3261af5200 Add scores container 2017-11-11 03:46:06 +03:00
EVAST9919
6def49d6a4 Allow beatmap set response get online id 2017-11-11 01:51:42 +03:00
EVAST9919
4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
smoogipoo
5816d25358 Merge remote-tracking branch 'origin/master' into replay-rewinding 2017-11-10 22:19:17 +09:00
smoogipoo
e742c07f7d Update framework 2017-11-10 22:17:41 +09:00
smoogipoo
5277c3c164 Set the frame time appropriately to reverse judgements a little better 2017-11-10 22:11:25 +09:00
Dan Balasescu
c9673bcd0d
Merge pull request #1481 from peppy/menu-select-transition-improvements
Improve transition when exiting song select
2017-11-10 21:10:13 +09:00