1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-27 20:22:56 +08:00
Commit Graph

6340 Commits

Author SHA1 Message Date
Dean Herbert
6d9951d9af Use FillFlow rather than manually specifying positions 2017-11-23 17:32:41 +09:00
Dean Herbert
2ff21bbc6c Move descriptions to constructor 2017-11-23 17:29:20 +09:00
Dean Herbert
9d481eba96
Merge branch 'master' into kudosu-section 2017-11-23 17:19:42 +09:00
FreezyLemon
2cc2323791 Style changes (removing newline from before second constructor parameter) 2017-11-23 09:12:23 +01:00
FreezyLemon
d6f532171b Implementation fix (since the default delay is now 500 and not 0 this is necessary to ensure the same functionality) 2017-11-23 09:11:52 +01:00
Dean Herbert
6e51664544
Merge branch 'master' into beatmap-overlay-download 2017-11-23 17:11:28 +09:00
Dean Herbert
85827f83eb Perform a reload on objects when Refreshing them
Previously, it was possible for an object to be "refreshed" with a stale cached state from the current thread's context.

This ensures a check against the database is performed as well.

Resolves #1562.
2017-11-23 17:04:39 +09:00
Dean Herbert
1824540325 Schedule calls to correct thread
These could be fired from an async worker thread (for instance, maintenance operations).
2017-11-23 17:02:54 +09:00
Dean Herbert
288c21dfec Move TestCase descriptions to attributes
Depends on https://github.com/ppy/osu-framework/pull/1186.
2017-11-23 16:09:32 +09:00
Aergwyn
0df5432f5e removed line that set metadata per beatmap to null 2017-11-22 21:45:18 +01:00
FreezyLemon
18b0b77f0a Added requested changes. Mainly changing lambdas to direct function references. 2017-11-22 21:41:50 +01:00
jorolf
22348a3d67 Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section 2017-11-22 21:14:11 +01:00
FreezyLemon
7d428875b8 Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor) 2017-11-22 15:46:04 +01:00
Aergwyn
e5dfe4ff2e Make error more verbose when beatmap import fails (#1537)
Add name of beatmap set to error message if import fails
2017-11-22 19:35:25 +09:00
Dean Herbert
517a9ec40f
Merge branch 'master' into async-beatmap-panels 2017-11-22 19:05:42 +09:00
Dean Herbert
95275cd2ef
Merge branch 'master' into fix-playback-control 2017-11-22 18:49:25 +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
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
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
FreezyLemon
1d41e7cc8a Removed newline at end 2017-11-21 20:15:42 +01:00
FreezyLemon
bf0184c06d One more small style fix 2017-11-21 19:34:01 +01:00
FreezyLemon
2203a84300 Small fixes and style corrections 2017-11-21 19:16:44 +01:00
FreezyLemon
fd7ac9b6fc Switched to the new LoadWrapper class for asynchronous loading (LoadComponentAsync not used here since it's not possible to call that method on a component that has not finished loading, and we're in the constructor where it would be called) 2017-11-21 16:18:32 +01:00
FreezyLemon
870807c265 Switched over to the new LoadWrapper class for all delayed loading. 2017-11-21 16:17:33 +01:00
FreezyLemon
a033eb46d3 Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance. 2017-11-21 16:12:23 +01:00
Dean Herbert
33936b0939
Merge branch 'master' into async-beatmap-panels 2017-11-21 23:33:15 +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
smoogipoo
6686fe9ecd Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-21 19:55:28 +09:00
smoogipoo
f9ad4b6acb Make categoryDifficulties return doubles to improve decimal accuracy 2017-11-21 19:55:09 +09:00
Dean Herbert
aff217cd03 Fix early access to beatmap in LogoVisualisation
Missed this one..
2017-11-21 19:47:12 +09:00
smoogipoo
0f8d4a455a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-21 19:18:06 +09:00
Dean Herbert
7b916806f9
Merge branch 'master' into fix-info-wedge 2017-11-21 19:12:19 +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
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
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
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
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
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
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
Dean Herbert
881b4aa547
Merge branch 'master' into fix-import-duplicates 2017-11-20 21:20:32 +09:00
Dan Balasescu
2c4a068940
Merge branch 'master' into fix-escape-no-repeat 2017-11-20 18:37:12 +09:00
Dan Balasescu
7906bc030d
Merge branch 'master' into fix-result-screen 2017-11-20 18:19:46 +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
jorolf
66c51c7b44 cleanup 2017-11-19 14:33:50 +01:00
jorolf
4281d76bcf historical section now shows the most played beatmaps 2017-11-19 14:19:05 +01:00
jorolf
48b44e8e4e add a user most played beatmaps request/response 2017-11-19 14:18:14 +01:00
jorolf
1f379cab8f move BeatmapMetadataContainer to a separate class 2017-11-19 14:17:14 +01:00
jorolf
fe7f9cccaa BeatmapSetCover can display other types of covers now 2017-11-19 14:16:00 +01: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
Dean Herbert
7d2bbc50a3 Add unique constraint on OnlineBeatmapID 2017-11-19 01:45:17 +09:00
Dean Herbert
9325730f5d Fix leaderboard fadeout causing constant flow changes
Also cleans up logic significantly.
2017-11-19 00:53:59 +09:00
EVAST9919
2ff88c86ea CI fixes 2017-11-18 18:53:21 +03:00
EVAST9919
915ccf3c84 Fix some layout issues 2017-11-18 18:41:00 +03:00
EVAST9919
87f1368869 Add KudosuInfo container in the kudosu section 2017-11-18 18:19:35 +03:00
Dean Herbert
60778593c3 Make pressing space twice at main menu a bit smoother 2017-11-18 22:24:51 +09:00
Dean Herbert
b835f1b708
Merge branch 'master' into fix-main-menu-osu-logo 2017-11-18 21:53:04 +09:00
Brayzure
de4d8eb196 Implement Sudden Death and Perfect
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
EVAST9919
4ee3a89c12 Remove using 2017-11-18 08:35:00 +03:00
EVAST9919
34d8f94f99 Add track timer 2017-11-18 08:24:09 +03:00
Dean Herbert
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
EVAST9919
a741d6cea7 Fix incorrect score indexes in leaderboard 2017-11-18 04:46:02 +03:00
Dean Herbert
322dd1bd05 Rename variables to make more sense 2017-11-18 10:35:17 +09:00
Dean Herbert
f6ea5b0590 Remove duplicated code 2017-11-18 10:34:17 +09:00
Dean Herbert
c2b6e958f7 Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo 2017-11-18 10:28:00 +09:00
EVAST9919
58e7263108 CI fixes 2017-11-18 03:09:09 +03:00
EVAST9919
0b8fed4e5a Remove useless Dimention params 2017-11-18 01:51:23 +03:00
EVAST9919
7492ab6495 Use GridContainer to place the bottom bar objects 2017-11-18 01:48:50 +03:00
EVAST9919
0cad5a5ca3 Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-18 01:15:50 +03:00
smoogipoo
ddf402d948 Add nullchecks in Disposal where population methods return nulls 2017-11-17 22:14:28 +09:00
smoogipoo
4ced1b6490 Use more of the properties 2017-11-17 22:10:24 +09:00
smoogipoo
dacabd4a90 Merge branch 'master' into lazy-working-beatmap 2017-11-17 21:46:19 +09:00
smoogipoo
433f4f03a1 Actually initialise DifficultyCalculator with mods 2017-11-17 20:19:49 +09:00
EVAST9919
07e0aba01c Remove using 2017-11-17 14:10:13 +03:00
EVAST9919
1680c0905f Fix track tempo could be less than 1 on exiting the editor 2017-11-17 14:02:07 +03:00
EVAST9919
cc04d5bc61 Add all the objects to the PlaybackContainer 2017-11-17 13:35:41 +03:00
Dean Herbert
6b591ac77f Add missing initialisation 2017-11-17 19:17:00 +09:00
Dean Herbert
b3aae2340b Avoid accessing beatmaps from BeatSyncedContainer until they are loaded 2017-11-17 18:38:11 +09:00
Dean Herbert
d75e3d8e81 Use lazy for WorkingBeatmap component loading 2017-11-17 18:37:46 +09:00
EVAST9919
d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
Dean Herbert
8bd59ff0b3 Fix osu! logo occasionally being in the wrong state on entering the main menu 2017-11-17 17:40:10 +09:00
smoogipoo
5d753427f6 Fix up DT not affecting hitobject densities 2017-11-17 17:28:22 +09:00
Dean Herbert
ea487861f8 Merge remote-tracking branch 'upstream/master' into optimise-leaderboards 2017-11-17 17:28:01 +09:00
smoogipoo
bf44b3d0ef Cleanups 2017-11-17 16:54:50 +09:00
smoogipoo
825aa6570e Fix rebase issues 2017-11-17 14:37:19 +09:00
smoogipoo
1ed2ce324f Further improvements to TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
smoogipoo
1e023f0419 Implement PerformanceCalculator testcase 2017-11-17 14:37:19 +09:00
smoogipoo
38fe95d94a Add basic display for pp in TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
smoogipoo
95fd323c6b Fix ManiaDifficultyCalculator possibly failing due to nullref 2017-11-17 14:37:06 +09:00
smoogipoo
ac6213d1fa CI fixes 2017-11-17 14:26:33 +09:00
smoogipoo
7892eefd68 Fix up mod application + beatmap/hitobject references 2017-11-17 14:23:52 +09:00
smoogipoo
cc1720241e Fix DifficultyCalculator using incorrect mods 2017-11-17 12:36:51 +09:00
smoogipoo
5781b45b39 Set TimeRate after mod application 2017-11-17 12:36:17 +09:00
smoogipoo
18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
smoogipoo
62155e6dd5 Make DifficultyCalculator support mod applications
Fixes https://github.com/ppy/osu/issues/476.
2017-11-17 12:36:07 +09:00
EVAST9919
d301ad1435 Add supporter icon to the user panel 2017-11-16 20:06:49 +03:00
Dean Herbert
6c40cf08cc Optimise leaderboard display
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
naoey
97c5956083 Make download buttons disappear instead of closing overlay.
- Also unbind event handlers
- Remove unused field
2017-11-16 19:17:22 +05:30
Dean Herbert
62358c0b53
Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
Dan Balasescu
d5bbf0fdd2
Merge branch 'master' into fix-select-no-beatmap 2017-11-16 00:26:15 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
naoey
df53b884ea Removed unused stuff. 2017-11-15 18:00:19 +05:30
naoey
bbe555dc3c Pass noVideo flag on... 2017-11-15 17:49:41 +05:30
naoey
5aeeb9aac6 Merge remote-tracking branch 'upstream/master' into beatmap-overlay-download 2017-11-15 17:38:38 +05:30
Dean Herbert
8011048540 Fix hard crash when clicking play button with no map selected
Resolves #1507.
2017-11-15 20:03:18 +09:00
Dean Herbert
4b3e7c3613
Merge branch 'master' into overlay-improvements 2017-11-15 19:43:34 +09:00
Dan Balasescu
70d960ba73
Merge branch 'master' into remove-sub-scroll 2017-11-15 19:26:42 +09:00
Dean Herbert
fda810eb8f Remove scrollability from sub-areas in beatmap overaly
The areas that are scrollable inside the beatmap overlay make for a very frustrating experience. Let's disable them for now.
2017-11-15 19:02:56 +09:00
Dean Herbert
af03d883f1 Ensure overlay containers scroll to top when new information is presented 2017-11-15 19:01:30 +09:00
Dean Herbert
8a407a68b3 Ensure only one information overlay is open at once 2017-11-15 18:49:06 +09:00
Dean Herbert
eaf1a60fe1
Merge branch 'master' into beatmap_scores 2017-11-15 17:58:07 +09:00
EVAST9919
60a2d84e09 Make the x position depends on the avatar size 2017-11-15 10:43:32 +03:00
EVAST9919
093ebb8b17 Apply suggested changes 2017-11-15 10:21:07 +03:00
EVAST9919
ea2fa5fa00 Fix wrong ratings calculations 2017-11-15 09:48:40 +03:00
Dean Herbert
7dd2720b4b
Merge branch 'master' into beatmap_scores 2017-11-15 13:41:38 +09:00
Dean Herbert
a30cf27506 Fix incorrect json mapping for preview urls 2017-11-15 13:26:11 +09:00
Dean Herbert
6933a41b75 Add back high resolution cover regressions 2017-11-15 13:26:02 +09:00
Dean Herbert
6ef60d0b4e
Merge branch 'master' into beatmap-overlay-scores 2017-11-15 13:18:32 +09:00
EVAST9919
8688afecde Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-14 20:13:07 +03:00
Dean Herbert
fa4ae72a06
Merge branch 'master' into warning-fixes 2017-11-14 20:43:23 +09:00
Dean Herbert
4b9edc4645
Merge branch 'master' into profile_beatmaps 2017-11-14 20:27:17 +09:00
Dean Herbert
44671ad9cb Move common width definition to base class 2017-11-14 19:03:50 +09:00
Dean Herbert
f96f7e696d Tidy up variables a bit 2017-11-14 18:53:09 +09:00
Dean Herbert
160b988735 Reduce number of rqeuests to display beatmaps in profile
Comes at the cost of losing some information which should be loaded. This will be fixed at the osu-web end.
2017-11-14 18:51:41 +09:00
smoogipoo
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
smoogipoo
bd7a6a90f5 Remove unused fields 2017-11-14 17:43:19 +09:00
EVAST9919
08ce2705c6 Add pending and graveyarded beatmapsets to profile page 2017-11-14 08:26:44 +03:00
smoogipoo
f6cbde95e2 Remove unused files 2017-11-14 13:06:40 +09:00
smoogipoo
cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
EVAST9919
fa6d3f9792 Reduce isLoading calls 2017-11-13 18:49:10 +03:00
EVAST9919
d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00
Dean Herbert
0168b7eb88 Merge remote-tracking branch 'upstream/master' into profile-overlay-visual 2017-11-13 21:21:57 +09:00
Dean Herbert
97fc4347e9
Merge branch 'master' into profile-beatmaps-section 2017-11-13 20:44:57 +09:00
Dean Herbert
1a8864fa00
Merge branch 'master' into fix-replay-clock 2017-11-13 20:15:37 +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
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
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
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
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
Unknown
16e48ed187 Hook up download logic with BeatmapSetOverlay download buttons.
- Add noVideo option to DownloadBeatmapSetRequest
- Make Download fire an event with new download instead of returning it
2017-11-12 18:41:10 +05:30
EVAST9919
96e99d996b Add TestCase 2017-11-12 09:01:13 +03:00
EVAST9919
1792075cf9 Loading animation fix 2017-11-12 07:50:01 +03:00
EVAST9919
7c0b13f9ef CI fixes and minor visual improvements 2017-11-12 07:31:08 +03:00
EVAST9919
569780d37b Move Api request outside the scores container itself 2017-11-12 07:05:50 +03:00
EVAST9919
36ac002820 Fix incorrect null check 2017-11-11 18:25:16 +03:00
EVAST9919
74bcc61a67 Fix possible overlapping 2017-11-11 07:51:07 +03:00
EVAST9919
057ada0183 Fix nulls 2017-11-11 07:50:40 +03:00
EVAST9919
072e5db6ef Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-11 07:16:26 +03:00
EVAST9919
944bdc1c25 CI fixes 2017-11-11 07:07:41 +03: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
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
Dean Herbert
3d1d66d886
Merge branch 'master' into replay_speed 2017-11-11 10:41:38 +09:00
EVAST9919
3261af5200 Add scores container 2017-11-11 03:46:06 +03:00
EVAST9919
6def49d6a4 Allow beatmap set response get online id 2017-11-11 01:51:42 +03: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
5277c3c164 Set the frame time appropriately to reverse judgements a little better 2017-11-10 22:11:25 +09:00
Dan Balasescu
89fd92c15b
Merge branch 'master' into menu-select-transition-improvements 2017-11-10 21:03:24 +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
bc54d4dd4f Ensure we wait for audio track reset before proceeding with player execution 2017-11-10 18:32:15 +09:00
EVAST9919
7280f77a02 Trim whitespace 2017-11-10 03:06:21 +03:00
EVAST9919
c2f3971188 Extend Beatmap Set Response 2017-11-10 03:01:11 +03:00
EVAST9919
de3aea8715 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-09 20:03:34 +03:00
EVAST9919
68c4da0810 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-09 20:02:47 +03:00
Dean Herbert
9e82fc21ac Improve transition when exiting song select
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
2017-11-10 01:10:44 +09:00
Dean Herbert
5eb94f7e68 Fix loader pushing children screens before it is displayed itself 2017-11-09 23:29:56 +09:00
EVAST9919
a9b58a2ad2 Drawable score visual improvements 2017-11-09 17:12:06 +03:00
EVAST9919
c9353e3795 Fix humanizer package path 2017-11-09 15:49:17 +03:00
Dean Herbert
724540ceaa Fix toolbar not appearing at main menu 2017-11-09 20:38:34 +09:00
Dan Balasescu
b6fa871f58
Merge branch 'master' into user-overlay-crash-fix 2017-11-09 19:24:15 +09:00
Dan Balasescu
feca7a00c2
Merge branch 'master' into user-overlay-crash-fix 2017-11-09 19:21:05 +09:00
Dan Balasescu
128143a1f4
Merge branch 'master' into null_check 2017-11-09 18:39:06 +09:00
Dean Herbert
5547348d07
Merge branch 'master' into profile-beatmaps-section 2017-11-09 18:31:46 +09:00
Dean Herbert
598e1652dc Adjust timings 2017-11-09 18:12:33 +09:00
Dean Herbert
6d56b3c2df Hide triangles during outro 2017-11-09 17:52:38 +09:00
Dean Herbert
e3a868744e
Merge branch 'master' into intro-v2 2017-11-09 17:48:42 +09:00
Dean Herbert
a1cee2e61e Merge remote-tracking branch 'upstream/master' into single-osu-logo 2017-11-09 17:39:14 +09:00
Dean Herbert
4874371dbf Rename methods back 2017-11-09 17:38:20 +09:00
smoogipoo
66ee9d1631 Update in-line with framework changes 2017-11-09 17:04:04 +09:00
smoogipoo
348083f589 Update with framework state transformation
Removes explicit initial state setting in DrawableOsuHitObjects.
2017-11-09 14:05:05 +09:00
Dean Herbert
8c0eee84a2
Merge branch 'master' into config-precision 2017-11-09 13:55:52 +09:00
EVAST9919
edeeefea3b Fix missing text has been shown before api request has been completed 2017-11-08 20:42:24 +03:00
EVAST9919
2e67685762 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-08 20:17:49 +03:00
Dean Herbert
e2005c4431 Add comment explaining necessity of AlwaysPresent for now 2017-11-08 20:36:18 +09:00
Dean Herbert
df6c808d28 Adjust animation to designer-san's liking 2017-11-08 17:04:36 +09:00
Dean Herbert
cabb22b6d1 Merge branch 'single-osu-logo' into intro-v2 2017-11-08 16:43:07 +09:00
Dean Herbert
c2d4a213b1 Rename logo-related methods 2017-11-08 16:34:03 +09:00
Dean Herbert
a8bacd1ed4 Remove unnecessary private method /shrug 2017-11-08 14:46:47 +09:00
Dean Herbert
7ad498cb29 Remove unused puzzle pieces 2017-11-08 14:45:01 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo 2017-11-08 14:37:20 +09:00
Dean Herbert
41fcecf759 Add intro in to actual game 2017-11-08 14:31:11 +09:00
Dean Herbert
d8d7165164 Add a test case which starts the game 2017-11-08 13:52:44 +09:00
Dean Herbert
713d730d10 Simplify restart process and defaults initialisation 2017-11-08 13:32:03 +09:00
Dean Herbert
1771e003f7 Simplify more 2017-11-08 12:13:30 +09:00
Dean Herbert
419f041291 Fix text alignment 2017-11-08 12:12:27 +09:00
Dean Herbert
f83c095269 Simplify more 2017-11-08 12:10:32 +09:00
Dean Herbert
89426e1c11 Simplify lines 2017-11-08 12:07:52 +09:00
Dean Herbert
7dcdf78608 Make bars and circles better 2017-11-08 12:06:22 +09:00
Dean Herbert
a72e798b85 bar -> line 2017-11-08 11:21:50 +09:00
Dean Herbert
97b238d084 Simplify intro sequence a bit more 2017-11-08 11:20:21 +09:00
Dean Herbert
552a361a24 Merge remote-tracking branch 'upstream/master' into intro-v2 2017-11-08 11:08:42 +09:00
Miterosan
567cd6316c beatmap can not be null in DifficultyColouredContainer.cs 2017-11-07 23:17:45 +01:00
Miterosan
b2e49c1e71 line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:17:26 +01:00
Miterosan
13e75780d7 beatmap and stream can not be null in OsuLegacyDecoder.cs 2017-11-07 23:17:07 +01:00
Miterosan
1e6f1d07d2 line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:16:42 +01:00
Miterosan
a15ab785f2 palette can not be null in DifficultyColouredContainer.cs 2017-11-07 23:16:19 +01:00
Miterosan
36ce287b88 panels can not be null in BeatmapSetHeader.cs 2017-11-07 23:15:51 +01:00
Miterosan
0f539d24f0 Localisation can not be null in BeatmapSetHeader.cs 2017-11-07 23:15:21 +01:00
Miterosan
dc317139c9 beatmap can not be null in BeatmapSetHeader.cs 2017-11-07 23:15:02 +01:00
Miterosan
bc94179032 workingbeatmap can not be null in BeatmapBackgroundSprite.cs 2017-11-07 23:14:22 +01:00
Miterosan
d7dee57886 set can not be null in BeatmapSetCover.cs 2017-11-07 23:13:56 +01:00
Miterosan
dd3874daa8 beatmap can not be null in BeatmapPanel.cs 2017-11-07 23:13:32 +01:00
Miterosan
289a1346fc beatmap can not be null in DifficultyIcon.cs 2017-11-07 23:13:09 +01:00
Miterosan
a8acea9cdb stream can not be null in BeatmapDecoder.cs 2017-11-07 23:12:30 +01:00
Miterosan
8dc24a52a7 beatmap and line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:11:33 +01:00
Miterosan
d27dced3af beatmap and line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:11:16 +01:00
Miterosan
34083baa4d beatmap and line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:11:04 +01:00
Miterosan
0287d3d7a0 beatmap and line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:10:54 +01:00
Miterosan
cf296d4bb2 beatmap and line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:10:41 +01:00
Miterosan
2f47b336e2 beatmap and line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:10:30 +01:00
Miterosan
080c3fabba BeatmapSet and manager can not be null in BeatmapGroup.cs 2017-11-07 23:10:06 +01:00
Miterosan
1f620886cb beatmap and line can not be null in OsuLegacyDecoder.cs 2017-11-07 23:09:16 +01:00
Miterosan
840946d160 list can not be null in ControlPointInfo.cs 2017-11-07 23:08:24 +01:00
Miterosan
e430256b09 User and colors can not be null in UserPanel.cs 2017-11-07 22:51:06 +01:00
Miterosan
2518b5e9a0 Textures in UserCoverBackground.cs can not be null 2017-11-07 22:50:45 +01:00
Miterosan
d5b275fa53 The TextureStore in Country.cs can noit be null. 2017-11-07 22:50:00 +01:00
Miterosan
e417eceb98 Texture in Avatar.cs can not be null. 2017-11-07 22:49:32 +01:00
EVAST9919
13cc1fcc92 Fix wrong index offset 2017-11-07 14:30:44 +03:00
EVAST9919
8e806cd11c Simplify moving ball behaviour 2017-11-07 13:43:02 +03:00
EVAST9919
a46dbee532 Add Humanizer package 2017-11-07 12:38:10 +03:00
EVAST9919
5946585a6f Apply suggested changes 2017-11-07 12:19:23 +03:00
Dean Herbert
5af2cc29f5
Merge branch 'master' into song_select_delete 2017-11-07 16:42:40 +09:00
EVAST9919
1b0e7e7145 Undo some useless changes 2017-11-07 03:44:21 +03:00
EVAST9919
60e6177b7f Use null propagation 2017-11-07 03:26:47 +03:00
EVAST9919
1063e18566 Don't show graph at all if there's no data to use 2017-11-07 03:16:27 +03:00
EVAST9919
461baf3b97 CI fixes 2017-11-07 03:05:12 +03:00
EVAST9919
28167388d6 Remove useless calls 2017-11-07 02:53:07 +03:00
EVAST9919
d10dcd82bc Rank Line Graph improvements 2017-11-07 02:39:48 +03:00
EVAST9919
a12052ac51 CI fix 2017-11-06 22:18:37 +03:00
EVAST9919
5d846bff7b Add (temporarily?) subrequest for each item to provide correct beatmap information 2017-11-06 22:05:04 +03:00
EVAST9919
b8b5c67cd2 Apply suggestion concerning the BeatmapSetType enum 2017-11-06 21:46:28 +03:00
EVAST9919
ebaef86432 Fix hard crash when opening beatmap with zero playcount in beatmap overlay 2017-11-06 21:28:01 +03:00
EVAST9919
21d8a18812 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section 2017-11-06 20:20:58 +03:00
Dan Balasescu
09b47db80e
Merge branch 'master' into config-precision 2017-11-06 15:34:19 +09:00
Shane Woolcock
a7c7f7d690 Add precision values to some of the config bindables 2017-11-06 16:58:17 +10:30
smoogipoo
2fbd490626 Make RemainingTimeCounter into a Counter 2017-11-06 14:58:05 +09:00
Dan Balasescu
e5aa0db6f7
Merge branch 'master' into auto-deleting-fix 2017-11-06 13:45:55 +09:00
smoogipoo
d24cd00a01 Merge remote-tracking branch 'origin/master' into settingsitem-getboundcopy 2017-11-06 12:39:35 +09:00
EVAST9919
1afe2c18be Fix osu! deleting beatmaps on startup if MenuMusic is disabled 2017-11-04 19:42:28 +03:00
EVAST9919
729777a7e0 Remove useless variable 2017-11-04 18:38:02 +03:00
EVAST9919
48c39b1d19 Add "Ranked & Approved Beatmaps" section 2017-11-04 00:53:58 +03:00
EVAST9919
761d885167 Add Favourite Beatmaps section in UserProfileOverlay 2017-11-03 20:25:21 +03:00
smoogipoo
6fba6eddbf Merge branch 'text-transform' into replay-rewinding 2017-11-04 00:48:42 +09:00
smoogipoo
edd0d166b1 Add text transforms to OsuSpriteText 2017-11-04 00:42:36 +09:00
smoogipoo
3b189c1ffe Fix BreakOverlay not properly working with rewinding
In various ways:
* It wouldn't show up if rewound after the break was complete.
* The time would increase backwards if rewind happened during a break.
* Etc.
* Basically the fix is to use transformations everywhere. BreakOverlay could be refactored further, but this is enough to make it work for now.
2017-11-03 21:20:36 +09:00
Dean Herbert
3adcfa8c38 Many fixes 2017-11-03 17:54:35 +09:00
Dean Herbert
2f205d1f63 Merge branch 'single-osu-logo' into intro-v2 2017-11-03 15:37:24 +09:00
Dean Herbert
6a206c616b Update in line with framework changes 2017-11-03 14:34:12 +09:00
smoogipoo
0620d0bd7a AllJudged does not need to be virtual anymore 2017-11-02 21:56:09 +09:00
smoogipoo
326891f51c Add "Final" to better determine when to stop processing the hitobject 2017-11-02 21:54:28 +09:00
Dean Herbert
8f78d84ad6 Make intro resume slower 2017-11-02 21:52:23 +09:00
Dean Herbert
c99ffb4aa3 Fix potential nullref 2017-11-02 21:52:12 +09:00
Dean Herbert
9b2d41f4eb Fix quick retry looking bad 2017-11-02 21:52:01 +09:00
smoogipoo
8ee13ef0ae Properties are unnecessary 2017-11-02 21:33:31 +09:00
smoogipoo
fe00ac7e41 Make DrawableHitObject/ScoreProcessor support rewinding 2017-11-02 21:21:07 +09:00
Dean Herbert
b8b05fe8d2 Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
b0785b2f09 Fix a possible horrendous endless auth loop 2017-11-02 20:26:26 +09:00
smoogipoo
f219b7f9fb Fix bonusScore being stored locally instead of incrementally changing 2017-11-02 19:31:30 +09:00
Dan Balasescu
05e5e3d279
Merge branch 'master' into fix-visualtests-configuration 2017-11-01 17:33:15 +09:00
Dean Herbert
ed89f03900 Make ParallaxContainer public 2017-11-01 17:10:59 +09:00
Dean Herbert
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert
27156aeb93 Fix the shit 2017-11-01 17:07:03 +09:00
Dean Herbert
fd5bc6fe58 Make ParallaxContainer public 2017-11-01 17:06:55 +09:00
Dean Herbert
09e0bd7a78 Remove unused class file 2017-11-01 16:58:12 +09:00
Dean Herbert
15197b9a76 Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 16:57:59 +09:00
Dean Herbert
d6c86ebcb1 Merge branch 'master' into intro 2017-11-01 15:38:14 +09:00
Dean Herbert
8138796ee3 Fix VisualTests configuration being completely wrong 2017-11-01 14:53:33 +09:00
smoogipoo
687a850216 Merge remote-tracking branch 'origin/master' into migrate-osu-game 2017-11-01 12:57:55 +09:00
smoogipoo
3462fdcad9 Remove some apparently unneeded references from osu.Game 2017-10-31 16:57:01 +09:00
smoogipoo
9b1ec83eb4 Propagate sqlite build assets to parent projects 2017-10-31 16:56:50 +09:00
Dean Herbert
ca8afc0c80 Merge remote-tracking branch 'upstream/master' into intro 2017-10-31 15:49:28 +09:00
Dean Herbert
ba7c0695c5
Merge branch 'master' into delayed-load 2017-10-30 22:48:33 +09:00
smoogipoo
7b72c6d811 Merge branch 'master' into webrequest-updates 2017-10-30 22:39:01 +09:00
smoogipoo
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
smoogipoo
437b6d67a4 Merge branch 'webrequest-updates' into migrate-osu-game 2017-10-30 22:10:30 +09:00
smoogipoo
cd5324f1d1 Update API code to use the new Add* methods on requests 2017-10-30 21:33:44 +09:00
Dean Herbert
f486ab1f6c
Merge branch 'master' into song_select_delete 2017-10-30 21:07:02 +09:00
Dean Herbert
d871c3fdda Fix test not working due to null refs 2017-10-30 20:55:23 +09:00
Dean Herbert
d8b3f984f5
Merge branch 'master' into webrequest-updates 2017-10-30 19:50:45 +09:00
Dean Herbert
1ae0eff6ad Add some sanity to request/drawable creation logic 2017-10-30 19:40:42 +09:00
Dean Herbert
23a729c83a Make avatars use a delayed load wrapper 2017-10-30 19:39:23 +09:00
Dean Herbert
a51e64b2d1 Remove unnecessary schedule 2017-10-30 19:16:16 +09:00
Dean Herbert
069f4b1fcf Make DrawableScore abstract and move shared class to own file 2017-10-30 19:15:19 +09:00
Dean Herbert
096998d5f4 Fix user bindable being assigned rather than bound 2017-10-30 19:08:15 +09:00
Dean Herbert
b660366d96 ScoreContainer -> PaginatedScoreContainer 2017-10-30 19:06:40 +09:00
Dean Herbert
dce7d1c910 Move pp score representation to own file 2017-10-30 19:05:13 +09:00
Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores 2017-10-30 18:48:26 +09:00
smoogipoo
f94505243d Use AllowRetryOnTimeout where to maintain previous functionality 2017-10-30 17:28:53 +09:00
Dean Herbert
7bc0ef44f2
Merge branch 'master' into beatmap-preview-fix 2017-10-30 16:22:47 +09:00
Dean Herbert
eccf56a551
Merge branch 'master' into settingsitem-getboundcopy 2017-10-30 16:20:39 +09:00
smoogipoo
b59401357e Remove singular RetryCount usage, update framework 2017-10-27 12:53:08 +09:00
EVAST9919
a7bcae4869 Add startup value for the slider 2017-10-26 15:18:06 +03:00
EVAST9919
08637253df Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-26 15:04:44 +03:00
EVAST9919
189b51551d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-26 14:40:40 +03:00
Shane Woolcock
22d222354c Change SettingsItem to use GetBoundCopy to ensure it has the right class for numeric bindables 2017-10-26 18:45:20 +10:30
smoogipoo
bfee3317aa Update WebRequest usage in-line with framework 2017-10-26 16:37:44 +09:00
DerpyCrabs
de10300675 Fix case-sensitive linux build 2017-10-26 10:44:38 +07:00
Jorolf
b2c3ba05d7 remove redundant stuff 2017-10-25 20:15:45 +02:00
Jorolf
0449639f41 remove inner classes and make User property a bindable 2017-10-25 20:07:12 +02:00
Dean Herbert
b89112c2a1 Fix incorrect alignment 2017-10-25 23:56:18 +09:00
Dean Herbert
41cc2f725a Fix incorrect comment 2017-10-25 23:56:10 +09:00
Dean Herbert
4d4b505ef7 Add AsNoTracking to common read-only queries 2017-10-25 23:56:05 +09:00
Dean Herbert
c260b0d2a5 Explicitly return list 2017-10-25 23:53:09 +09:00
Dean Herbert
e62928102c Merge remote-tracking branch 'upstream/master' into user-iqueryable 2017-10-25 23:49:56 +09:00
Dean Herbert
ead3ca1f27 Merge branch 'master' into fix-threaded-context-issues 2017-10-25 23:42:08 +09:00
Dan Balasescu
e2ee76332f Merge branch 'master' into fix-threaded-context-issues 2017-10-25 23:30:28 +09:00
Dean Herbert
4ef80ee6c4 Fix potential incorrect update in KeyBindingStore 2017-10-25 23:21:47 +09:00
Dan Balasescu
ffec5dd717 Merge branch 'master' into add-missing-indices 2017-10-25 22:58:26 +09:00
Dean Herbert
6f7ba55f80 Fill out xmldoc 2017-10-25 22:19:47 +09:00
Dean Herbert
c1d133977e FirstOrDefault -> SingleOrDefault 2017-10-25 22:17:17 +09:00
Dean Herbert
da01e81fc4 Async direct panel lookup 2017-10-25 22:14:47 +09:00
Dean Herbert
ed84cd2035 Greatly improve performance of direct panel loading
Still needs to be async'd
2017-10-25 22:14:41 +09:00
Dean Herbert
90af472717 Cache available rulesets as they are pretty static for now 2017-10-25 22:14:36 +09:00
Dean Herbert
2d0f4d3859 Fix OnlineBeatmapSetID not being correctly populated 2017-10-25 22:14:16 +09:00
Dean Herbert
195d75d045 Flip flop let's expose IEnumerables for now 2017-10-25 22:12:20 +09:00
Dean Herbert
4e1922c556 Fix query methods not using IQueryable/Expressions
No database-level where clauses were being used in many cases they should be.
2017-10-25 22:10:45 +09:00
Dean Herbert
a5fb700229 Fix KeyBinding updates 2017-10-25 22:08:56 +09:00
Dean Herbert
5001e9f264 Fix Hide/Restore/Delete etc. 2017-10-25 22:08:34 +09:00
Dean Herbert
8452e315f4 Allow "refreshing" instances via DatabaseBackedStore 2017-10-25 22:06:25 +09:00
Dean Herbert
487b888f4f Add missing database indices
Also add missing unique constraints where applicable.
2017-10-25 22:05:10 +09:00
Dan Balasescu
d927e57af6 Merge branch 'master' into fix-direct-import-stall 2017-10-25 21:48:27 +09:00
Dan Balasescu
946288ba2e Merge branch 'master' into fix-direct-import-stall 2017-10-25 21:46:00 +09:00
Dan Balasescu
05e1a7a5f8 Merge branch 'master' into online-beatmap-id-sanity 2017-10-25 21:38:33 +09:00
TocoToucan
5107489cda Remove DatabaseBackedStore Reset functions 2017-10-25 15:12:14 +03:00
TocoToucan
63fe569afa Remove DatabaseBackedStore Prepare functions 2017-10-25 14:53:20 +03:00
Dean Herbert
66f1d2fb2e Ensure all parsed "Online" IDs are above zero or null
Some .osu file sources (or database sources) may be in a bad state. We want to get these ones right as they cannot be enforced by the database itself (via FKs or constraints).
2017-10-25 14:34:39 +09:00
Dean Herbert
f1f7557f6e Add importing state to download notification 2017-10-25 11:49:00 +09:00
Dean Herbert
040fa3aa15 Fix import after direct download being scheduled to update thread
Caused a stall as experienced in #1364.
2017-10-25 11:43:30 +09:00
Dean Herbert
c765785d00 Mark several long-running tasks as long-running 2017-10-25 11:42:55 +09:00
Jorolf
a2dfef301a remove unused parameters 2017-10-24 20:56:05 +02:00
Jorolf
f65d4b626e don't use c# 7 feature 2017-10-24 20:46:15 +02:00
Jorolf
9109b1b3f1 Merge branch 'master' of git://github.com/ppy/osu into recent-scores 2017-10-24 20:34:26 +02:00
Jorolf
aadc699e73 show recent scores 2017-10-24 20:31:38 +02:00
Dean Herbert
15b9307b6c Fix WaveOverlayContainer appearing incorrectly on first PopIn 2017-10-24 20:26:27 +09:00
Dean Herbert
808c97fcb4 Fix multiple requests potentially being triggered during connect sequence
As the Success callbacks happen in a scheduled context, if the Update thread is in a stalled state, this loop can generate many unnecessary API requests.
2017-10-24 17:13:59 +09:00
Dean Herbert
4eef9c0067 Merge branch 'master' into bugfix-nofail-scoreprocessor 2017-10-24 15:48:42 +09:00
Jacob Odgård Tørring
493fe1d621 Makes HasFailed private set and removes alreadyFailed 2017-10-24 08:34:10 +02:00
Jacob Odgård Tørring
86419e0ded Merge remote-tracking branch 'upstream/master' into bugfix-nofail-scoreprocessor 2017-10-24 08:05:31 +02:00
Dean Herbert
542c6501a7 Fix VolumeControl and OnScreenDisplay being added to the wrong container 2017-10-24 13:10:17 +09:00
Dean Herbert
635f26badc Remove unnecessary using 2017-10-24 11:59:57 +09:00
Dan Balasescu
ecd641c44a Merge branch 'master' into startup-load-improvements 2017-10-24 11:54:31 +09:00
Dean Herbert
9ec870a821 Add comment pertaining to why Schedule() is required 2017-10-24 11:50:18 +09:00
Dean Herbert
e98bfec644 Remove Thread.Sleep and tidy up new method 2017-10-24 11:40:38 +09:00
Dean Herbert
00bb82215b Merge branch 'master' into revert-to-default-glow 2017-10-24 10:48:08 +09:00
Dan Balasescu
9eab2deee7 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 10:10:39 +09:00
Dean Herbert
0e04260b3c Move ToolbarUserArea initialisation to BDL 2017-10-24 10:08:42 +09:00
Dean Herbert
777cdcbdc1 Load even more components async 2017-10-24 10:08:42 +09:00
Dean Herbert
9b7d569a65 Add a single-file loading sequence for main components
This stops aync loading from getting overloaded with tasks, which was happening previously.
2017-10-24 10:08:42 +09:00
Dan Balasescu
cf6079fd07 Merge branch 'master' into import-test-fixes 2017-10-24 09:36:48 +09:00
Dean Herbert
4e4f6c1a47 Merge branch 'master' into update-framework 2017-10-24 08:14:58 +09:00
Dean Herbert
26d8b67f25 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 08:14:56 +09:00
Dean Herbert
b877177b83 Merge branch 'master' into bugfix-nofail-scoreprocessor 2017-10-24 08:14:54 +09:00
Dean Herbert
ffe94ea880 Merge branch 'master' into revert-to-default-glow 2017-10-24 08:14:53 +09:00
Dean Herbert
22b3f5dd19 Merge remote-tracking branch 'upstream/master' into import-test-fixes 2017-10-23 22:03:37 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Dean Herbert
1a3debc91d Ensure thread safety on shared contexts
Let's call this one temporary.
2017-10-23 17:56:04 +09:00
Dean Herbert
e7931ef4c7 Add a default icon when a ruleset isn't present 2017-10-23 17:32:28 +09:00
Dean Herbert
df20845fbb Share one context per file store for performance reasons
There is now a CreateContext method for retrieving a stand-alone context for threaded use.

We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Dean Herbert
4a68dd88cb Centralise BeginTransaction and disable transaction use for now 2017-10-23 14:53:13 +09:00
Dean Herbert
8fab6abf90 Update WebRequest usage in line with framework changes 2017-10-23 14:46:17 +09:00
Shane Woolcock
ea2934d92c Add KeyboardStep values for configuration options 2017-10-23 16:06:08 +10:30
Dean Herbert
1b455019a8 Merge remote-tracking branch 'upstream/master' into revert-to-default-glow 2017-10-23 11:56:17 +09:00
Nabile Rahmani
5af6fb41f5 Fixed .NET Standard build on Linux. 2017-10-23 02:03:46 +02:00
Jacob Odgård Tørring
9b54e834d9 Implements virtual Failcondition in scoreprocessor and enforces nofail in UpdateFailed 2017-10-22 20:32:59 +02:00
Dean Herbert
c089842adf Merge branch 'master' into import-test-fixes 2017-10-23 02:21:42 +09:00
DerpyCrabs
cf468d6708 Fix linux build
Build is failing on linux because of case sensitive file system. This change fixes it.
2017-10-22 20:14:38 +07:00
Dean Herbert
61c1dd3636 Don't output database logs unless DEBUG_DATABASE is specified compile-time 2017-10-22 19:46:08 +09:00
Dean Herbert
7ba22f0028 Merge remote-tracking branch 'upstream/master' into import-test-fixes 2017-10-22 17:50:03 +09:00
Dan Balasescu
9a005fb63a Merge branch 'master' into key-binding-store-improvements 2017-10-22 17:33:43 +09:00
Dean Herbert
5b2219a692 Add back test cleanup before run 2017-10-22 16:20:04 +09:00
Dean Herbert
1514d8451e Use a more elegant method of setting the connection timeout 2017-10-22 16:20:04 +09:00
Dean Herbert
9aa46bfb0d Add transaction usage for key binding defaults 2017-10-22 16:17:55 +09:00
Dean Herbert
29fcd210aa Centralise transaction committing 2017-10-22 16:17:40 +09:00
Dean Herbert
39b356880e Fix typo 2017-10-22 15:32:47 +09:00
Dean Herbert
6818ebdaff Change the way migrations are checked for
This method allows switching between sqlite-net and EF builds without completely breaking. Note that DB migration still only happens in a forward direction, but this will allow switching back and forth without eventually being unable to start the game.
2017-10-22 15:27:16 +09:00
Shane Woolcock
2e6a68d358 Rename indicator class, add colour/fade easing, and add tooltip 2017-10-22 16:12:30 +10:30
Dean Herbert
f45eb96a5b Merge remote-tracking branch 'upstream/master' into revert-to-default-glow 2017-10-22 13:27:53 +09:00
Shane Woolcock
5785af9f6a Reenable revert indicator on audio device since the potential crash was addressed in #1101 2017-10-22 14:22:57 +10:30
Dean Herbert
1a7e23b5c1 Don't query database on keypress 2017-10-21 23:39:31 +09:00
Dean Herbert
4f392a867a Use a transaction for key binding population 2017-10-21 23:39:24 +09:00
Shane Woolcock
59b10981dc CI fixes 2017-10-21 17:06:28 +10:30
Shane Woolcock
f5946c0e07 Fix wrong license header 2017-10-21 16:28:03 +10:30
Shane Woolcock
840ba9f48e Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset 2017-10-21 16:05:37 +10:30
Shane Woolcock
b4d575fbcd Fix namespace and unnecessary using 2017-10-21 13:22:21 +10:30
Shane Woolcock
290fac8990 Temporarily disable revert functionality for audio device, since it crashes 2017-10-21 13:17:03 +10:30
Shane Woolcock
98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
Shane Woolcock
2c7343e965 Add revert-to-default glow for settings items 2017-10-21 12:44:47 +10:30
Dean Herbert
270f984ae7 Merge remote-tracking branch 'upstream/master' into db-migration-fixes 2017-10-21 00:15:21 +09:00
Dean Herbert
47213d2498 Rely on storage.DeleteDatabase for guaranteed database deletion
Relies on https://github.com/ppy/osu-framework/pull/1100 being merged for most effectiveness.
2017-10-21 00:15:02 +09:00
Dan Balasescu
a9b9d82b74 Merge branch 'master' into fix-ef-hiding 2017-10-20 17:22:50 +09:00
Dean Herbert
b805174143 Output the inner exception to the log when possible 2017-10-20 14:33:35 +09:00
Dean Herbert
980a6c93b4 Merge branch 'master' into fix-ef-hiding 2017-10-20 14:24:46 +09:00
Dean Herbert
f18a3117a2 Merge branch 'master' into notification-thread-safety 2017-10-20 14:24:33 +09:00
Dean Herbert
f9d5eadd05 Fix TestCase failing in an infinite loop 2017-10-20 12:21:18 +09:00
Dean Herbert
35ce6fd2bd Merge branch 'master' into notification-thread-safety 2017-10-20 11:48:14 +09:00
Dean Herbert
93b2fc6dc5 Fix issues with deletion
Main fix is avoiding nullrefs being thrown when metadata isn't present on a beatmap (quite a common scenario).
2017-10-20 11:18:08 +09:00
Dean Herbert
f69fa0cf1f Fix selection after hiding all difficulties in a set 2017-10-20 11:16:56 +09:00
Dean Herbert
7f83cf6780 Fix hiding not always working
Because we are not sharing a single context, we need to use Update to attach the entity to the local context.
2017-10-20 11:16:45 +09:00
Dean Herbert
d32059a7ba Ignore include-ignore warnings for now 2017-10-20 09:25:54 +09:00
Dean Herbert
ca78078436 Add more logging output 2017-10-20 08:06:07 +09:00
Dean Herbert
0e1328a30e Add maximum try count before bailing 2017-10-20 08:01:38 +09:00
Dean Herbert
efaf98c5cf Allow recovery from a very broken database 2017-10-20 00:48:27 +09:00
Dean Herbert
9b1ed5b3aa Keep trying until delete succeeds
Turns out it can fail if file handles are still open.
2017-10-19 23:33:27 +09:00
Dean Herbert
d9fd05a5af Hidden cannot be null 2017-10-19 23:19:30 +09:00
Dean Herbert
8aea6068ba Add fallback logic for the case where previous database can't be migrated 2017-10-19 21:37:09 +09:00
Dan Balasescu
afaf3b4116 Merge branch 'master' into notification-thread-safety 2017-10-19 21:12:53 +09:00
Dean Herbert
1672e0d6b6 Add fallback logic in case migration fails
Nuke it all.
2017-10-19 21:11:43 +09:00
Dean Herbert
1fbbee14e4 Allow migration from sqlite-net to EF
Bonus stage
2017-10-19 20:04:59 +09:00
Dean Herbert
f7d0df1743 Fix beatmap difficulty and metadata deletion 2017-10-19 17:50:46 +09:00
Dean Herbert
b02dd196f6 Don't make one factory each context
A factory is supposed to be re-used.
2017-10-19 17:29:39 +09:00
Dean Herbert
36c00577af Reduce database log output
Also hard-disables it for uninteresting log levels, providing a further performance boost.
2017-10-19 16:35:06 +09:00
Dean Herbert
12900a8b15 Remove unnecessary second call to AutoTransactionsEnabled 2017-10-19 15:53:11 +09:00
Dean Herbert
908c6d827f ValueTuple please 2017-10-19 14:49:23 +09:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
71d614b813 FIx missing columns yet again 2017-10-18 21:57:54 +09:00
Dean Herbert
ac4b2797dc valuetuple nightmare 2017-10-18 20:07:25 +09:00
Dean Herbert
0dac770e38 Remove TestCase cleanup temporarily until context disposal is sorted 2017-10-18 19:52:08 +09:00
Dean Herbert
b73b4755eb Ignore r# locked context inspection here 2017-10-18 18:41:04 +09:00
Dean Herbert
a85de09c0f Fix beatmap carousel interactions with deletion when not yet displayed 2017-10-18 18:36:35 +09:00
Dean Herbert
668f68dd63 Remove some unnecessary update calls 2017-10-18 18:27:57 +09:00
Dean Herbert
4841d4a937 Fix deletion and use single context for imports and deletions for now 2017-10-18 18:27:17 +09:00
Dean Herbert
cf5290fead Remove unnecessary locking; operations are now thread-safe 2017-10-18 13:48:15 +09:00
Dean Herbert
2f3319552d Merge remote-tracking branch 'upstream/master' into EfCore 2017-10-18 11:43:37 +09:00
EVAST9919
bae91d7de7 Simplify gradient usage in Letterbox Overlay 2017-10-18 05:06:17 +03:00
Dean Herbert
518e5a2245 Make ProgressNotification's status and progress thread-safe
Quite regularly a task will hold a reference to a progress notification and udpate it as progress is made. Therefore these operations should be thread-safe.
2017-10-18 10:07:20 +09:00
Dean Herbert
4193004fbf Improve performance of imports by keeping a context hot 2017-10-17 20:29:47 +09:00
Dean Herbert
4e8019b313 Add some more missing indices 2017-10-17 19:59:22 +09:00
Dean Herbert
e4a066dc5f Run cleanup tasks only on startup via manual calls 2017-10-17 19:58:33 +09:00
Dean Herbert
b9d0fb96ed Fix cascade deletions 2017-10-17 18:26:28 +09:00
Dean Herbert
12639c6819 Use a different database name for now to avoid conflicts when switching versions 2017-10-17 17:52:20 +09:00
Dean Herbert
3e415e3269 Fix tooling failures 2017-10-17 17:52:02 +09:00
Dean Herbert
0177fcbe5f Fix xmldoc 2017-10-17 17:08:47 +09:00
Dean Herbert
7a18d373ec Improve performance of beatmap imports (still needs revision) 2017-10-17 17:08:42 +09:00
Dean Herbert
64dfce258f Fix file prefix not being read when calling storage.Exists 2017-10-17 17:08:19 +09:00
Dean Herbert
e02640637a Fix KeyBindingStore regression 2017-10-17 17:08:01 +09:00
Dean Herbert
ad54ca9268 Fix TestCasePlaySongSelect 2017-10-17 16:04:54 +09:00
Dean Herbert
cf3881b18c Fix not being able to restore hidden beatmaps via context menu 2017-10-17 15:50:52 +09:00
Dean Herbert
e487b6f82a Standardise context retrieval 2017-10-17 15:50:42 +09:00
Dean Herbert
cd41862e3b Add back transaction support for beatmap importing 2017-10-17 15:00:27 +09:00
Dean Herbert
fe44a28d48 Add back startup tasks runner 2017-10-17 12:46:38 +09:00
Dean Herbert
66894d11ea Connection -> context 2017-10-17 12:46:29 +09:00
Dean Herbert
c92e0e2dc1 Fix username display on beatmap panels 2017-10-17 11:24:59 +09:00
Dean Herbert
0df474accb Simplify file storing 2017-10-17 11:22:50 +09:00
Dean Herbert
31dc5c97f2 Fix intro and duplicate inserts 2017-10-17 11:22:42 +09:00
Dean Herbert
ef10bb73db osu.Game csproj fixes 2017-10-17 10:31:54 +09:00
Dean Herbert
799f510217 FileStore logic fixes 2017-10-17 10:25:18 +09:00
Dean Herbert
81476ebe75 Correct and simplify BeatmapStore and BeatmapManager 2017-10-17 10:17:21 +09:00
Dean Herbert
eff1c20e38 CI fixing 2017-10-16 22:00:54 +09:00
Dean Herbert
e378d0685d Remove weird additions 2017-10-16 20:37:10 +09:00
Dean Herbert
9ee6d1e3f9 Correct and simplify KeyBindingStore 2017-10-16 18:42:49 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
Dean Herbert
ec51314e37 Remove duplicate command 2017-10-16 16:11:34 +09:00
Dean Herbert
1f4a943f74 Fix test case runs not being correctly isolated on mono 2017-10-16 15:23:28 +09:00
Dean Herbert
7049a73490 Remove ValidTypes from databased stored; explicitly expose query methods instead 2017-10-16 14:47:33 +09:00
Dean Herbert
1a16784db9 Add BindingRedirects rule to fix dependency when running via nunit
See https://github.com/ErikEJ/EntityFramework.SqlServerCompact/issues/463
2017-10-16 14:18:01 +09:00
Dean Herbert
5b6c331434 Fix all keybindings being reset every startup 2017-10-16 14:12:08 +09:00
Dean Herbert
a5ccf12e4a Fix ValueTuple mess 2017-10-16 14:04:04 +09:00
Dean Herbert
29b46a5c5e Add missing reference to System.ValueTuple 2017-10-16 13:23:41 +09:00
Dean Herbert
4981630131 Fix formatting regressions 2017-10-16 13:12:51 +09:00
Dean Herbert
0a6dcdd405 Fix remaining warnings 2017-10-16 13:09:10 +09:00
Dean Herbert
8a0b184dd6 Revert "Return back DatabaseBackedStore's query and populate functions"
This reverts commit 7cf5d63cd3.
2017-10-16 12:59:59 +09:00
Dean Herbert
04e5f764a3 Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects" 2017-10-16 12:59:59 +09:00
TocoToucan
56e8c7303c Revert "Fix inconsistent lock usage in BeatmapManager"
This reverts commit 4a064da30f.
2017-10-16 12:59:59 +09:00
Dean Herbert
e3d31bdd10 Not implemented instead of incorrect 2017-10-16 12:59:59 +09:00
Dean Herbert
129cca0704 Tidy up context creation 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
5a684f926f CI fixes. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
c2836a8393 Use format string for double instead of Math.Round. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
f837117495 Use localisation engine instead of asking current culture directly. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
90592b0757 Construct DwarableScore using null weight. 2017-10-16 12:59:59 +09:00
TocoToucan
4a064da30f Fix inconsistent lock usage in BeatmapManager 2017-10-15 21:56:33 +03:00
Dean Herbert
0a8b3ad619 Add one more licence header 2017-10-16 00:58:56 +09:00
Dean Herbert
a232033469 Fix some file headers and unused files 2017-10-16 00:54:09 +09:00
TocoToucan
db2750592d Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects 2017-10-15 14:01:35 +03:00
Huo Yaoyuan
06fe874594 CI fixes. 2017-10-15 16:53:30 +08:00
Huo Yaoyuan
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
Huo Yaoyuan
192ebe776f Use localisation engine instead of asking current culture directly. 2017-10-15 16:30:52 +08:00
Huo Yaoyuan
bed5a64ee2 Construct DwarableScore using null weight. 2017-10-15 16:15:35 +08:00
TocoToucan
7cf5d63cd3 Return back DatabaseBackedStore's query and populate functions 2017-10-15 00:40:41 +03:00
EVAST9919
e3ce641ea0 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-15 00:15:25 +03:00
EVAST9919
bd7bc2c0d2 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-preview-fix 2017-10-15 00:14:59 +03:00
EVAST9919
f4428980a6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-15 00:10:15 +03:00
EVAST9919
24ca7a5119 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-15 00:09:50 +03:00
Dean Herbert
89c17ed13e Initialise batteries
Note that this is in the wrong place. But so is the rest of this code.
2017-10-14 21:40:26 +09:00
smoogipoo
9924f518b7 Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/BeatmapMetadata.cs
#	osu.Game/osu.Game.csproj
#	osu.Game/packages.config
2017-10-14 16:36:37 +09:00
Dan Balasescu
31b26e1d0a Merge branch 'master' into back-to-desktop 2017-10-14 16:18:28 +09:00
smoogipoo
167eefa397 Add logging 2017-10-14 15:16:08 +09:00
Dean Herbert
179542daf1 Standardise AssemblyInfos 2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c Add back osu.Desktop project
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
Dean Herbert
37ed710cbe Merge branch 'master' into fix-duplicate-user 2017-10-14 13:36:53 +09:00
smoogipoo
674ad4a30c Fix compile errors 2017-10-14 12:49:03 +09:00
smoogipoo
b83d7cd4df Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
9385fd1cfa Merge branch 'master' into better-medal-loading 2017-10-14 12:29:15 +09:00
Dean Herbert
ed152c08ac Fix regressions 2017-10-14 12:27:32 +09:00
smoogipoo
c3b9644d77 Move infoFlow to local variable 2017-10-14 11:59:18 +09:00
EVAST9919
e8f85a08b8 Fix audio preview still playing after closing the beatmap overlay 2017-10-14 05:58:06 +03:00
smoogipoo
1efb33210f Only update positions when the medalContainer is loaded. 2017-10-14 11:40:49 +09:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
EVAST9919
6711331f66 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-14 05:18:03 +03:00
EVAST9919
7a72f2e3f5 Make sure we restore the clock rate on exiting 2017-10-14 05:15:18 +03:00
EVAST9919
bdcc70e0bb Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-14 05:06:36 +03:00
EVAST9919
502940ddf3 Fix deleting last visible beatmap doesn't trigger selecting null beatmap 2017-10-14 05:05:38 +03:00
EVAST9919
c5de97a06f Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-14 05:05:01 +03:00
Dean Herbert
3644fa46be Make sure the loading overlay is hidden when preview is user cancelled 2017-10-14 10:53:39 +09:00
EVAST9919
583f8358b6 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-14 04:32:12 +03:00
Jorolf
2938ca9488 fix loading animation not playing 2017-10-13 20:44:05 +02:00
Dean Herbert
c660957329 Hide (most) profile sections that aren't populated yet 2017-10-13 20:29:19 +09:00
Dean Herbert
15373c71b6 Allow scores to open beatmap overlay
Reshuffles depth of beatmap and profile overlays for now.
2017-10-13 20:09:03 +09:00
Dean Herbert
7550b461e3 Add individual beatmap set lookup request 2017-10-13 19:57:59 +09:00
Dean Herbert
ead88224c5 Move ModIcon tooltip to base implementation 2017-10-13 19:14:43 +09:00
Dean Herbert
146d800bda Make weight nullable rather than using weird negative defaults 2017-10-13 19:02:50 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
070aceef1e Move font and text size to class ProfileLink class 2017-10-13 17:03:31 +09:00
Dean Herbert
77c98a34e3 Merge remote-tracking branch 'upstream/master' into user_overlay_tooltip 2017-10-13 17:00:26 +09:00
Dean Herbert
5b16f5d3b5 Remove unused field 2017-10-13 14:19:25 +09:00
Dean Herbert
f9a1240325 Merge remote-tracking branch 'upstream/master' into direct-previews 2017-10-13 14:06:46 +09:00
Dean Herbert
abf5418080 Apply some renames and refactoring of loading logic
Reduced publicly facing properties where possible. Also fixes a potentially bad state issue when the beatmapset was changed while a load was in progress.
2017-10-13 14:06:34 +09:00
Dean Herbert
bb6b656ec6 Fix code review issues 2017-10-12 22:27:22 +09:00
Dean Herbert
d234791bdd Merge remote-tracking branch 'upstream/master' into catch-improvements 2017-10-12 22:25:47 +09:00
Dean Herbert
c0d64bf409 Use Gray instead of FromHex for grays 2017-10-12 22:19:29 +09:00
Dean Herbert
37fc69b9f7 Set a default zoom level that isn't the whole track 2017-10-12 22:19:02 +09:00
Dean Herbert
37b88d834e Adjust padding slightly 2017-10-12 22:10:37 +09:00
Dean Herbert
d98f1a2bb7 Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline 2017-10-12 21:48:08 +09:00
Dean Herbert
182bb71eb0 Merge branch 'master' into editor-waveform 2017-10-12 20:49:48 +09:00
Dean Herbert
70c55b23f4 Remove references to CodeAnalysisRulesets
Having these produce warnings under certain compile environments.
2017-10-12 20:37:20 +09:00
Dean Herbert
a22fe901a3 Merge branch 'master' into remove-ratio-adjust 2017-10-12 19:26:03 +09:00
Dean Herbert
8a5e25ce4b Simplify waveform construction 2017-10-12 19:19:42 +09:00
Dean Herbert
4d78a0492c Make creatorUsername a property so it is correctly deserialised 2017-10-12 19:15:59 +09:00
Dan Balasescu
753383a740 Merge branch 'master' into remove-ratio-adjust 2017-10-12 18:48:32 +09:00
smoogipoo
ab62390336 Make TimelineButtons combined take up the full height of the timeline 2017-10-12 18:32:39 +09:00
smoogipoo
a6901c0a27 Change TimelineButton icon colour to white when hovered 2017-10-12 18:17:36 +09:00
smoogipoo
a5817e6e75 Add a way to change the IconButton icon colour 2017-10-12 18:17:23 +09:00
smoogipoo
f08f7a4ecb Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline 2017-10-12 17:52:40 +09:00
smoogipoo
5ccfc1918e Hook up more bindables for hitobjects/hitsounds 2017-10-12 17:51:01 +09:00
smoogipoo
db672becbc Implement waveform checkbox 2017-10-12 17:50:51 +09:00
smoogipoo
3c35a7a6ae graph -> waveform 2017-10-12 17:37:40 +09:00
Dan Balasescu
18c67dd936 Merge branch 'master' into editor-waveform 2017-10-12 17:32:42 +09:00
smoogipoo
4586877239 Implement magnification buttons 2017-10-12 17:31:21 +09:00
smoogipoo
622659336d Merge + update framework 2017-10-12 17:02:39 +09:00
Dean Herbert
00f7007036 Merge remote-tracking branch 'upstream/master' into fix-medal-overlay 2017-10-12 16:56:40 +09:00
Thomas Müller
78f2037d84 Remove now obsolete RatioAdjust 2017-10-12 09:42:06 +02:00
smoogipoo
de8f9325a3 Implement TimelineButton and use for the magnification buttons 2017-10-12 16:10:33 +09:00
smoogipoo
2844764e3c Hit Objects/Hit Sounds -> Hitobjects/Hitsounds 2017-10-12 15:37:45 +09:00
smoogipoo
e12fa49436 Integrate timeline into Compose 2017-10-12 15:37:00 +09:00
smoogipoo
6fbf52c3eb Remove unused usings 2017-10-12 15:32:18 +09:00
smoogipoo
df6409308a Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
# Conflicts:
#	osu-framework
2017-10-12 15:32:11 +09:00
EVAST9919
57a9116355 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-12 06:41:06 +03:00
EVAST9919
7cff413ab0 Fix wrong beatmap selection in song-select menu on deleting selected beatmap 2017-10-11 20:25:12 +03:00
EVAST9919
82b333740d Apply suggestions 2017-10-11 15:20:23 +03:00
EVAST9919
db38438a1e Merge remote-tracking branch 'refs/remotes/ppy/master' into user_overlay_tooltip 2017-10-11 15:12:17 +03:00
Dean Herbert
1a88ffe862 Merge remote-tracking branch 'upstream/master' into catch-improvements 2017-10-11 19:10:18 +09:00
Huo Yaoyuan
cf7f3411fc Ignore filename case in BeatmapManager. Fixes #1295. 2017-10-11 15:01:02 +08:00
Dean Herbert
71fc5c4da2 Merge branch 'master' into fix-storyboard-exception 2017-10-11 12:26:34 +09:00
Dean Herbert
6de100d446 Merge branch 'master' into iconbutton-refactor 2017-10-11 12:05:38 +09:00
TocoToucan
4653470779 Fix RulesetStore preparation 2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f Merge from ppy/master 2017-10-10 21:07:36 +03:00
EVAST9919
28a594179f CI fixes 2017-10-10 21:03:35 +03:00
EVAST9919
15160f5116 Simplify the code by using more delayed sequences 2017-10-10 20:43:07 +03:00
EVAST9919
d3a62082b4 Final adjustments 2017-10-10 20:20:49 +03:00
EVAST9919
a58e828f54 Timing adjustments 2017-10-10 20:06:18 +03:00
EVAST9919
10a3f7c1d0 Use constants instead of magic numbers 2017-10-10 18:30:46 +03:00
EVAST9919
c34b9aef98 No need to put a lot of stuff inside the big circular container 2017-10-10 15:29:29 +03:00
EVAST9919
67a6da44f9 Rings timing adjustment 2017-10-10 15:02:43 +03:00
EVAST9919
b7b517f4e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-10 14:25:53 +03:00
Dean Herbert
03fbf47bc2 Add juicy streams 2017-10-10 20:22:42 +09:00
smoogipoo
b8d2a04fe1 Only split beatmap lines twice 2017-10-10 19:24:24 +09:00
smoogipoo
ad344eb719 Use IsNullOrWhiteSpace instead of trimming 2017-10-10 19:21:38 +09:00
smoogipoo
8cea875f5f Remove unused using 2017-10-10 18:35:30 +09:00
smoogipoo
c2f3c0e6df Add TestCaseIconButton to demonstrate IconButton usages 2017-10-10 18:32:09 +09:00
smoogipoo
071b1b049c Fix properties not being set leading to colours not being set 2017-10-10 18:31:56 +09:00
smoogipoo
44141a38b8 Make it possible to change colours before load() 2017-10-10 18:04:41 +09:00
smoogipoo
bbd1a7059e xmldoc + hook up IconColour 2017-10-10 17:25:39 +09:00
smoogipoo
d7fb59ee0e Expose colours of IconButton 2017-10-10 17:20:23 +09:00
smoogipoo
9cb9151811 Move origin + anchor outside of ctor 2017-10-10 16:00:11 +09:00
smoogipoo
1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09:00
smoogipoo
166194e6b6 Further logic simplification 2017-10-10 15:09:26 +09:00
EVAST9919
9cad0ce2e9 Group transforms using delayed sequence
And some timing adjustments
2017-10-10 07:07:09 +03:00
smoogipoo
074a1db4a1 Implement scrolling and better zoom 2017-10-10 12:45:27 +09:00
EVAST9919
6fb8755a95 Use less masking for the ring 2017-10-10 06:06:09 +03:00
EVAST9919
19723b82f7 Remove ring's background field and adjust some timings 2017-10-10 04:12:01 +03:00
EVAST9919
e2d6659d48 Change Ring type, use RelativeSizeAxes for Background/Foreground 2017-10-10 03:57:15 +03:00
EVAST9919
59a0343c01 CI fixes 2017-10-10 01:36:40 +03:00
EVAST9919
0baceaaf0d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-10 00:56:54 +03:00
TocoToucan
cbae19b604 Fix BeatmapMetadata removing 2017-10-10 00:17:12 +03:00
TocoToucan
ef417c6388 Small DB-related refactoring 2017-10-09 23:30:32 +03:00
TocoToucan
41a90c8b11 Add missing eager loading 2017-10-09 23:28:28 +03:00
EVAST9919
d1f02538cb Add tooltip to username in the profile overlay 2017-10-09 21:12:04 +03:00
Dean Herbert
d5892cf54e Add a bool to specify whether judgements should be visible for certain DrawableHitObjects 2017-10-09 20:17:05 +09:00
smoogipoo
29c2a29798 Fix trimming too early in OsuLegacyDecoder crashing storyboards 2017-10-09 18:47:12 +09:00
smoogipoo
cb58a1371e Merge branch 'editor-waveform' into editor-waveform-timeline
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
Dean Herbert
222d0c8694 Fix visual regressions in MedalOverlay 2017-10-09 17:52:48 +09:00
smoogipoo
b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform
# Conflicts:
#	osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
19b38983df Update in-line with framework 2017-10-09 17:18:11 +09:00
TocoToucan
81b9e08fb6 Fix foreign key constraint failure 2017-10-09 00:30:52 +03:00
TocoToucan
5d27c66efa Use one DbContext with configured CommandTimeout for all stores 2017-10-08 18:18:28 +03:00
Bang Sunghwan
bd9f2db477 Trim line 2017-10-08 17:30:21 +09:00
Bang Sunghwan
6c5c734ff1 Trim end of line
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
Jorolf
f3ca6cc387 remove redundant stuff 2017-10-06 22:02:33 +02:00
Jorolf
de2181b8f5 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-10-06 21:02:48 +02:00
Jorolf
5a8b8dacbb move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton 2017-10-06 21:02:00 +02:00
EVAST9919
402531d04c Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 20:37:59 +03:00
smoogipoo
10abaa866b Put screens below the top and bottom bars of the editor 2017-10-07 01:56:11 +09:00
smoogipoo
c0b394811f Make compose mode the default
Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.
2017-10-07 01:46:54 +09:00
smoogipoo
d432ab7510 Reorder screen tab control items 2017-10-07 01:44:20 +09:00
smoogipoo
38ae9d905e Fix bindable binding to make the editor load a screen by default again 2017-10-07 01:42:45 +09:00
smoogipoo
837d1ba12e Remove rounded corners on the editor menu bar 2017-10-07 01:38:13 +09:00
smoogipoo
d3109a5950 Hook up BeatmapPanel "Edit" item 2017-10-07 00:59:14 +09:00
smoogipoo
a154ee3a89 Add File -> Exit to editor menu 2017-10-07 00:51:30 +09:00
smoogipoo
fc99860f4e Remove EditorMenuBarItem 2017-10-07 00:51:20 +09:00
Dean Herbert
19c663da11 Remove scale effect on editor screen switches 2017-10-06 23:41:49 +08:00
Dean Herbert
55267abe67 Merge branch 'master' into editor-screens 2017-10-06 23:19:16 +08:00
EVAST9919
0ec7d2dcf6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 15:56:08 +03:00
EVAST9919
95ac4e9265 Remove useless using 2017-10-06 04:57:46 +03:00
EVAST9919
96fcc095eb Apply suggested shrinking bar changes 2017-10-06 04:49:16 +03:00
TocoToucan
887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
EVAST9919
f8830e1b7c Animation adjustments 2017-10-05 21:37:37 +03:00
smoogipoo
7926757898 Remove unneeded parens 2017-10-05 14:33:49 +09:00
smoogipoo
0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
EVAST9919
2bc8fe027b Extend the testcase to test short breaks 2017-10-05 06:17:48 +03:00
EVAST9919
5caca1d328 Don't use '#' in RankDisplay for now 2017-10-05 05:27:52 +03:00
EVAST9919
cb0dbc6d9e Fix shrinking bar lingering on the screen for too long 2017-10-05 05:23:18 +03:00
EVAST9919
cc99678a96 Remove useless usings 2017-10-05 05:09:23 +03:00
Dean Herbert
20bf0502ab Use scheduling rather than raw transform delays 2017-10-05 10:03:48 +08:00
EVAST9919
22a59d753b Make all the overlays IStateful 2017-10-05 04:38:13 +03:00
EVAST9919
cafacf20ff Add all the needed objects 2017-10-05 02:50:13 +03:00
EVAST9919
6fa45aafc6 Basic logic 2017-10-04 23:06:31 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
EVAST9919
75ed3a03b6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-04 21:53:56 +03:00
smoogipoo
dcd5cc6753 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 22:00:44 +09:00
smoogipoo
8427bb44d1 Implement basic layout for the compose screen ScrollableTimeline 2017-10-04 22:00:42 +09:00
smoogipoo
ea45452993 Allow resolution > 1 2017-10-04 21:57:46 +09:00
smoogipoo
1377f73b46 Multiply resolution before clamping 2017-10-04 21:57:29 +09:00
EVAST9919
80fb14e3dc Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-04 14:50:02 +03:00
smoogipoo
8bc20a2545 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 19:49:23 +09:00
smoogipoo
8a52fdc8fa Use a bindable for the current screen in EditorMenuBar
Replaces the current Action.
2017-10-04 19:37:17 +09:00
smoogipoo
34eede0d04 Re-namespace EditorScreenMode 2017-10-04 19:36:55 +09:00
smoogipoo
e2824d4732 Reduce harshness of scale for now
Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...
2017-10-04 19:26:26 +09:00
smoogipoo
357a467337 Implement design mode 2017-10-04 19:24:19 +09:00
smoogipoo
5ca4a2d2c8 Add some nullchecks to WaveformDisplay 2017-10-04 19:09:39 +09:00
smoogipoo
81960c7b48 CI fixes 2017-10-04 19:03:02 +09:00