Dean Herbert
|
0168b7eb88
|
Merge remote-tracking branch 'upstream/master' into profile-overlay-visual
|
2017-11-13 21:21:57 +09:00 |
|
Dean Herbert
|
b8c54adc83
|
Merge pull request #1465 from EVAST9919/profile-beatmaps-section
Add Beatmaps Section in the Profile Overlay
|
2017-11-13 21:16:44 +09:00 |
|
Dean Herbert
|
97fc4347e9
|
Merge branch 'master' into profile-beatmaps-section
|
2017-11-13 20:44:57 +09:00 |
|
Dean Herbert
|
f87962dcd0
|
Merge pull request #1496 from smoogipoo/fix-replay-clock
Fix replay clock always running one frame behind
|
2017-11-13 20:43:23 +09:00 |
|
Dean Herbert
|
1a8864fa00
|
Merge branch 'master' into fix-replay-clock
|
2017-11-13 20:15:37 +09:00 |
|
Dean Herbert
|
3fcfdd288c
|
Merge pull request #1498 from peppy/fix-player-loader-song-playback
Fix audio not playing during player loading
|
2017-11-13 20:15:26 +09:00 |
|
Dean Herbert
|
952530e1a8
|
Update framework
|
2017-11-13 20:03:58 +09:00 |
|
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 |
|
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 |
|
Dean Herbert
|
855b849e84
|
Merge pull request #1336 from EVAST9919/replay_speed
Add replay speed adjustment setting
|
2017-11-11 13:09:49 +09: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 |
|
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
|
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 |
|
Dan Balasescu
|
89fd92c15b
|
Merge branch 'master' into menu-select-transition-improvements
|
2017-11-10 21:03:24 +09:00 |
|
Dan Balasescu
|
ae0e3a01b8
|
Merge pull request #1484 from peppy/fix-player-audio-loading
Ensure we wait for audio track reset before proceeding with player execution
|
2017-11-10 20:53:12 +09:00 |
|
Dean Herbert
|
49731f4c05
|
Remove unused parmeter
|
2017-11-10 19:32:09 +09:00 |
|
Dean Herbert
|
bd2de89918
|
Why weren't these fixed previously
|
2017-11-10 19:26:25 +09:00 |
|
Dean Herbert
|
4a5a293376
|
Merge branch 'master' into replay-rewinding
|
2017-11-10 19:08:13 +09:00 |
|
Dean Herbert
|
819b0b1970
|
Update framework
|
2017-11-10 18:48:46 +09:00 |
|
Dean Herbert
|
bc54d4dd4f
|
Ensure we wait for audio track reset before proceeding with player execution
|
2017-11-10 18:32:15 +09:00 |
|