h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 07:33:21 +08:00
Code Issues Releases Wiki Activity
5,604 Commits 3 Branches 657 Tags 364 MiB
7e5b920c92
Commit Graph

3625 Commits

Author SHA1 Message Date
smoogipooo
9e5a53aae7 Fix possible nullrefs. 2017-05-29 10:53:55 +09:00
Dean Herbert
7b52c4621d Merge branch 'master' into musiccontroller-init-fix 2017-05-29 10:28:56 +09:00
DrabWeb
8994c57f3c Update with framework changes 2017-05-28 15:14:22 -03:00
Seth
0e087994a1 Merge branch 'master' into social-browser 2017-05-28 15:11:00 -03:00
Thomas Müller
a4903e62ba Merge branch 'master' into fix-nullrefs 2017-05-28 16:07:10 +02:00
Dean Herbert
bfede3647f Merge branch 'master' into fix-direct-hotkey 2017-05-28 22:47:14 +09:00
jorolf
9a4abcc199 Merge branch 'master' into better-multimod-animation 2017-05-28 14:39:04 +02:00
Thomas Müller
bb14708165 Merge branch 'master' into fix-chat-overlay-drift 2017-05-28 14:38:39 +02:00
Dean Herbert
bc47dedf27 Add non-null assertion 2017-05-28 21:34:15 +09:00
Dean Herbert
3644198c6e Fix CI issues 2017-05-28 21:20:11 +09:00
Dean Herbert
ed8b34d5ed Fix drift when dragging chat beyond bounds 2017-05-28 21:11:46 +09:00
Dean Herbert
d749fc516d Update focus handling in line with framework changes 2017-05-28 20:08:46 +09:00
Dean Herbert
bdeaf2dbb4 Update method names in line with framework changes 2017-05-28 18:34:12 +09:00
EVAST9919
743dfcc130 More xmldoc and few Title text fixes 2017-05-28 00:56:11 +03:00
DrabWeb
816caf86ea Better exception for SearchableListFilterControl's generic type argument not being an enum 2017-05-27 18:49:55 -03:00
DrabWeb
239472c451 Lowercase hex colours 2017-05-27 18:35:46 -03:00
DrabWeb
d4a9813af9 Cleanup BreadcrumbTabItem visibility code 2017-05-27 18:19:09 -03:00
DrabWeb
b88c07f1a0 Make channel readonly 2017-05-27 17:49:57 -03:00
DrabWeb
754fe956f9 Make ChannelSection headers uppercase in the setter 2017-05-27 17:40:20 -03:00
DrabWeb
b632e7f1ad Accept Channel in ctor and remove Channel property 2017-05-27 17:35:42 -03:00
smoogipooo
330bd4e11d Fix osu!direct hotkey overriding drawings hotkey (for now). 2017-05-27 20:24:23 +09:00
Jorolf
e86ccf61b3 use recursion 2017-05-27 10:11:59 +02:00
ColdVolcano
e46e1d96a7 Move logic to handleEvent 2017-05-27 00:20:19 -05:00
ColdVolcano
a523dfc388 Allow variables of variables 
Some storyboards like to do tricky stuff
 2017-05-27 00:13:46 -05:00
