a07f6801da
Merge remote-tracking branch 'upstream/master' into timingchange-rework
2017-06-07 18:39:27 +09:00
eb545d907d
Merge branch 'master' into simplify-hud-overlay
2017-06-06 14:31:54 +09:00
778865b6eb
Merge remote-tracking branch 'upstream/master' into channel-selection
2017-06-05 17:36:14 +09:00
5568df1aee
Remove StandardHUDOverlay
...
This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now.
We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.
2017-06-05 17:18:07 +09:00
af6f8bbd89
Fix namespaces and class names
2017-06-05 16:47:42 +09:00
0cb1df35e9
Merge remote-tracking branch 'upstream/master' into ingame_options
2017-06-05 14:53:37 +09:00
a3299809fe
Merge remote-tracking branch 'origin/master' into timingchange-rework
...
# Conflicts:
# osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
2017-06-05 10:19:53 +09:00
d6a1205d08
Merge branch 'master' into Daycore
2017-06-05 09:33:30 +09:00
a43890ffb4
update osu to use the framework's TooltipContainer
2017-06-03 14:50:35 +02:00
43f73c298f
Merge branch 'master' into timingchange-rework
2017-06-02 20:19:23 +09:00
7022c8d496
Move timing change stuff to osu.Game project.
2017-06-02 20:17:44 +09:00
1dd85b5986
Add alternative for random beatmap selection
...
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
ecc0d0b11c
Daycore mod
2017-05-30 12:49:06 -04:00
e737ded382
Applied suggested changes
2017-05-30 12:23:53 +03:00
72fa50f944
Make replay settings match design colours.
2017-05-30 17:02:04 +09:00
21a8071293
Merge https://github.com/ppy/osu into channel-selection
2017-05-29 20:31:35 -03:00
6918368afc
Merge branch 'master' into ingame_options
2017-05-29 18:12:02 +09:00
4a0c8fb5dd
Merge branch 'master' into breadcrumbs
2017-05-29 15:59:37 +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
9517bfc2f1
Add file to csproj.
2017-05-26 19:33:23 +09:00
64016f9466
Merge https://github.com/ppy/osu into channel-selection
2017-05-26 03:24:41 -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
ba2627d4e2
Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
2017-05-24 02:40:00 -03:00
4490596f5f
Keep one object per file
2017-05-24 02:37:27 -03:00
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09:00
c6d744eb7c
Merge branch 'master' of ppy/osu into menu-flashes
2017-05-23 20:00:02 -05:00
2ca0794b37
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-23 14:45:38 +03:00
0634a3a5c5
Merge branch 'master' into osu-direct
2017-05-23 17:33:20 +09:00
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
1295b0a7e1
Merge branch 'master' into ColdVolcano/beat-syncing
2017-05-23 10:51:47 +09:00
9798117d53
Move RoomStatus to a class instead of enum
2017-05-22 21:13:57 -03:00
03f6cded84
MultiplayerRoom -> Room
2017-05-22 12:44:58 -03:00
a1547f12d4
Applied suggestions + Update Framework
2017-05-22 04:38:21 -05:00
3235e280a9
Add to csproj.
2017-05-22 17:32:18 +09:00
b99bad055d
oops
2017-05-22 09:28:36 +03:00
50e3feb761
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-22 09:12:40 +03:00
7ce3b73ecd
Added UserPanel and UserStatus
2017-05-22 03:11:42 -03:00
d717ccf85e
Settings -> ReplaySettings
2017-05-22 09:07:08 +03:00
d0ff9e6576
Merge branch 'master' into sections
2017-05-22 12:52:27 +08:00
800a319470
Remove newline
2017-05-22 01:08:35 -03:00
0c30b2c698
Remove folder from osu.Game.csproj
2017-05-22 01:07:26 -03:00
0795089d86
Merge https://github.com/ppy/osu into drawable-multiplayer-room
2017-05-22 01:06:05 -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
0a0139aded
Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.
2017-05-22 10:12:33 +09:00
5b244367ee
allow for solutions were the osu repository isn't at the solution level
2017-05-21 20:29:05 +02:00
0615f104f0
SettingsContainer -> SettingsDropdownContainer
2017-05-21 18:22:27 +03:00
