Commit Graph

907 Commits

Author SHA1 Message Date
7ce3b73ecd Added UserPanel and UserStatus 2017-05-22 03:11:42 -03:00
d717ccf85e Settings -> ReplaySettings 2017-05-22 09:07:08 +03:00
87cdf5aac6 CI fixes 2017-05-22 01:29:39 -03:00
82fdf1a918 Bindables, avatars, more cleanup 2017-05-22 01:01:55 -03:00
e5ee7096f8 Initial cleanup 2017-05-22 00:07:15 -03:00
c4e6870c12 Merge https://github.com/ppy/osu into roompanel 2017-05-21 22:37:00 -03:00
bc980b60ac Add files to project, update with framework changes 2017-05-21 22:36:46 -03:00
0615f104f0 SettingsContainer -> SettingsDropdownContainer 2017-05-21 18:22:27 +03:00
0b987be600 Merge branch 'master' into osu-direct 2017-05-20 16:17:59 +09:00
c981a4a511 Formatting 2017-05-19 19:50:45 -03:00
e1c4c36122 +BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds 2017-05-19 15:43:18 -03:00
9f803de9d5 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-19 19:49:48 +03:00
561b517dec Merge branch 'master' into skip-redesign 2017-05-20 00:42:04 +09:00
f96fe1c97d Extended testcase 2017-05-19 17:28:01 +03:00
6f0e1fccdb moved autosize to ctor and whitespace fix 2017-05-19 16:08:33 +03:00
4d0d27aa88 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-19 15:25:48 +03:00
da31d129ee Merge branch 'master' into mania-beatmap-conversion 2017-05-19 18:18:59 +09:00
a7d16ac213 Move skip logic to inside SkipButton 2017-05-19 18:18:21 +09:00
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
bbe0abbe04 removed forgotten file 2017-05-19 06:48:31 +03:00
a5fa7e1a7d Result counts displaying 2017-05-18 17:43:39 -03:00
c2880676db Added displaying sets 2017-05-18 16:15:49 -03:00
f2af31aceb Naming fixes 2017-05-18 20:21:58 +03:00
a1b90ee70e Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 18:26:38 +03:00
f112546085 Don't load a mode when opening TestCaseHitObjects 2017-05-18 19:42:20 +09:00
83a89ce22d options -> settings 2017-05-18 11:39:22 +03:00
35bc3a42aa Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 06:36:15 +03:00
eebd5a910e Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion 2017-05-18 11:59:31 +09:00
a21343da23 CI fixes 2017-05-17 17:14:09 +03:00
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
9ba356f2c6 Added osu!direct header and filter control 2017-05-17 05:58:34 -03:00
1a4025ab3c ingame options basic logic 2017-05-17 10:36:57 +03:00
9565bb9572 Fix hold notes - remove glow for now.
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
2017-05-17 13:09:49 +09:00
d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
85daddcf6f Merge branch 'master' into mania-timing-sections 2017-05-16 20:12:26 +09:00
6231a19b8c Merge remote-tracking branch 'origin/master' into mania-timing-sections 2017-05-16 18:35:32 +09:00
235a5b1dff Add notes to test case. 2017-05-16 18:27:33 +09:00
8ed97a8335 Let's invert the playfield by default for now. 2017-05-16 18:02:54 +09:00
ac02d1ab10 TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation). 2017-05-16 17:50:09 +09:00
0feaa407f2 Merge branch 'margin-padding-namespace' into on-screen-display 2017-05-16 16:40:06 +09:00
5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
1f34cec5ce Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-11 22:22:57 +03:00
0739a76497 Make the playfield work in TestCaseGamefield. 2017-05-11 20:04:45 +09:00
f6677125af Merge branch 'mania-notes' into mania-timing-sections 2017-05-11 14:11:58 +09:00
a6b71f8ccb Resharper fixes. 2017-05-11 14:11:52 +09:00
cdf827df8e CI fixes. 2017-05-11 13:55:52 +09:00
94585672b6 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-11 13:01:00 +09:00
b10df74079 Full rewrite of timing section code, partially working for now. 2017-05-11 12:33:19 +09:00