ColdVolcano
0b770d1225 Allow for variables in storyboards 2017-05-26 23:55:34 -05:00
EVAST9919
b5a6d73104 Toogle visibility without ctrl pressed 2017-05-27 02:38:29 +03:00
EVAST9919
bedcf04043 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-27 02:25:03 +03:00
DrabWeb
3699c39967 PADDING -> padding, make private 2017-05-26 16:46:09 -03:00
DrabWeb
33d6b718be padding -> PADDING 2017-05-26 16:37:52 -03:00
DrabWeb
c9971bb490 Don't store hideChevron 2017-05-26 16:32:46 -03:00
DrabWeb
4c127a6130 CI fixes 2017-05-26 16:29:20 -03:00
DrabWeb
352d3d247b Fix incorrect sizes 2017-05-26 16:21:37 -03:00
DrabWeb
fb6ed159ca Use padding for chevron margin 2017-05-26 16:03:51 -03:00
Jorolf
db1dde72de change constant names 2017-05-26 16:29:15 +02:00
Jorolf
64612ef34b add multimod animation 2017-05-26 16:10:28 +02:00
EVAST9919
d052f093d5 Scaling on hover 2017-05-26 14:29:45 +03:00
jorolf
f6f1ea42ee Merge branch 'master' into channel-selector-tab-item 2017-05-26 13:18:50 +02:00
DrabWeb
cbe36259c3 Add BreadcrumbControl 2017-05-26 07:49:45 -03:00
EVAST9919
2c23703ca6 Removed amplitude container 2017-05-26 13:46:44 +03:00
smoogipooo
9517bfc2f1 Add file to csproj. 2017-05-26 19:33:23 +09:00
EVAST9919
ad66587273 Merge remote-tracking branch 'refs/remotes/ppy/master' into backbutton_beat 2017-05-26 13:19:47 +03:00
Jorolf
1e4bca90f0 remove duplicate code 2017-05-26 12:10:16 +02:00
smoogipooo
24ff599901 Merge remote-tracking branch 'origin/master' into mania-holdnote-input 2017-05-26 19:01:10 +09:00
smoogipooo
3ec41a313b Add base DrawableHitObject + HitObjectStartTimeComparer. 2017-05-26 18:48:18 +09:00
DrabWeb
c0999c7fc1 Unused using directives 2017-05-26 06:12:22 -03:00
DrabWeb
12f6276e05 Move DisplayStyleControl to all FilterControls 2017-05-26 06:05:05 -03:00
Dean Herbert
5eab611255 Fix some possible nullrefs on beatmap load failure 2017-05-26 17:36:38 +09:00
DrabWeb
38d0138978 CI fixes 2017-05-26 04:11:45 -03:00
DrabWeb
ae96ef08f7 Tab character 2017-05-26 04:02:04 -03:00
DrabWeb
4c551270e9 Add OnRequestLeave 2017-05-26 03:56:10 -03:00
smoogipooo
c2d3b6c05a Remove late initialization of head + tail, keep them updated with start time and end time. 2017-05-26 15:53:49 +09:00
DrabWeb
d632435a34 Make ChannelListItems scale better 2017-05-26 03:51:09 -03:00
DrabWeb
21e900df73 Transition code cleanup 2017-05-26 03:46:50 -03:00
DrabWeb
d29ebb139f Cleanup 2017-05-26 03:38:52 -03:00
DrabWeb
fb0b54e66a Remove merge error 2017-05-26 03:28:09 -03:00
DrabWeb
64016f9466 Merge https://github.com/ppy/osu into channel-selection 2017-05-26 03:24:41 -03:00
DrabWeb
5785715ad5 CI fixes 2017-05-26 03:10:36 -03:00
DrabWeb
28ee00109d Wave colours 2017-05-26 02:55:25 -03:00
DrabWeb
8359f6ced0 Incorrect colour 2017-05-26 02:49:04 -03:00
DrabWeb
68377494f7 Browser - SearchableList 2017-05-26 02:44:09 -03:00
DrabWeb
5831da6978 Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls 2017-05-26 02:32:01 -03:00
DrabWeb
fc67582c3f Cleanup 2017-05-26 02:16:56 -03:00
DrabWeb
e19a4f5e6f Add displaying users 2017-05-26 02:00:38 -03:00
DrabWeb
5c0d0cb7e7 Alpha on wrong object 2017-05-26 01:34:30 -03:00
DrabWeb
2d3995b85c Fix filter controls having margin when no controls given, add DisplayStyleControl to social, misc cleanups 2017-05-26 01:32:20 -03:00
DrabWeb
63313045d9 Add SocialOverlay to OsuGame 2017-05-26 00:58:18 -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
Dean Herbert
8ae7e84563 Merge branch 'master' into musiccontroller-init-fix 2017-05-26 10:48:32 +09:00
Jorolf
a9658ec66f update colour, width, icon and text 2017-05-25 20:25:59 +02:00
MrTheMake
9de7e7bc40 Fixes 2017-05-25 17:49:47 +02:00
Thomas Müller
061df80f23 Merge branch 'master' into triangles-particles 2017-05-25 16:02:47 +02:00
Dean Herbert
4ecb3220dd Merge remote-tracking branch 'ppy/master' into triangles-particles 2017-05-25 22:47:03 +09:00
Dean Herbert
9eec2edd30 Fix initial login state not being reflected in user panel 2017-05-25 22:43:33 +09:00
smoogipooo
c8cf387f5f A bit more cleanup. 2017-05-25 22:09:02 +09:00
smoogipooo
91dba765c2 Add back the concept of triangle ordering by size. 2017-05-25 22:03:36 +09:00
smoogipooo
86f6db2d31 Cleanup. 2017-05-25 21:33:49 +09:00
smoogipooo
97e57178a7 Make triangles use raw vertices instead of sprites. 2017-05-25 21:33:04 +09:00
MrTheMake
c32d816f9c Removed new line 2017-05-25 14:19:04 +02:00
MrTheMake
9ea70b849b Fix initialize beatmap change animation of the music controller 2017-05-25 14:16:51 +02:00
Dean Herbert
1a255fdf48 Fix display order regression 2017-05-25 19:47:18 +09:00
Dean Herbert
d7fa6933be Fix potential nullref 2017-05-25 16:33:58 +09:00
Dean Herbert
be81346573 Attempt to fix inner scope warning 2017-05-25 14:47:25 +09:00
Dean Herbert
df8c13c12d Merge branch 'master' into user-dropdown 2017-05-25 14:32:49 +09:00
Dean Herbert
012f60d59b Merge branch 'master' into drawable-multiplayer-room 2017-05-25 13:58:05 +09:00
DrabWeb
e22eb1f205 CI fixes 2017-05-24 22:39:07 -03:00
DrabWeb
ec3c92fc3c Trim whitespace 2017-05-24 22:26:48 -03:00
DrabWeb
9cad344401 Revert back header for login form, fix incorrect spacing on header 2017-05-24 22:02:32 -03:00
DrabWeb
8e09b738b0 Remove magic numbers 2017-05-24 21:51:00 -03:00
DrabWeb
9b863f60ab Adjust dropdown layout 2017-05-24 21:32:46 -03:00
DrabWeb
efd4c57431 Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem 2017-05-24 21:09:18 -03:00
DrabWeb
b57a3f2056 Initial layout of user panel and user dropdown 2017-05-24 19:44:48 -03:00
DrabWeb
b803e40a7d Unbind from room values when disposing 2017-05-24 17:02:28 -03:00
MrTheMake
dee9d0e3bd Merge branch 'master' into playsongselect-exit-fix 2017-05-24 16:26:43 +02:00
EVAST9919
181648515b Moving icon to the beat on the TwoLayerButton 2017-05-24 16:05:24 +03:00
Dean Herbert
0dbb2220e0 Add missing early activation to menu flashes 2017-05-24 21:07:12 +09: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
ca6a9b1b71 Inline cover 2017-05-24 04:21:34 -03:00
DrabWeb
a7914dc1e8 Convert transition_duration to const 2017-05-24 04:00:39 -03:00
DrabWeb
7c6540b008 Cleanup status transition code 2017-05-24 03:49:06 -03:00
Dean Herbert
45a964cebe Merge branch 'master' into osu-direct 2017-05-24 15:33:53 +09:00
DrabWeb
a25c504965 CI fixes 2017-05-24 03:08:48 -03:00
DrabWeb
72c9959215 resultCounts -> ResultAmounts 2017-05-24 02:40:34 -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
e59c1879a2 Remove tabs 2017-05-24 02:38:55 -03:00
DrabWeb
4490596f5f Keep one object per file 2017-05-24 02:37:27 -03:00
DrabWeb
b08668b6d9 Remove @ from to-be-localized strings 2017-05-24 02:19:45 -03:00
Dean Herbert
5e01940770 Compare with private field 2017-05-24 13:43:10 +09:00
Dean Herbert
15ee2b802e Hide direct overlay when requested 2017-05-24 13:41:07 +09:00
Dean Herbert
03f9a86366 Add missing readonly 2017-05-24 13:29:12 +09:00
Dean Herbert
16d9a677d0 Add a low-end cutoff for scale adjust 2017-05-24 13:08:59 +09:00
Dean Herbert
a9d1e54c27 Adjust triangle movement based on amplitude 2017-05-24 13:08:54 +09: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
Dean Herbert
c4916426f5 Merge branch 'master' into controlpoint-rework 2017-05-24 12:00:22 +09:00
Dean Herbert
53f489b447 Remove using 2017-05-24 11:50:12 +09:00
Dean Herbert
b1bd88ae71 Merge branch 'master' into logo-beat 2017-05-24 11:41:02 +09:00
Dan Balasescu
90d54a6cfe Merge branch 'master' into logo-beat 2017-05-24 10:36:30 +09:00
Dean Herbert
87a2cc2004 Merge branch 'master' into menu-flashes 2017-05-24 10:10:29 +09:00
ColdVolcano
207d6e4ac3 Update to new syntax of OnNewBeat 2017-05-23 20:01:20 -05:00
ColdVolcano
c6d744eb7c Merge branch 'master' of ppy/osu into menu-flashes 2017-05-23 20:00:02 -05:00
Dean Herbert
dee6a1e2be Merge branch 'master' into songselect-fix 2017-05-24 09:45:34 +09:00
MrTheMake
24f64c8815 More formatting 2017-05-24 02:38:05 +02:00
MrTheMake
67774192dd Formatting fixes 2017-05-24 02:30:32 +02:00
MrTheMake
0616256bd0 CI fix 2017-05-24 02:23:52 +02:00
MrTheMake
09adb23591 Fix scheduled task not being canceled 2017-05-24 02:22:30 +02:00
DrabWeb
be1ae2bd8e Remove ??, value can never be null 2017-05-23 15:08:02 -03:00
Dean Herbert
b477e5cd9e Fix potential nullref 2017-05-24 02:53:21 +09:00
smoogipooo
0a385055dc Remove Func<T>'d-ness. 2017-05-24 02:53:08 +09:00
DrabWeb
7a4b476121 Tab character 2017-05-23 14:46:23 -03:00
DrabWeb
aa9a636c3c Indentation 2017-05-23 14:42:57 -03:00
DrabWeb
7b9eacc213 CI fixes 2017-05-23 14:41:30 -03:00
DrabWeb
fbbcc80a3e Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-23 14:34:58 -03:00
DrabWeb
4f17a4fe91 Make result counts scroll with the panels 2017-05-23 14:34:34 -03:00
smoogipooo
41824e0179 Add comment. 2017-05-24 02:24:10 +09:00
smoogipooo
2d1df8fd8a xmldoc fixes. 2017-05-24 02:22:28 +09:00
smoogipooo
9e7f384203 Fix returning incorrect control points for non-timing points. 2017-05-24 02:19:22 +09:00
Dean Herbert
813b09189c Remove unused parameter 2017-05-24 02:09:31 +09:00
Dean Herbert
7e827c4f11 Add amplitude adjust 2017-05-24 01:45:01 +09:00
Dean Herbert
f57b234cc3 Expose Beatmap in BeatSyncedContainer 2017-05-24 01:44:47 +09:00
smoogipooo
462bbd02ba Simplify expression. 2017-05-24 01:38:28 +09:00
smoogipooo
7628cdf522 Return first control point in the list if the time is before it. 2017-05-24 01:38:04 +09:00
Jorolf
af9b02746a make fields readonly 2017-05-23 18:19:01 +02:00
Dean Herbert
b12300391b Merge branch 'master' 2017-05-24 01:17:09 +09:00
Jorolf
64cee72464 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:51:46 +02:00
Dean Herbert
ef1712a5af Merge branch 'master' into beat-sync-container-improvements 2017-05-24 00:46:14 +09:00
Jorolf
7ad10009e6 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:32:48 +02:00
Dean Herbert
0842e00f13 Merge branch 'master' into controlpoint-rework 2017-05-24 00:20:15 +09:00
Dean Herbert
a48a03bf38 Merge branch 'master' into menu-music-osz 2017-05-23 23:56:07 +09:00
MrTheMake
0603be5937 Unregister OnBeatmapChanged() when exiting song selection 2017-05-23 15:30:15 +02:00
EVAST9919
178f8127b8 overall fixes 2017-05-23 16:01:00 +03:00
EVAST9919
2ca0794b37 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-23 14:45:38 +03:00
EVAST9919
564abc1a5b using autosize instead of constant height 2017-05-23 14:32:45 +03:00
EVAST9919
165d6ef1bb Make transition a bit smoother 2017-05-23 12:30:39 +03:00
EVAST9919
2e28b10c36 CI fixes and removed useless property 2017-05-23 12:24:16 +03:00
EVAST9919
c7a241246e Better letterbox settings transition 2017-05-23 12:09:32 +03:00
EVAST9919
4b23cc47ea Moved KeyCounter visibility logic to it's own class 2017-05-23 11:53:42 +03:00
EVAST9919
eafe215169 Simplify Hud visibility change 2017-05-23 11:53:12 +03:00
Dean Herbert
0634a3a5c5 Merge branch 'master' into osu-direct 2017-05-23 17:33:20 +09:00
Dean Herbert
0dd52e4e29 Various refactoring 2017-05-23 17:26:28 +09:00
Dean Herbert
2decb2b2ff Add more flashiness during kiai time 2017-05-23 16:42:47 +09:00
Dean Herbert
73320f9a7e Don't bounce the ripple 
Also ripple better.
 2017-05-23 16:42:41 +09:00
