TocoToucan
|
7cf5d63cd3
|
Return back DatabaseBackedStore's query and populate functions
|
2017-10-15 00:40:41 +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 |
|
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 |
|
Dean Herbert
|
cd722e4abb
|
Fix beatmap author being stored in two different places
|
2017-10-14 11:39:55 +09:00 |
|
Dean Herbert
|
520b806305
|
Merge remote-tracking branch 'upstream/master' into ranks-section
|
2017-10-13 18:49:05 +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 |
|
Dan Balasescu
|
18c67dd936
|
Merge branch 'master' into editor-waveform
|
2017-10-12 17:32:42 +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 |
|
smoogipoo
|
de8f9325a3
|
Implement TimelineButton and use for the magnification buttons
|
2017-10-12 16:10:33 +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 |
|
TocoToucan
|
8b01f8671f
|
Merge from ppy/master
|
2017-10-10 21:07:36 +03: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
|
1cf8c0284a
|
Re-namespace a few classes
|
2017-10-10 15:22:39 +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
|
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 |
|
TocoToucan
|
887aa7496b
|
Rework EF Core usage in model classes
|
2017-10-06 00:23:26 +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 |
|
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
|
81960c7b48
|
CI fixes
|
2017-10-04 19:03:02 +09:00 |
|
smoogipoo
|
01c839eda7
|
Move WaveformDisplay into separate class and add some commenting
|
2017-10-04 17:51:28 +09:00 |
|
smoogipoo
|
a37b10d512
|
Make TestCaseWaveform use invalidations + remove some of the crud
|
2017-10-04 17:51:28 +09:00 |
|
smoogipoo
|
3eeb36cbd4
|
Remove now unused class
|
2017-10-04 17:51:27 +09:00 |
|
smoogipoo
|
319649f446
|
Make TestCaseWaveform use a custom drawnode instead of boxes
|
2017-10-04 17:51:27 +09:00 |
|
smoogipoo
|
1a7e3fa09e
|
Initial implementation of a test case which showcases waveforms
|
2017-10-04 17:51:27 +09:00 |
|
EVAST9919
|
aafead5057
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
|
2017-10-03 01:34:42 +03:00 |
|
Dean Herbert
|
66afba6219
|
Allow TestCasePlayer to instantiate only one ruleset type
|
2017-10-02 20:48:24 +08:00 |
|
smoogipoo
|
7211dd2015
|
Remove unnecessary usings
|
2017-10-02 10:11:43 +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
|
ac6c323f93
|
Clear all tasks and transforms when resetting Breaks
|
2017-10-02 00:44:57 +03:00 |
|
EVAST9919
|
2f852d705e
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
|
2017-10-01 23:10:49 +03:00 |
|
Dean Herbert
|
eed358a2c1
|
Merge branch 'master' into editor-screen-selection
|
2017-09-29 18:24:46 +08:00 |
|
EVAST9919
|
ca1f96208a
|
Fix TestCaseContextMenu not being updated inline with previous changes
|
2017-09-28 14:31:02 +03:00 |
|
smoogipoo
|
545c375199
|
Update design of EditorMenuBar to match flyte's design more closely
|
2017-09-27 22:01:03 +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 |
|
Dean Herbert
|
7c70d3d2cb
|
Merge branch 'master' into storyboard_integration
|
2017-09-26 20:19:26 +08:00 |
|
smoogipoo
|
c578509a20
|
Bind to the screen Beatmap instead of the game-wide Beatmap
|
2017-09-26 17:58:40 +09: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 |
|
Dean Herbert
|
5be11f539b
|
Rename to BeatmapSetOverlay
|
2017-09-25 17:26:27 +08:00 |
|
Damnae
|
2d4616fd43
|
Apply beatmap settings when creating the DrawableStoryboard.
|
2017-09-25 11:03:57 +02:00 |
|
Damnae
|
0996867112
|
Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.
|
2017-09-25 10:40:22 +02:00 |
|
Jorolf
|
14b8e9fd77
|
remove some redundant stuff
|
2017-09-21 22:15:42 +02: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
|
18a714df74
|
Move every class to it's own file
|
2017-09-20 22:33:07 +03:00 |
|
EVAST9919
|
eb93706c26
|
Remove useless usings
|
2017-09-20 16:03:31 +03:00 |
|
EVAST9919
|
0f04d8c6a7
|
Add remaining time container
|
2017-09-20 15:58:28 +03:00 |
|
smoogipooo
|
58b09a161f
|
CI fixes
|
2017-09-20 17:16:12 +09:00 |
|
smoogipooo
|
f9568619e7
|
Move SummaryTimeline into /Edit/Components/SummaryTimeline
|
2017-09-20 16:59:03 +09:00 |
|
smoogipooo
|
3da3ef1a50
|
CI fixes
|
2017-09-20 16:53:01 +09:00 |
|
smoogipooo
|
5978668d2b
|
Mini -> Summary
|
2017-09-20 16:48:30 +09:00 |
|
smoogipooo
|
967bfa404e
|
Generate a set beatmap instead of using the available beatmaps
|
2017-09-20 16:40:37 +09:00 |
|
smoogipooo
|
6a9572db6c
|
Merge branch 'master' into editor-timing-timeline
# Conflicts:
# osu-framework
|
2017-09-20 16:19:08 +09:00 |
|
smoogipooo
|
01d84893a0
|
Cleanup + commenting
|
2017-09-20 15:55:23 +09:00 |
|
smoogipooo
|
fd278256ad
|
EditorTimingTimeline -> EditorMiniTimeline
|
2017-09-20 15:50:32 +09:00 |
|
smoogipooo
|
252121968d
|
Actually load a beatmap for TestCaseEditorTimingTimeline
|
2017-09-20 15:40:42 +09:00 |
|
smoogipooo
|
01c3818ea0
|
Make EditorTimingTimeline support beatmap changes
|
2017-09-20 15:40:27 +09:00 |
|
Jorolf
|
5b90f45691
|
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
|
2017-09-19 21:26:05 +02:00 |
|
Damnae
|
fcaabf7fdf
|
Merge branch 'master' into storyboard_integration
|
2017-09-19 17:36:29 +02:00 |
|
EVAST9919
|
4cf88c72bf
|
Move testcase to the correct project
|
2017-09-19 17:37:34 +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
|
f96875a470
|
Add a catch specific player test
|
2017-09-19 21:40:57 +09:00 |
|
Dean Herbert
|
ef210018d9
|
Run headless tests with a unique name based on the executing assembly
|
2017-09-19 20:04:37 +09:00 |
|
Dean Herbert
|
51cdff1d9a
|
Fix TestCasePlaySongSelect incorrectly using live app data
|
2017-09-19 17:22:45 +09:00 |
|
Dean Herbert
|
6d3d485565
|
And then everything became one
|
2017-09-19 16:06:58 +09:00 |
|