Commit Graph

5729 Commits

Author SHA1 Message Date
c39e76fdea Merge branch 'master' into sudden-death 2017-11-21 17:37:40 +09:00
142b74cc47 Merge branch 'master' into sudden-death 2017-11-21 17:32:31 +09:00
c30d31e037 Remove extra alternateFailConditions function in Player 2017-11-21 17:30:19 +09:00
fea56322f0 Fix SD not failing for the first note 2017-11-21 17:28:51 +09:00
10e835aea6 Merge branch 'master' into async-beatmap-properties 2017-11-21 17:18:19 +09:00
18b9828c49 Merge UpdateFailed and CheckAlternateFailConditions 2017-11-21 17:11:07 +09:00
1b27ce6198 Cleanup + renaming 2017-11-21 17:09:22 +09:00
8452446803 Merge branch 'master' into user-panels 2017-11-21 16:41:48 +09:00
553a7947d7 Remove AsyncLoadWrapper dependence in MusicController 2017-11-21 12:42:28 +09:00
66f72baa39 Avoid LogoVisualisation accessing the track before it's loaded 2017-11-21 12:42:28 +09:00
bd616c1307 Simplify some property access 2017-11-21 12:42:28 +09:00
be9c99ade3 Remove AsyncLoadWrapper dependence 2017-11-21 12:42:28 +09:00
e7654254d2 Remove unused code 2017-11-21 12:42:28 +09:00
5db2d383ed Remove temporary variable in beatmap background update 2017-11-21 12:42:28 +09:00
2610cadd3c CI fixes 2017-11-21 12:11:29 +09:00
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
2b0295ed86 Proper Public Method Case
- onFailCheck to OnFailCheck
2017-11-20 20:49:31 -05:00
6d74fd254c Remove Extraneous Using Statement
- System.Collections.Generic was leftover from a previous attempt
2017-11-20 20:25:14 -05:00
881b4aa547 Merge branch 'master' into fix-import-duplicates 2017-11-20 21:20:32 +09:00
2c4a068940 Merge branch 'master' into fix-escape-no-repeat 2017-11-20 18:37:12 +09:00
7906bc030d Merge branch 'master' into fix-result-screen 2017-11-20 18:19:46 +09:00
a2e45293d6 Merge branch 'master' into fix-result-screen 2017-11-20 18:18:08 +09:00
6df18ffb7a FocusedTextBox should not handle repeated escapes 2017-11-20 18:14:58 +09:00
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
ecc2877be6 Fix possible null and adjust timeline width 2017-11-20 09:29:26 +03:00
9fe7ebc0ce Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-20 09:18:22 +03:00
8919e98d13 Fix CI issue 2017-11-20 11:32:20 +09:00
492120e88c Add migration for unique constraint on online id 2017-11-19 16:02:08 +09:00
0b5614e4ee fix result screen not showing name of mapper 2017-11-18 22:12:15 +01:00
9aaefb5e97 same for PaginatedScoreContainer 2017-11-18 20:09:31 +01:00
4264641303 fix missing text appearing when request returns nothing but beatmaps are already there 2017-11-18 18:27:30 +01:00
d704e9cf7e Ensure we correctly handle importing beatmaps/sets when the onlineID already exists locally 2017-11-19 01:45:17 +09:00
7d2bbc50a3 Add unique constraint on OnlineBeatmapID 2017-11-19 01:45:17 +09:00
9325730f5d Fix leaderboard fadeout causing constant flow changes
Also cleans up logic significantly.
2017-11-19 00:53:59 +09:00
2ff88c86ea CI fixes 2017-11-18 18:53:21 +03:00
915ccf3c84 Fix some layout issues 2017-11-18 18:41:00 +03:00
87f1368869 Add KudosuInfo container in the kudosu section 2017-11-18 18:19:35 +03:00
60778593c3 Make pressing space twice at main menu a bit smoother 2017-11-18 22:24:51 +09:00
b835f1b708 Merge branch 'master' into fix-main-menu-osu-logo 2017-11-18 21:53:04 +09:00
de4d8eb196 Implement Sudden Death and Perfect
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
4ee3a89c12 Remove using 2017-11-18 08:35:00 +03:00
34d8f94f99 Add track timer 2017-11-18 08:24:09 +03:00
c2d1de34fc Fix logo not always returning to the correct state when rapidly changing menus
Fixes #1005 for real
2017-11-18 11:19:15 +09:00
a741d6cea7 Fix incorrect score indexes in leaderboard 2017-11-18 04:46:02 +03:00
322dd1bd05 Rename variables to make more sense 2017-11-18 10:35:17 +09:00
f6ea5b0590 Remove duplicated code 2017-11-18 10:34:17 +09:00
c2b6e958f7 Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo 2017-11-18 10:28:00 +09:00
58e7263108 CI fixes 2017-11-18 03:09:09 +03:00
0b8fed4e5a Remove useless Dimention params 2017-11-18 01:51:23 +03:00
7492ab6495 Use GridContainer to place the bottom bar objects 2017-11-18 01:48:50 +03:00