Dean Herbert
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
smoogipooo
aad6f8f5d6 Refactoring of BeatSyncedContainer. 2017-05-23 16:11:46 +09:00
smoogipooo
1867cbb381 Revert a bit of BeatSyncedContainer for smaller changeset. 2017-05-23 16:06:30 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
2344f37a3c Always add TimingChange control points. 2017-05-23 15:26:07 +09:00
smoogipooo
002a0e99a2 Use SortedList + BinarySearch to find control points at time values. 2017-05-23 15:20:32 +09:00
smoogipooo
6bfd7e0fb0 xmldocs. 2017-05-23 14:11:37 +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
Dean Herbert
3e0aaa1aa0 Add basic beat response to osu! logo 2017-05-23 12:29:43 +09:00
Dean Herbert
1295b0a7e1 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-23 10:51:47 +09:00
DrabWeb
62897d302e Remove SettingsButton(old and outdated design), fix channel list scrolling under the header 2017-05-22 22:37:25 -03:00
DrabWeb
9798117d53 Move RoomStatus to a class instead of enum 2017-05-22 21:13:57 -03:00
DrabWeb
4681beab5d CI fixes 2017-05-22 13:22:14 -03:00
DrabWeb
cf0e7887b5 Unused using 2017-05-22 13:14:56 -03:00
DrabWeb
8b505a9e8b Remove tab character 2017-05-22 13:06:52 -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
261ea4c176 CoverBackgroundSprite for actually async cover loading 2017-05-22 12:41:59 -03:00
DrabWeb
35814e47e4 Colour -> GetAppropriateColour, adjust status change transition 2017-05-22 12:37:19 -03:00
Dean Herbert
5c5a18833a Merge branch 'master' into channel-selector-tab-item 2017-05-22 20:22:57 +09:00
smoogipooo
adf8bb853e Move load() to be directly below ctor. 2017-05-22 20:06:37 +09:00
smoogipooo
de575b3867 Early return if beatLength = 0. 2017-05-22 20:02:02 +09:00
smoogipooo
95c4704a9e Delay backwards instead of using a millisecond tolerance. 2017-05-22 20:01:28 +09:00
ColdVolcano
9235cbff8d Apply suggestions 2017-05-22 05:59:16 -05:00
ColdVolcano
63196df541 Typo fix 
Forgot the pharenteses
 2017-05-22 05:05:54 -05:00
