Commit Graph

8549 Commits

Author SHA1 Message Date
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 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 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
Dean Herbert 66f72baa39 Avoid LogoVisualisation accessing the track before it's loaded 2017-11-21 12:42:28 +09:00
Dean Herbert a2fc5b67ec Formatting fix 2017-11-21 12:42:28 +09:00
Dean Herbert bd616c1307 Simplify some property access 2017-11-21 12:42:28 +09:00
Dean Herbert be9c99ade3 Remove AsyncLoadWrapper dependence 2017-11-21 12:42:28 +09:00
Dean Herbert e7654254d2 Remove unused code 2017-11-21 12:42:28 +09:00
Dean Herbert 5db2d383ed Remove temporary variable in beatmap background update 2017-11-21 12:42:28 +09:00
Dan Balasescu 230599e3bf
Merge pull request #1540 from peppy/death-to-internal
Make many internal classes and methods public
2017-11-21 12:23:39 +09:00
Dean Herbert 2610cadd3c CI fixes 2017-11-21 12:11:29 +09:00
Dean Herbert 4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
Brayzure 2b0295ed86 Proper Public Method Case
- onFailCheck to OnFailCheck
2017-11-20 20:49:31 -05:00
Brayzure 6d74fd254c Remove Extraneous Using Statement
- System.Collections.Generic was leftover from a previous attempt
2017-11-20 20:25:14 -05:00
Dan Balasescu 2080a2fb02
Merge pull request #1525 from peppy/fix-import-duplicates
Fix "unique constraints" errors during beatmap import
2017-11-20 22:07:04 +09:00
Dean Herbert 165ac8cdec Update framework 2017-11-20 21:21:34 +09:00