1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 02:37:25 +08:00
Commit Graph

8690 Commits

Author SHA1 Message Date
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
Dean Herbert
881b4aa547
Merge branch 'master' into fix-import-duplicates 2017-11-20 21:20:32 +09:00
Dan Balasescu
5c1bfd257d
Merge pull request #1534 from peppy/fix-escape-no-repeat
FocusedTextBox should not handle repeated escapes
2017-11-20 18:51:28 +09:00
Dan Balasescu
2c4a068940
Merge branch 'master' into fix-escape-no-repeat 2017-11-20 18:37:12 +09:00
Dan Balasescu
fdd0cf29e4
Merge pull request #1527 from Aergwyn/fix-result-screen
fix result screen not showing name of mapper
2017-11-20 18:36:50 +09:00
Dan Balasescu
7906bc030d
Merge branch 'master' into fix-result-screen 2017-11-20 18:19:46 +09:00
Dan Balasescu
5061a81e88
Merge pull request #1526 from jorolf/profile-beatmaps-missing-fix
fix missing text appearing when request returns nothing but beatmaps are already there
2017-11-20 18:18:50 +09:00
Dan Balasescu
a2e45293d6
Merge branch 'master' into fix-result-screen 2017-11-20 18:18:08 +09:00
Dean Herbert
6df18ffb7a FocusedTextBox should not handle repeated escapes 2017-11-20 18:14:58 +09:00
Brayzure
da30d76f9b Implement Score Processor Mod Interface
- Add a delegate whenever we want to register an additional fail condition
2017-11-20 02:15:29 -05:00
EVAST9919
ecc2877be6 Fix possible null and adjust timeline width 2017-11-20 09:29:26 +03:00
EVAST9919
9fe7ebc0ce Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-20 09:18:22 +03:00
Dean Herbert
8919e98d13 Fix CI issue 2017-11-20 11:32:20 +09:00
Dean Herbert
492120e88c Add migration for unique constraint on online id 2017-11-19 16:02:08 +09:00
Aergwyn
0b5614e4ee fix result screen not showing name of mapper 2017-11-18 22:12:15 +01:00
jorolf
9aaefb5e97 same for PaginatedScoreContainer 2017-11-18 20:09:31 +01:00
jorolf
4264641303 fix missing text appearing when request returns nothing but beatmaps are already there 2017-11-18 18:27:30 +01:00
Dean Herbert
d704e9cf7e Ensure we correctly handle importing beatmaps/sets when the onlineID already exists locally 2017-11-19 01:45:17 +09:00