ColdVolcano
601b840713 Apply suggestions 2017-05-22 04:55:33 -05:00
ColdVolcano
f2b5be27c8 CI Fixes 2017-05-22 04:53:32 -05:00
ColdVolcano
a1547f12d4 Applied suggestions + Update Framework 2017-05-22 04:38:21 -05:00
ColdVolcano
1ea60fd393 Merge pull request #828 into menu-flashes 2017-05-22 04:15:46 -05:00
Dan Balasescu
fc90cfa604 Update BeatSyncedContainer.cs 2017-05-22 17:50:05 +09:00
smoogipooo
3235e280a9 Add to csproj. 2017-05-22 17:32:18 +09:00
Dan Balasescu
a438a8b8d3 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-22 17:27:22 +09:00
smoogipooo
70d7f61f7c More inversion for logic simplification. 2017-05-22 17:19:39 +09:00
smoogipooo
f81ffa636d Use BindTo instead of taking the game's beatmap bindable. 2017-05-22 17:18:11 +09:00
smoogipooo
609aac6453 Better kiai mode detection. 2017-05-22 17:18:05 +09:00
smoogipooo
b241140496 Proper kiai mode detection. 2017-05-22 17:18:00 +09:00
smoogipooo
abe9c464a8 Invert if statements. 2017-05-22 17:17:54 +09:00
Huo Yaoyuan
63259a3457 Fix depth of header background. 
Thanks to the order of adding to parent container, the depth value is actually not needed.
 2017-05-22 16:00:03 +08:00
