Commit Graph

435 Commits

Author SHA1 Message Date
81cc27e104 Fix typo. 2017-03-06 10:06:25 +09:00
7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
7eebee36ab Merge branch 'master' into moarOptions 2017-03-04 16:11:27 +01:00
a3f1cb2232 Merge branch 'master' into update-flow 2017-03-04 15:35:53 +01:00
5c5066e1ae renamed local groups 2017-03-04 15:30:14 +01:00
e12d89529c Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
112545f135 Fix unnecessarily throwing exception if there's no last drawings results file. 2017-03-04 23:24:32 +09:00
00fdffe9c8 Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
389635c7ed Avoid panel state changes when performing a sort. 2017-03-04 22:05:16 +09:00
8f3621ca24 Make selectGroup a private method. 2017-03-04 22:05:02 +09:00
7a6a614358 Don't show pause menu when watching replays. 2017-03-04 21:35:26 +09:00
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
a2b79de672 Add comments to CarouselContainer 2017-03-04 09:34:39 +01:00
aaa1f766af Fix beatmap removal 2017-03-04 09:34:28 +01:00
9bddd1ed4b Fix broken CarouselContainer animations
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
2017-03-04 09:33:24 +01:00
a97a7f1024 No more custom lifetimelist in CarouselContainer 2017-03-04 08:54:14 +01:00
adb6f01e39 Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09:00
9e1383fa48 Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
b9e4c920c5 SelectRandom doesnt select hidden groups now 2017-03-03 21:11:38 +01:00
6f3b59268a Merge pull request #385 from DrabWeb/mod-overlay
Mod select
2017-03-03 21:09:08 +09:00
dc6a728cce Merge branch 'master' into tournament_drawings 2017-03-03 20:48:07 +09:00
38a9e820e6 GroupsContainer -> GroupContainer. 2017-03-03 20:46:07 +09:00
bc01935a89 Move around some namespaces. 2017-03-03 20:42:22 +09:00
2ac248c7d0 Use OsuSpriteText. 2017-03-03 20:29:39 +09:00
1ea1118db6 Simplify file reading. 2017-03-03 20:24:34 +09:00
4a109fcc55 Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided. 2017-03-03 20:21:11 +09:00
ca73b77a9a Tidying code. 2017-03-03 20:08:32 +09:00
41cefd1cb3 xmldoc commenting. 2017-03-03 20:08:21 +09:00
c3cb225eef Fix being able to stop rotation when it isn't started. 2017-03-03 20:07:57 +09:00
5a4d07d770 Better way to initialize team lists. 2017-03-03 18:47:56 +09:00
890066dae4 Use sprite visualiser lines instead of shader. 2017-03-03 18:47:22 +09:00
54993b874f Fix idle and stopping -> stopped state. 2017-03-03 18:45:04 +09:00
2a49200008 Nothing to see here. 2017-03-03 18:02:02 +09:00
b2661be0b2 Fix setting same state multiple times. 2017-03-03 17:59:16 +09:00
9d75ab85e9 Put mod select over beatmap options 2017-03-03 04:19:03 -04:00
fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
bdb130fabc Avoid using right-to-left fill direction for now. 2017-03-03 16:54:59 +09:00
47845a7fbd Fix button input handling. 2017-03-03 16:54:43 +09:00
7cac2680b1 Make test case add test drawings file. 2017-03-03 16:33:40 +09:00
b0ee728528 Remove full-screen background layer and add half-height holder.
Doesn't interact well with dialog popups. May add back later with complementing logic.
2017-03-03 16:11:23 +09:00
1d1c08125b Further safety checking. 2017-03-03 16:01:24 +09:00
777996d884 Rewrite VisualiserLine + add VisualiserContainer. 2017-03-03 15:43:16 +09:00
a70b1ae108 Use a singular FlowContainer for teams. 2017-03-03 15:12:26 +09:00
04dd24b04b OnTeamSelected + async changes. 2017-03-03 14:51:19 +09:00
3ae55933c4 Remove game dependency. 2017-03-03 14:11:47 +09:00
d96345e408 s/internalPeriod/_period 2017-03-03 14:11:37 +09:00
1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00