Commit Graph

501 Commits

Author SHA1 Message Date
c6d744eb7c Merge branch 'master' of ppy/osu into menu-flashes 2017-05-23 20:00:02 -05:00
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
1295b0a7e1 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-23 10:51:47 +09:00
a1547f12d4 Applied suggestions + Update Framework 2017-05-22 04:38:21 -05:00
3235e280a9 Add to csproj. 2017-05-22 17:32:18 +09:00
d0ff9e6576 Merge branch 'master' into sections 2017-05-22 12:52:27 +08:00
0a0139aded Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod. 2017-05-22 10:12:33 +09:00
5b244367ee allow for solutions were the osu repository isn't at the solution level 2017-05-21 20:29:05 +02:00
24a813e907 Basic children management of SectionsContainer. 2017-05-20 05:15:57 +08:00
eebd5a910e Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion 2017-05-18 11:59:31 +09:00
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
74c23ff6d8 Add base for event parsing code. 2017-05-17 20:46:23 +09:00
17466a662c Add hold note conversion. 2017-05-17 13:09:07 +09:00
91de72e161 Merge branch 'master' into on-screen-display 2017-05-16 16:27:19 +09:00
5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
815379646c Merge branch 'master' into new-option-search 2017-05-12 20:22:11 +09:00
d3770d8395 Merge branch 'master' into chat-design-update 2017-05-12 19:57:57 +09:00
d2e066ca35 Move SearchTextBox to better namespace
Is being used in multiple places now.
2017-05-12 19:57:06 +09:00
dbf60d24bf Second design update pass. 2017-05-12 15:39:00 +09:00
c4a93cbc85 Move drawable chat related classes to better namespace 2017-05-12 15:38:51 +09:00
1f34cec5ce Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-11 22:22:57 +03:00
9a1c662d1f Update framework 2017-05-11 21:25:43 +09:00
ec67b617ae Add OptionsHeader class
Makes search textbox anchor correctly. Also improves visual styling.
2017-05-11 16:06:18 +09:00
ae2186970c Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-08 18:16:16 +03:00
df4a737c9b Merge remote-tracking branch 'ppy/master' into hud-mod-display 2017-05-08 10:56:34 +09:00
d06b5783cb Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-06 17:33:51 +03:00
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
6298b3effd Refactor ModSection and ModIcon to avoid null mods. 2017-05-05 12:16:41 +09:00
153951d3dd Add OptionItem class
Allow for centalised logic for all option UI controls.
2017-05-04 23:07:48 +09:00
26985dbc62 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 16:22:40 +03:00
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +09:00
f49cc124ed Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 08:26:54 +03:00
a897dcbfbe Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-03 08:26:01 +03:00
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
691742b828 Remove most options which have not yet been implemented. 2017-05-02 19:40:30 +09:00
8e88d86639 Fix naming confusion. 2017-05-02 18:00:37 +09:00
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
bef15fe637 Improve organisation of some options and config code. 2017-05-02 17:45:22 +09:00
108cd28e96 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-02 10:15:56 +03:00
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
2e0eda6b15 Merge branch 'master' into playlist 2017-05-01 19:44:57 +09:00
580cf93147 Refactoring part 4. 2017-05-01 15:03:11 +09:00
37944bb04e Initial refactoring. 2017-05-01 13:01:08 +09:00
c193a90a16 Merge https://github.com/ppy/osu into playlist 2017-04-29 05:39:52 -03:00
9b8b88601f Create "AutoGenerator" base class and interface. 2017-04-29 02:08:48 +08:00
eacf2045f0 Initial commit 2017-04-28 04:56:34 +03:00
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
91b264da1a Merge branch 'master' into info-wedge-design-update 2017-04-25 08:14:59 +09:00