Huo Yaoyuan
85684e5fee Do not scroll headers to when scrolling position is negative. 2017-05-22 15:54:58 +08: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
EVAST9919
b99bad055d oops 2017-05-22 09:28:36 +03:00
DrabWeb
a73cf92994 Add second UserPanel to visual test, center cover sprite 2017-05-22 03:27:08 -03:00
DrabWeb
bdab545ca4 Use BeatmapBackgroundSprite 2017-05-22 03:15:22 -03:00
DrabWeb
77affc1eb7 Split onto multiple lines 2017-05-22 03:13:55 -03:00
EVAST9919
50e3feb761 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-22 09:12:40 +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
3c35badf06 Unused using 2017-05-22 02:03:53 -03:00
DrabWeb
6bf0ca59fe Make FilterControl not scroll with the panels 2017-05-22 02:03:26 -03:00
Huo Yaoyuan
d0ff9e6576 Merge branch 'master' into sections 2017-05-22 12:52:27 +08:00
ColdVolcano
059af0850b Changes in-line with framework 2017-05-21 23:47:08 -05:00
DrabWeb
d1df895844 Unused using 2017-05-22 01:16:59 -03:00
DrabWeb
26bf9dd64b Remove unused Background 2017-05-22 01:13:51 -03:00
DrabWeb
800a319470 Remove newline 2017-05-22 01:08:35 -03:00
DrabWeb
0c30b2c698 Remove folder from osu.Game.csproj 2017-05-22 01:07:26 -03:00
DrabWeb
0795089d86 Merge https://github.com/ppy/osu into drawable-multiplayer-room 2017-05-22 01:06:05 -03:00
DrabWeb
82fdf1a918 Bindables, avatars, more cleanup 2017-05-22 01:01:55 -03:00
Dean Herbert
d3495545c5 Merge branch 'master' into songselect-fixes 2017-05-22 12:29:18 +09:00
DrabWeb
e5ee7096f8 Initial cleanup 2017-05-22 00:07:15 -03:00
Dean Herbert
7f08d60008 Merge branch 'master' into generic-interface 2017-05-22 11:35:50 +09:00
Dean Herbert
04f0dcc255 Merge branch 'master' into replay-no-pausing 2017-05-22 11:09:31 +09: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
Dean Herbert
4b17bb8e69 Merge branch 'master' into mania-pattern-changes 2017-05-22 10:25:17 +09:00
smoogipooo
0a0139aded Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod. 2017-05-22 10:12:33 +09:00
Dean Herbert
93182e5da3 Merge branch 'master' into generic-interface 2017-05-22 09:52:40 +09:00
Dean Herbert
82cf94bbff Move spinner colours to local definition for now 
We don't want to start polluting the OsuColours namespace with non-UI colours.
 2017-05-22 09:50:45 +09:00
