Dean Herbert
|
517a9ec40f
|
Merge branch 'master' into async-beatmap-panels
|
2017-11-22 19:05:42 +09:00 |
|
Dean Herbert
|
095cc44661
|
Merge pull request #1563 from peppy/fix-playback-control
Improve PlaybackContainer (and rename to PlaybackControl)
|
2017-11-22 19:00:25 +09:00 |
|
Dean Herbert
|
95275cd2ef
|
Merge branch 'master' into fix-playback-control
|
2017-11-22 18:49:25 +09:00 |
|
Dan Balasescu
|
01a88eb959
|
Merge pull request #1556 from peppy/working-beatmap-async-2
Add async load methods for WorkingBeatmap properties
|
2017-11-22 18:45:02 +09:00 |
|
Dan Balasescu
|
c7a6c90249
|
Merge branch 'master' into working-beatmap-async-2
|
2017-11-22 18:32:47 +09:00 |
|
Dan Balasescu
|
4cbdd97ed3
|
Merge branch 'master' into fix-playback-control
|
2017-11-22 18:21:35 +09:00 |
|
Dan Balasescu
|
00df32b6de
|
Merge pull request #1564 from Brayzure/final-hitobject-fail-fix
Fix results screen displaying after failing on the last hitobject
|
2017-11-22 18:19:30 +09:00 |
|
Brayzure
|
782a739370
|
Fix Results Screen After Failing Last Note
Fixes a bug where if you failed on the last hitobject, the AllJudged event will have already been invoked.
|
2017-11-21 23:00:00 -05:00 |
|
Dean Herbert
|
757bb6911e
|
Fix license header from wrong project
|
2017-11-22 12:06:31 +09:00 |
|
Dean Herbert
|
36d45f633d
|
Reorder methods
|
2017-11-22 11:57:09 +09:00 |
|
Dean Herbert
|
e3c5a599b6
|
Tidy some regressions
|
2017-11-22 11:36:29 +09:00 |
|
Dean Herbert
|
27fb598352
|
Update colours to match design
|
2017-11-22 11:34:54 +09:00 |
|
Dean Herbert
|
0f8499c580
|
Rename to PlaybackControl and add a TestCase
|
2017-11-22 11:22:46 +09:00 |
|
Dean Herbert
|
ff5404e57f
|
Remove need for AlwaysPresent
Also self-contains the tab options inside the tab control.
|
2017-11-22 11:21:48 +09:00 |
|
Dean Herbert
|
855acc9401
|
Fix leading space before percent sign
|
2017-11-22 11:17:10 +09:00 |
|
Dean Herbert
|
c06d6d0bbb
|
Rename weird method
|
2017-11-22 10:59:31 +09:00 |
|
Dean Herbert
|
461c8e8be0
|
Clean up state change logic
|
2017-11-22 10:55:06 +09:00 |
|
Dean Herbert
|
63d366ea4b
|
Bindables should be readonly
|
2017-11-22 10:54:33 +09:00 |
|
Dean Herbert
|
33936b0939
|
Merge branch 'master' into async-beatmap-panels
|
2017-11-21 23:33:15 +09:00 |
|
Dean Herbert
|
7c65048ae5
|
Merge pull request #1557 from miterosan/Fix_osu_crashing_when_an_unknown_ruleset_is_selected_in_the_config
Fix osu crashing if a invalid gamerule is given in the game.ini
|
2017-11-21 23:31:39 +09:00 |
|
Miterosan
|
b3b1f2018e
|
Fix osu crashing if a invalid gamerule is given in the game.ini
|
2017-11-21 15:13:00 +01:00 |
|
Dean Herbert
|
5e70b7a9f7
|
Add async load methods for WorkingBeatmap properties
|
2017-11-21 22:34:53 +09:00 |
|
Dean Herbert
|
2603219350
|
Load beatmap carousel panels asynchronously
|
2017-11-21 22:30:09 +09:00 |
|
Dean Herbert
|
a0488b8219
|
Merge pull request #1553 from peppy/async-beatmap-properties
Fix early access to beatmap in LogoVisualisation
|
2017-11-21 20:24:44 +09:00 |
|
Dean Herbert
|
aff217cd03
|
Fix early access to beatmap in LogoVisualisation
Missed this one..
|
2017-11-21 19:47:12 +09:00 |
|
Dean Herbert
|
790957e97e
|
Merge pull request #1551 from peppy/fix-info-wedge
Fix beatmap info wedge not displaying
|
2017-11-21 19:21:00 +09:00 |
|
Dean Herbert
|
7b916806f9
|
Merge branch 'master' into fix-info-wedge
|
2017-11-21 19:12:19 +09:00 |
|
Dan Balasescu
|
46e05684f4
|
Merge pull request #1520 from EVAST9919/editor-playback-speed
Add playback settings to the Editor
|
2017-11-21 18:49:56 +09:00 |
|
Dean Herbert
|
c2fcb2f9c7
|
Fix info wedge not displaying
|
2017-11-21 18:45:12 +09:00 |
|
EVAST9919
|
10f730a004
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed
|
2017-11-21 12:39:14 +03:00 |
|
Dean Herbert
|
ca1814eb19
|
Update framework
|
2017-11-21 18:38:54 +09:00 |
|
Dean Herbert
|
862529a452
|
Merge pull request #1538 from ppy/osu/sudden-death
Implement Sudden Death and Perfect mods
|
2017-11-21 18:23:59 +09:00 |
|
EVAST9919
|
41498ffad3
|
Apply suggestions
|
2017-11-21 12:22:19 +03:00 |
|
smoogipoo
|
217554f587
|
Remove redundant interface
|
2017-11-21 18:06:24 +09:00 |
|
smoogipoo
|
0d1b5ae44f
|
Adjust bottom bar sizing as suggested
|
2017-11-21 17:51:07 +09:00 |
|
smoogipoo
|
238756ec5d
|
Merge remote-tracking branch 'origin/master' into editor-playback-speed
|
2017-11-21 17:41:16 +09:00 |
|
Dan Balasescu
|
c39e76fdea
|
Merge branch 'master' into sudden-death
|
2017-11-21 17:37:40 +09:00 |
|
Dean Herbert
|
0859d9c533
|
Merge pull request #1542 from peppy/async-beatmap-properties
Reduce synchronous access to WorkingBeatmap properties
|
2017-11-21 17:36:40 +09:00 |
|
Dan Balasescu
|
142b74cc47
|
Merge branch 'master' into sudden-death
|
2017-11-21 17:32:31 +09:00 |
|
smoogipoo
|
c30d31e037
|
Remove extra alternateFailConditions function in Player
|
2017-11-21 17:30:19 +09:00 |
|
smoogipoo
|
fea56322f0
|
Fix SD not failing for the first note
|
2017-11-21 17:28:51 +09:00 |
|
Dean Herbert
|
10e835aea6
|
Merge branch 'master' into async-beatmap-properties
|
2017-11-21 17:18:19 +09:00 |
|
smoogipoo
|
18b9828c49
|
Merge UpdateFailed and CheckAlternateFailConditions
|
2017-11-21 17:11:07 +09:00 |
|
Dean Herbert
|
6867826f81
|
Merge pull request #1513 from EVAST9919/user-panels
Add supporter icon to the user panel
|
2017-11-21 17:10:31 +09:00 |
|
smoogipoo
|
1b27ce6198
|
Cleanup + renaming
|
2017-11-21 17:09:22 +09:00 |
|
Dean Herbert
|
8452446803
|
Merge branch 'master' into user-panels
|
2017-11-21 16:41:48 +09:00 |
|
Dan Balasescu
|
5d2c4d01a8
|
Merge pull request #1543 from peppy/handle-more-updater-exceptions
Handle more exceptions when checking for updates
|
2017-11-21 16:36:14 +09:00 |
|
Dean Herbert
|
62dcc316e2
|
Remove unnecessary using
|
2017-11-21 15:02:16 +09:00 |
|
Dean Herbert
|
8e63a7dd8d
|
Handle more exceptions when checking for updates
Should resolve #849.
|
2017-11-21 14:42:49 +09:00 |
|
Dean Herbert
|
553a7947d7
|
Remove AsyncLoadWrapper dependence in MusicController
|
2017-11-21 12:42:28 +09:00 |
|