RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,798 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

69 Commits

Author SHA1 Message Date
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
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
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
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