MrTheMake
e9c2b51012 Random the difficulty too 2017-05-22 01:59:10 +02:00
MrTheMake
5ef7451dba Improved LEFTand RIGHT key behaviour 2017-05-22 01:53:36 +02:00
DrabWeb
4e2126dca8 Fix nullref when changing display mode without any BeatmapSets added 2017-05-21 18:54:35 -03:00
DrabWeb
8c77f85667 Fix DirectOverlay expanding under the Toolbar 2017-05-21 18:52:30 -03:00
MrTheMake
4056338203 Remove unnecessary track starting 2017-05-21 21:35:49 +02:00
MrTheMake
0539584578 CI fix 2017-05-21 21:33:54 +02:00
MrTheMake
b543b1f9fc Remove unnecessary restart 2017-05-21 21:20:59 +02:00
DrabWeb
eb77c94150 Fix search field losing focus 2017-05-21 15:30:10 -03:00
Jorolf
5b244367ee allow for solutions were the osu repository isn't at the solution level 2017-05-21 20:29:05 +02:00
MrTheMake
6219b8e6dd Fixed an error with looping 2017-05-21 20:27:41 +02:00
MrTheMake
974e8d1f82 Fix pressing up always goes to the first beatmap group difficulty, not the last 2017-05-21 19:27:34 +02:00
MrTheMake
9b87f5d8db Reformating 2017-05-21 18:16:54 +02:00
MrTheMake
6d7f70d0ea Fix CI warnings 2017-05-21 18:00:31 +02:00
EVAST9919
0615f104f0 SettingsContainer -> SettingsDropdownContainer 2017-05-21 18:22:27 +03:00
MrTheMake
34653eb8c0 Fixed null references 2017-05-21 17:20:20 +02:00
MrTheMake
7db45cb58f Moved the whole looping assignments inside PlaySongSelect 2017-05-21 17:09:56 +02:00
MrTheMake
ec213efc49 Trimmed whitespaces 2017-05-21 16:13:20 +02:00
MrTheMake
cc35cc281c Fixed null reference in case there are no beatmaps 2017-05-21 16:10:10 +02:00
MrTheMake
48f4879157 Use the track's implemented looping algorithm to loop tracks in the song select screen 2017-05-21 15:57:41 +02:00
MrTheMake
043d1ed20a Updated preload condition to handle special case 2017-05-21 14:08:04 +02:00
MrTheMake
662ea0ec2d Repeat a beatmap's track if it has ended 2017-05-21 14:00:40 +02:00
MrTheMake
1546bbc66b Updated preload condition. 2017-05-21 13:04:04 +02:00
EVAST9919
8c1437c51a Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-21 13:44:52 +03:00
MrTheMake
44cad4e0ac Fix a bug that prevents the lowest beatmap group from being selected if it is not completly on-screen. 2017-05-21 03:04:12 +02:00
DrabWeb
51bc3dfe72 Padding below channel list, remove text shadows, fix search box focusing 2017-05-20 21:38:36 -03:00
DrabWeb
a60d1efc21 Basic channel joining (ignore layout in ChatOverlay, temporary) 2017-05-20 21:26:39 -03:00
DrabWeb
4a166c1949 Make ChannelSelectionOverlay a FocusedOverlayContainer 2017-05-20 20:48:36 -03:00
DrabWeb
2e1d01a268 Added searching 2017-05-20 20:22:55 -03:00
DrabWeb
47dfc0d7bc Added transition 2017-05-20 20:05:28 -03:00
DrabWeb
7eba619f80 Move Joined to Channel 2017-05-20 19:37:11 -03:00
DrabWeb
3cc51006cc Add settings button, background triangles, proper displaying of Channels 2017-05-20 19:30:40 -03:00
DrabWeb
6a8d745db1 Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned 2017-05-20 18:29:57 -03:00
DrabWeb
31890a1e01 Initial layout, channels items 2017-05-20 18:06:25 -03:00
Huo Yaoyuan
7357076c4d CI fixes. 2017-05-21 04:48:43 +08:00
Huo Yaoyuan
4a55666e03 Merge branch 'master' into sections 2017-05-21 04:43:39 +08:00
Huo Yaoyuan
f06f8b4dcd Make sidebar buttons working. 2017-05-21 04:33:05 +08:00
MrTheMake
33ebc8fd49 Trimmed more whitespaces 2017-05-20 22:23:49 +02:00
MrTheMake
97aadad113 Trimmed spaces. 2017-05-20 22:16:05 +02:00
MrTheMake
f76abe2329 Disallow clicking through the song select footer. 2017-05-20 22:13:23 +02:00
Huo Yaoyuan
aa409ac1a9 Move SearchTextBox out of SettingsHeader. 2017-05-21 04:12:16 +08:00
Huo Yaoyuan
a98f109d73 Use LayoutSize for header and footer layout. 2017-05-21 04:01:07 +08:00
Huo Yaoyuan
35712514a4 Update settings UI using SectionsContainer basically. 2017-05-21 03:50:04 +08:00
Huo Yaoyuan
93668e53a0 Add footer support. 2017-05-21 03:44:03 +08:00
Huo Yaoyuan
201b44dbf1 Do not make the name confusing. 2017-05-21 03:02:51 +08:00
Huo Yaoyuan
72621c81dc Handle null and invalidation of headers. 2017-05-21 02:37:34 +08:00
Huo Yaoyuan
e040f297c6 Set Masking = false and expose ScrollContainer. 2017-05-21 02:21:23 +08:00
MrTheMake
306feb177a Fix null pointer reference 2017-05-20 20:18:29 +02:00
Huo Yaoyuan
da47b0a260 Fix margin and offset calculating. 2017-05-21 02:11:55 +08:00
MrTheMake
031fddc995 Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set. 2017-05-20 19:53:18 +02:00
Dean Herbert
3ff5c271ea Merge branch 'master' into replay-no-pausing 2017-05-21 02:00:00 +09:00
MrTheMake
57b9ed0f54 Do not pause a running replay if the window is not focused. 2017-05-20 18:56:50 +02:00
DrabWeb
87ace2d7ec @"" -> string.Empty 2017-05-20 13:52:51 -03:00
ColdVolcano
07d148f708 Merge branch 'master' of ppy/osu into beat-syncing 2017-05-20 11:46:51 -05:00
ColdVolcano
38a566890f Add licence header 2017-05-20 11:44:19 -05:00
ColdVolcano
d5904499f7 Post merge fixes 2017-05-20 11:41:16 -05:00
ColdVolcano
2014d35301 Merge branch 'master' of ppy/osu into menu-flashes 2017-05-20 11:39:39 -05:00
DrabWeb
49eb096b03 Fix visual test mode toggle buttons activation state 2017-05-20 13:19:50 -03:00
ColdVolcano
4e83f12f34 Initial implementation 
Note this won't work with the osu!bgm because it is not a beatmap
 2017-05-20 11:02:42 -05:00
Dean Herbert
0b987be600 Merge branch 'master' into osu-direct 2017-05-20 16:17:59 +09:00
Dean Herbert
fb72693c96 Merge branch 'master' into playlist-item-paragraph 2017-05-20 15:47:54 +09:00
DrabWeb
995a573b9c @"" -> string.Empty 2017-05-20 03:22:37 -03:00
DrabWeb
7485a78128 Update framework 2017-05-20 03:14:22 -03:00
DrabWeb
1eb96e07bd Remove unused using directive 2017-05-20 03:01:09 -03:00
DrabWeb
0c5fec975d Change ModDisplay to use ReverseDepthFillFlowContainer 2017-05-20 02:56:00 -03:00
DrabWeb
139b03a1ce Only recreate text once per unicode option change 2017-05-20 02:05:13 -03:00
DrabWeb
43bd0f686b Fix artist being the opposite value 2017-05-20 01:25:42 -03:00
DrabWeb
48417beb81 Unused using directive 2017-05-20 01:22:33 -03:00