|
|
202e3ca530
|
Merge https://github.com/ppy/osu into medal-splash
|
2017-07-11 02:00:36 -03:00 |
|
|
|
10a522885a
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes
|
2017-06-25 23:36:38 +03:00 |
|
|
|
e09625e49d
|
Merge https://github.com/ppy/osu into medal-splash
|
2017-06-23 22:42:36 -03:00 |
|
|
|
81de1bd5a7
|
Merge branch 'master' into multiplayer-room-inspector
|
2017-06-23 21:55:18 +09:00 |
|
|
|
608f3fe8c5
|
oops
|
2017-06-23 08:41:48 +03:00 |
|
|
|
6fd37ebc32
|
Merge branch 'master' into timingchange-rework
|
2017-06-15 16:23:51 +09:00 |
|
|
|
178e2b716e
|
Merge branch 'master' into us
|
2017-06-13 15:46:53 +09:00 |
|
|
|
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 |
|
|
|
1711258038
|
Context Menu
|
2017-06-12 12:56:07 +03:00 |
|
|
|
56244e0134
|
Add small test case to demonstrate usage.
|
2017-06-12 17:31:24 +09:00 |
|
|
|
bf971f6613
|
Merge branch 'master' into social-browser
|
2017-06-05 19:16:28 +09:00 |
|
|
|
0cb1df35e9
|
Merge remote-tracking branch 'upstream/master' into ingame_options
|
2017-06-05 14:53:37 +09:00 |
|
|
|
04925594ca
|
Merge branch 'master' into separate-skip
|
2017-06-03 17:45:57 +02:00 |
|
|
|
8cd2f509ef
|
Move skip button into its own test, because it is no longer two-layered
|
2017-06-03 17:33:24 +02:00 |
|
|
|
3daae480d2
|
Remove TestCaseTooltip
|
2017-06-03 17:28:34 +02:00 |
|
|
|
212b2c1142
|
Initial layout and animation
|
2017-06-01 04:45:46 -03:00 |
|
|
|
3aa1f35127
|
Basic layout
|
2017-05-30 05:12:11 -03:00 |
|
|
|
5e4558cc54
|
Merge branch 'master' into social-browser
|
2017-05-29 18:35:22 +09:00 |
|
|
|
6918368afc
|
Merge branch 'master' into ingame_options
|
2017-05-29 18:12:02 +09:00 |
|
|
|
bedcf04043
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-27 02:25:03 +03:00 |
|
|
|
cbe36259c3
|
Add BreadcrumbControl
|
2017-05-26 07:49:45 -03:00 |
|
|
|
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 |
|
|
|
3094a8267f
|
Merge branch 'master' into drawable-multiplayer-room
|
2017-05-24 04:39:57 -03:00 |
|
|
|
3134f92051
|
Merge branch 'master' into user-panel
|
2017-05-24 16:32:09 +09:00 |
|
|
|
03f6cded84
|
MultiplayerRoom -> Room
|
2017-05-22 12:44:58 -03:00 |
|
|
|
7ce3b73ecd
|
Added UserPanel and UserStatus
|
2017-05-22 03:11:42 -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 |
|
|
|
f2af31aceb
|
Naming fixes
|
2017-05-18 20:21:58 +03:00 |
|
|
|
83a89ce22d
|
options -> settings
|
2017-05-18 11:39:22 +03: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 |
|
|
|
5e5ad9a899
|
Add basic on-screen display
|
2017-05-16 15:03:03 +09:00 |
|
|
|
eaaba11586
|
Change all instances of options to settings where applicable
|
2017-05-15 10:55:29 +09:00 |
|
|
|
e3b01e7b8c
|
Merge branch 'master' into mania-notes
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2017-05-08 12:12:40 +09:00 |
|
|
|
c9ba1ac4f6
|
Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
|
2017-05-05 13:00:05 +09:00 |
|
|
|
66c858030a
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
|
2017-05-04 17:35:41 +03:00 |
|
|
|
57c4232416
|
Added testcase
|
2017-05-04 11:58:37 +03:00 |
|
|
|
956a7288fb
|
Add basic DrawableNote.
|
2017-05-03 20:12:27 +09:00 |
|
|
|
4aea18b673
|
Add initial column design.
|
2017-05-01 17:00:41 +09:00 |
|
|
|
4ca27a5395
|
Merge branch 'master' into tooltips
|
2017-04-20 15:08:26 +09:00 |
|
|
|
af9a45fd6c
|
Merge branch 'master' into tooltips
|
2017-04-19 13:51:39 +02:00 |
|
|
|
d51b37cb44
|
Add a basic implementation of the new design results screen.
|
2017-04-18 22:22:14 +09:00 |
|
|
|
fbd26a1d5e
|
Mode -> Ruleset.
|
2017-04-18 16:05:58 +09:00 |
|
|
|
dd26f9fcac
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
|
2017-04-17 14:45:46 +02:00 |
|
|
|
60f7879875
|
Explicitly set C# 6.0 for now.
|
2017-04-16 06:44:08 +09:00 |
|
|
|
09195a03a2
|
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
# osu.Game/Overlays/DragBar.cs
|
2017-04-14 11:25:00 +09:00 |
|
|
|
f6f75fac74
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
# Conflicts:
# osu.Game/Graphics/Cursor/MenuCursor.cs
|
2017-04-13 23:12:07 +02:00 |
|
|
|
157ad17606
|
Merge branch 'master' into details
|
2017-04-12 20:25:51 +09:00 |
|
