1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 23:07:44 +08:00
Commit Graph

958 Commits

Author SHA1 Message Date
EVAST9919
87f1368869 Add KudosuInfo container in the kudosu section 2017-11-18 18:19:35 +03:00
EVAST9919
d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03: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
18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
smoogipoo
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
EVAST9919
d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00
Dean Herbert
46ad986301
Merge branch 'master' into profile-beatmaps-section 2017-11-13 20:02:40 +09:00
EVAST9919
072e5db6ef Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-11 07:16:26 +03:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
EVAST9919
3261af5200 Add scores container 2017-11-11 03:46:06 +03:00
EVAST9919
4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
EVAST9919
c9353e3795 Fix humanizer package path 2017-11-09 15:49:17 +03:00
Dean Herbert
5547348d07
Merge branch 'master' into profile-beatmaps-section 2017-11-09 18:31:46 +09:00
EVAST9919
a46dbee532 Add Humanizer package 2017-11-07 12:38:10 +03:00
EVAST9919
761d885167 Add Favourite Beatmaps section in UserProfileOverlay 2017-11-03 20:25:21 +03: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
Dean Herbert
ca8afc0c80 Merge remote-tracking branch 'upstream/master' into intro 2017-10-31 15:49:28 +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
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
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
DerpyCrabs
de10300675 Fix case-sensitive linux build 2017-10-26 10:44:38 +07:00
Dean Herbert
ead3ca1f27 Merge branch 'master' into fix-threaded-context-issues 2017-10-25 23:42:08 +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
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
ffe94ea880 Merge branch 'master' into revert-to-default-glow 2017-10-24 08:14:53 +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
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
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
Shane Woolcock
98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
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
4e8019b313 Add some more missing indices 2017-10-17 19:59:22 +09:00
Dean Herbert
b9d0fb96ed Fix cascade deletions 2017-10-17 18:26:28 +09:00
Dean Herbert
cd41862e3b Add back transaction support for beatmap importing 2017-10-17 15:00:27 +09:00
Dean Herbert
ef10bb73db osu.Game csproj fixes 2017-10-17 10:31:54 +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
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
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
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
db2750592d Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects 2017-10-15 14:01:35 +03: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
f4428980a6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-15 00:10:15 +03: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
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
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
EVAST9919
6711331f66 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-14 05:18:03 +03:00
EVAST9919
bdcc70e0bb Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-14 05:06:36 +03:00
Dean Herbert
7550b461e3 Add individual beatmap set lookup request 2017-10-13 19:57:59 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
f9a1240325 Merge remote-tracking branch 'upstream/master' into direct-previews 2017-10-13 14:06:46 +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
smoogipoo
622659336d Merge + update framework 2017-10-12 17:02:39 +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
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
TocoToucan
8b01f8671f Merge from ppy/master 2017-10-10 21:07:36 +03:00
smoogipoo
c2f3c0e6df Add TestCaseIconButton to demonstrate IconButton usages 2017-10-10 18:32:09 +09:00
smoogipoo
1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09: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
smoogipoo
cb58a1371e Merge branch 'editor-waveform' into editor-waveform-timeline
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
smoogipoo
b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform
# Conflicts:
#	osu-framework
2017-10-09 17:20:24 +09: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
fc99860f4e Remove EditorMenuBarItem 2017-10-07 00:51:20 +09: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
smoogipoo
0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09: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
smoogipoo
8427bb44d1 Implement basic layout for the compose screen ScrollableTimeline 2017-10-04 22:00:42 +09:00
smoogipoo
8bc20a2545 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 19:49:23 +09:00
smoogipoo
34eede0d04 Re-namespace EditorScreenMode 2017-10-04 19:36:55 +09:00
smoogipoo
357a467337 Implement design mode 2017-10-04 19:24:19 +09:00
smoogipoo
01c839eda7 Move WaveformDisplay into separate class and add some commenting 2017-10-04 17:51:28 +09:00
smoogipoo
1a7e3fa09e Initial implementation of a test case which showcases waveforms 2017-10-04 17:51:27 +09:00
EVAST9919
b94c78e993 Hide/Show Replay settings on pressing Ctrl+H 2017-10-02 19:33:58 +03:00
smoogipoo
69b61a62a5 Implement base Compose screen 2017-10-02 10:09:21 +09:00
smoogipoo
c2d63eb0bd Add EditorScreen + screen changing functionality 2017-10-02 09:26:52 +09:00
smoogipoo
2a9edcbb4f Add test case for the editor 2017-10-02 08:11:02 +09:00
EVAST9919
2f852d705e Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-01 23:10:49 +03:00
Jorolf
259d49e6b9 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-29 23:09:33 +02:00
Jorolf
647304c14b move logic to DirectPanel and reuse stuff for the PreviewButton 2017-09-29 23:08:30 +02:00
Dean Herbert
eed358a2c1 Merge branch 'master' into editor-screen-selection 2017-09-29 18:24:46 +08:00
EVAST9919
e7632b6e6f Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-28 14:44:31 +03:00
Dean Herbert
4eaf6b4b94 Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll 2017-09-28 00:14:04 +08:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
EVAST9919
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
Jorolf
355a7b6649 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-26 12:22:11 +02:00
Dan Balasescu
b8b54e95a5 Merge branch 'master' into editor-timing-timeline 2017-09-26 15:54:01 +09:00
smoogipoo
5953c1084e Re-namespace SummaryTimeline 2017-09-26 15:45:27 +09:00
smoogipoo
85cb541fef Implement MarkerPart for the marker 2017-09-26 15:45:08 +09:00
smoogipoo
a1f88a17b1 Re-namespace and split out timeline parts from the SummaryTimeline 2017-09-26 15:44:40 +09:00
Dean Herbert
40f597f762 Add download button to grid view panels 2017-09-26 00:18:35 +08:00
Dean Herbert
5be11f539b Rename to BeatmapSetOverlay 2017-09-25 17:26:27 +08:00
smoogipoo
7fb8008e44 Merge remote-tracking branch 'origin/master' into editor-timing-timeline
# Conflicts:
#	osu-framework
2017-09-25 17:20:55 +09:00
Dean Herbert
b83596b44d Merge branch 'master' into online-beatmap-set-overlay 2017-09-25 16:15:58 +08:00
EVAST9919
2da3ea00b6 Bind break overlay to accuracy 2017-09-23 16:42:18 +03:00
MrTheMake
0a27916761 Added infoMessage class to the project, use the class for the /help command and handle command parameter better 2017-09-22 15:31:30 +02:00
EVAST9919
56bde64839 Add arrows overlay 2017-09-22 01:16:05 +03:00
Jorolf
72141935e8 make pagination work and remove duplication in RanksSection 2017-09-21 22:07:23 +02:00
DrabWeb
cb4818e84e Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-21 14:25:34 -03:00
EVAST9919
c79568135a Add arrows 2017-09-21 01:44:30 +03:00
EVAST9919
18a714df74 Move every class to it's own file 2017-09-20 22:33:07 +03:00
smoogipooo
f9568619e7 Move SummaryTimeline into /Edit/Components/SummaryTimeline 2017-09-20 16:59:03 +09:00
smoogipooo
5978668d2b Mini -> Summary 2017-09-20 16:48:30 +09:00
smoogipooo
fd278256ad EditorTimingTimeline -> EditorMiniTimeline 2017-09-20 15:50:32 +09:00
Jorolf
5b90f45691 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-09-19 21:26:05 +02:00
jorolf
ce4a44000f Merge branch 'master' into direct-previews 2017-09-19 19:25:41 +02:00
EVAST9919
4cf88c72bf Move testcase to the correct project 2017-09-19 17:37:34 +03:00
EVAST9919
c59d398aa5 Fix includes 2017-09-19 17:26:17 +03:00
EVAST9919
1b0ab414fa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-19 17:23:10 +03:00
smoogipooo
67d3861226 Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
2017-09-19 23:09:08 +09:00
Dean Herbert
511874389a Define trace for VisualTests 2017-09-19 16:07:00 +09:00
Dean Herbert
1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
Dean Herbert
6db705a3a8 Update relative paths 2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Jorolf
f8b09df13c Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-17 22:40:14 +02:00
Jorolf
be1e868a2a add previews to osu!direct 2017-09-17 22:39:34 +02:00
EVAST9919
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
Dean Herbert
98b847b025 Add API retrieval support 2017-09-14 20:08:07 +09:00
Dean Herbert
9c4876d135 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-14 18:52:44 +09:00
Dean Herbert
02fa9eeb3b Merge branch 'master' into online-beatmap-set-overlay 2017-09-14 16:52:44 +09:00
Dean Herbert
33d33a49ae Merge branch 'master' into storyboards 2017-09-14 16:06:19 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Damnae
bab3ef0669 Rename storyboard classes. 2017-09-13 11:22:24 +02:00
DrabWeb
08b5d4e16c Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-12 21:26:06 -03:00
Dean Herbert
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +09:00
Damnae
47cd1d486b Merge branch 'master' into storyboards 2017-09-11 12:29:19 +02:00
DrabWeb
43fa314fe0 Details and more data displaying. 2017-09-11 02:48:48 -03:00