EVAST9919
|
bedcf04043
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-27 02:25: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
|
a25c504965
|
CI fixes
|
2017-05-24 03:08:48 -03:00 |
|
DrabWeb
|
ba2627d4e2
|
Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
|
2017-05-24 02:40:00 -03:00 |
|
DrabWeb
|
4490596f5f
|
Keep one object per file
|
2017-05-24 02:37:27 -03:00 |
|
DrabWeb
|
2be1b00a76
|
Hide status bar when Status is null
|
2017-05-24 00:45:56 -03:00 |
|
DrabWeb
|
247d8e9b21
|
Replace "Connected as _" in login form with a UserPanel
|
2017-05-24 00:23:48 -03:00 |
|
Dean Herbert
|
4ee11764b8
|
Merge branch 'master' into osu-direct
|
2017-05-24 12:16:34 +09:00 |
|
DrabWeb
|
4f17a4fe91
|
Make result counts scroll with the panels
|
2017-05-23 14:34:34 -03:00 |
|
smoogipooo
|
76fe4af9a6
|
Fix visual test failing.
|
2017-05-23 18:06:31 +09:00 |
|
smoogipooo
|
836bf930a0
|
More cleanups.
|
2017-05-23 15:29:38 +09:00 |
|
smoogipooo
|
002a0e99a2
|
Use SortedList + BinarySearch to find control points at time values.
|
2017-05-23 15:20:32 +09:00 |
|
smoogipooo
|
3cdfd2eef5
|
Split ControlPoint into different types.
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
|
2017-05-23 14:03:40 +09:00 |
|
DrabWeb
|
9798117d53
|
Move RoomStatus to a class instead of enum
|
2017-05-22 21:13:57 -03:00 |
|
DrabWeb
|
25b457e994
|
Proper Bindable usage
|
2017-05-22 13:05:18 -03:00 |
|
DrabWeb
|
65df2d2b70
|
MultiplayerRoomStatus -> RoomStatus
|
2017-05-22 12:46:41 -03:00 |
|
DrabWeb
|
2c16d9c3a7
|
CurrentBeatmap -> Beatmap
|
2017-05-22 12:45:40 -03:00 |
|
DrabWeb
|
03f6cded84
|
MultiplayerRoom -> Room
|
2017-05-22 12:44:58 -03:00 |
|
DrabWeb
|
62ca76bc41
|
Unused using
|
2017-05-22 03:42:32 -03:00 |
|
DrabWeb
|
8a364c6068
|
CI fixes
|
2017-05-22 03:37:36 -03:00 |
|
DrabWeb
|
aa40f88258
|
Add UserStatusOffline
|
2017-05-22 03:32:02 -03:00 |
|
DrabWeb
|
a73cf92994
|
Add second UserPanel to visual test, center cover sprite
|
2017-05-22 03:27:08 -03:00 |
|
DrabWeb
|
7ce3b73ecd
|
Added UserPanel and UserStatus
|
2017-05-22 03:11:42 -03:00 |
|
EVAST9919
|
d717ccf85e
|
Settings -> ReplaySettings
|
2017-05-22 09:07:08 +03:00 |
|
DrabWeb
|
87cdf5aac6
|
CI fixes
|
2017-05-22 01:29:39 -03:00 |
|
DrabWeb
|
82fdf1a918
|
Bindables, avatars, more cleanup
|
2017-05-22 01:01:55 -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
|
0615f104f0
|
SettingsContainer -> SettingsDropdownContainer
|
2017-05-21 18:22:27 +03:00 |
|
Dean Herbert
|
0b987be600
|
Merge branch 'master' into osu-direct
|
2017-05-20 16:17:59 +09:00 |
|
DrabWeb
|
c981a4a511
|
Formatting
|
2017-05-19 19:50:45 -03:00 |
|
DrabWeb
|
e1c4c36122
|
+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds
|
2017-05-19 15:43:18 -03:00 |
|
EVAST9919
|
9f803de9d5
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-19 19:49:48 +03:00 |
|
Dean Herbert
|
561b517dec
|
Merge branch 'master' into skip-redesign
|
2017-05-20 00:42:04 +09:00 |
|
EVAST9919
|
f96fe1c97d
|
Extended testcase
|
2017-05-19 17:28:01 +03:00 |
|
EVAST9919
|
6f0e1fccdb
|
moved autosize to ctor and whitespace fix
|
2017-05-19 16:08:33 +03:00 |
|
EVAST9919
|
4d0d27aa88
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-19 15:25:48 +03:00 |
|
Dean Herbert
|
da31d129ee
|
Merge branch 'master' into mania-beatmap-conversion
|
2017-05-19 18:18:59 +09:00 |
|
Dean Herbert
|
a7d16ac213
|
Move skip logic to inside SkipButton
|
2017-05-19 18:18:21 +09:00 |
|
smoogipooo
|
67cf64062a
|
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
|
2017-05-19 16:02:40 +09:00 |
|
EVAST9919
|
bbe0abbe04
|
removed forgotten file
|
2017-05-19 06:48:31 +03:00 |
|
DrabWeb
|
a5fa7e1a7d
|
Result counts displaying
|
2017-05-18 17:43:39 -03:00 |
|
DrabWeb
|
c2880676db
|
Added displaying sets
|
2017-05-18 16:15:49 -03:00 |
|
EVAST9919
|
f2af31aceb
|
Naming fixes
|
2017-05-18 20:21:58 +03:00 |
|
EVAST9919
|
a1b90ee70e
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-18 18:26:38 +03:00 |
|
Dean Herbert
|
f112546085
|
Don't load a mode when opening TestCaseHitObjects
|
2017-05-18 19:42:20 +09:00 |
|
EVAST9919
|
83a89ce22d
|
options -> settings
|
2017-05-18 11:39:22 +03:00 |
|
EVAST9919
|
35bc3a42aa
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-18 06:36:15 +03:00 |
|