RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,834 Commits 4 Branches 650 Tags 351 MiB
Commit Graph

164 Commits

Author SHA1 Message Date
Dean Herbert fa7ef8ed52 Merge remote-tracking branch 'upstream/master' into taiko-fixes 
# Conflicts:
#	osu.Desktop.Tests/Visual/TestCaseTaikoHitObjects.cs
#	osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
 2017-08-04 18:04:23 +09:00
Dean Herbert f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
smoogipooo 8ef949ce38 Remove TestCaseTaikoHitObjects. 2017-08-03 13:56:36 +09:30
Dean Herbert f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Huo Yaoyuan 6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
DrabWeb 202e3ca530 Merge https://github.com/ppy/osu into medal-splash 2017-07-11 02:00:36 -03:00
Huo Yaoyuan 6f2b49dea8 Merge branch 'master' into profile. 2017-07-10 10:36:23 +08:00
EVAST9919 10a522885a Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes 2017-06-25 23:36:38 +03:00
DrabWeb e09625e49d Merge https://github.com/ppy/osu into medal-splash 2017-06-23 22:42:36 -03:00
Dean Herbert b90c9bcacf Merge branch 'master' into profile 2017-06-23 22:51:31 +09:00
Dean Herbert 81de1bd5a7 Merge branch 'master' into multiplayer-room-inspector 2017-06-23 21:55:18 +09:00
EVAST9919 608f3fe8c5 oops 2017-06-23 08:41:48 +03:00
Huo Yaoyuan af4ddf8fbd Merge branch 'master' into profile. 2017-06-16 16:32:54 +08:00
Dan Balasescu 6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +09:00
Huo Yaoyuan 9ceb4930e9 Merge branch 'master' into profile 2017-06-13 15:23:12 +08:00
Dean Herbert 178e2b716e Merge branch 'master' into us 2017-06-13 15:46:53 +09:00
Dean Herbert 41d4aee4f5 Update nuget packages 
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
 2017-06-13 11:50:46 +09:00
EVAST9919 1711258038 Context Menu 2017-06-12 12:56:07 +03:00
smoogipooo 56244e0134 Add small test case to demonstrate usage. 2017-06-12 17:31:24 +09:00
Huo Yaoyuan 283b6b2b5e Merge branch 'master' into profile 2017-06-09 13:45:32 +08:00
Huo Yaoyuan 8fa076b5d7 Merge branch 'master' into userpage 2017-06-05 21:14:46 +08:00
Huo Yaoyuan 428b44f7d9 UserPage -> Profile. 2017-06-05 21:07:57 +08:00
Huo Yaoyuan 1b8ef3bbbd Add test case for UserPage. 2017-06-05 21:05:01 +08:00
Dean Herbert bf971f6613 Merge branch 'master' into social-browser 2017-06-05 19:16:28 +09:00
Dean Herbert 0cb1df35e9 Merge remote-tracking branch 'upstream/master' into ingame_options 2017-06-05 14:53:37 +09:00
Thomas Müller 04925594ca Merge branch 'master' into separate-skip 2017-06-03 17:45:57 +02:00
Thomas Müller 8cd2f509ef Move skip button into its own test, because it is no longer two-layered 2017-06-03 17:33:24 +02:00
Thomas Müller 3daae480d2 Remove TestCaseTooltip 2017-06-03 17:28:34 +02:00
DrabWeb 212b2c1142 Initial layout and animation 2017-06-01 04:45:46 -03:00
DrabWeb 3aa1f35127 Basic layout 2017-05-30 05:12:11 -03:00
Dean Herbert 5e4558cc54 Merge branch 'master' into social-browser 2017-05-29 18:35:22 +09:00
Dan Balasescu 6918368afc Merge branch 'master' into ingame_options 2017-05-29 18:12:02 +09:00
EVAST9919 bedcf04043 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-27 02:25:03 +03:00
DrabWeb cbe36259c3 Add BreadcrumbControl 2017-05-26 07:49:45 -03:00
DrabWeb 8fca0fddb3 Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser 2017-05-26 00:54:03 -03:00
Seth 3094a8267f Merge branch 'master' into drawable-multiplayer-room 2017-05-24 04:39:57 -03:00
Dean Herbert 3134f92051 Merge branch 'master' into user-panel 2017-05-24 16:32:09 +09:00
DrabWeb 03f6cded84 MultiplayerRoom -> Room 2017-05-22 12:44:58 -03:00
DrabWeb 7ce3b73ecd Added UserPanel and UserStatus 2017-05-22 03:11:42 -03:00
DrabWeb e5ee7096f8 Initial cleanup 2017-05-22 00:07:15 -03:00
DrabWeb c4e6870c12 Merge https://github.com/ppy/osu into roompanel 2017-05-21 22:37:00 -03:00
DrabWeb bc980b60ac Add files to project, update with framework changes 2017-05-21 22:36:46 -03:00
EVAST9919 f2af31aceb Naming fixes 2017-05-18 20:21:58 +03:00
EVAST9919 83a89ce22d options -> settings 2017-05-18 11:39:22 +03:00
DrabWeb 9ba356f2c6 Added osu!direct header and filter control 2017-05-17 05:58:34 -03:00
EVAST9919 1a4025ab3c ingame options basic logic 2017-05-17 10:36:57 +03:00
Dean Herbert 5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
Dean Herbert eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
smoogipooo e3b01e7b8c Merge branch 'master' into mania-notes 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
 2017-05-08 12:12:40 +09:00
Dean Herbert c9ba1ac4f6 Adjust namespaces. 
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
 2017-05-05 13:00:05 +09:00