smoogipooo
|
0728aea6a4
|
Fixes + cleanup.
|
2017-05-30 20:26:39 +09:00 |
|
Dan Balasescu
|
fe68e1b1af
|
Merge branch 'master' into storyboards
|
2017-05-30 19:53:44 +09:00 |
|
smoogipooo
|
93a33be596
|
val -> value, val -> line (in cases where a key is not used).
|
2017-05-30 19:52:43 +09:00 |
|
smoogipooo
|
0175b91927
|
Cleanups.
|
2017-05-30 19:52:21 +09:00 |
|
EVAST9919
|
4b624ced36
|
CI fixes
|
2017-05-30 12:31:56 +03:00 |
|
EVAST9919
|
e737ded382
|
Applied suggested changes
|
2017-05-30 12:23:53 +03:00 |
|
EVAST9919
|
963d6e9e8f
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-30 12:04:41 +03:00 |
|
smoogipooo
|
7416952eb3
|
Fix usings.
|
2017-05-30 17:36:42 +09:00 |
|
smoogipooo
|
72fa50f944
|
Make replay settings match design colours.
|
2017-05-30 17:02:04 +09:00 |
|
smoogipooo
|
c8066cfde9
|
Allow Nub/OsuCheckbox/OsuSliderBar colours to be overridden.
|
2017-05-30 16:40:35 +09:00 |
|
DrabWeb
|
a1453eb9e1
|
Fix filter text box input
|
2017-05-29 22:52:38 -03:00 |
|
DrabWeb
|
b6cb9d3229
|
Fix display style dropdown scaling the filter control
|
2017-05-29 22:39:59 -03:00 |
|
DrabWeb
|
2edbf64d69
|
Redundant parentheses
|
2017-05-29 22:22:14 -03:00 |
|
DrabWeb
|
96efa5a240
|
Hook up to channel selector tab item
|
2017-05-29 22:10:07 -03:00 |
|
DrabWeb
|
b9292b6240
|
Merge https://github.com/ppy/osu into channel-selection
|
2017-05-29 22:06:05 -03:00 |
|
DrabWeb
|
2ba86cffa6
|
Channel list item hover effect
|
2017-05-29 22:04:53 -03:00 |
|
DrabWeb
|
d8e86da78c
|
Better scroll dragger position
|
2017-05-29 22:00:15 -03:00 |
|
Dean Herbert
|
e91a3f06f1
|
Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item
|
2017-05-30 09:54:35 +09:00 |
|
Dean Herbert
|
fde579262f
|
User a simpler method to hide the background icon
|
2017-05-30 09:54:29 +09:00 |
|
DrabWeb
|
d29bf58817
|
Show scroll dragger
|
2017-05-29 21:50:15 -03:00 |
|
DrabWeb
|
745e2e5e18
|
Make the channel selection overlay hide/resize with chat
|
2017-05-29 21:23:03 -03:00 |
|
Dean Herbert
|
b8461cd02d
|
Merge branch 'master' into fix-triangle-smoothness
|
2017-05-30 08:58:05 +09:00 |
|
DrabWeb
|
50e50ce67e
|
Update with framework changes
|
2017-05-29 20:33:28 -03:00 |
|
DrabWeb
|
21a8071293
|
Merge https://github.com/ppy/osu into channel-selection
|
2017-05-29 20:31:35 -03:00 |
|
Thomas Müller
|
298c0f5757
|
Structure velocity code more clearly and avoid redundant parenthesis
|
2017-05-29 19:08:06 +02:00 |
|
Thomas Müller
|
db444a61cb
|
Reduce per-triangle per-frame computation significantly
|
2017-05-29 18:30:49 +02:00 |
|
Thomas Müller
|
d3f2d480a8
|
Fix incorrect triangle state within the first frame
|
2017-05-29 18:24:17 +02:00 |
|
Thomas Müller
|
2f063ee41d
|
Make triangle edges smooth again
|
2017-05-29 18:20:51 +02:00 |
|
EVAST9919
|
08219ccb42
|
Applied suggested changes
|
2017-05-29 19:00:29 +03:00 |
|
EVAST9919
|
261f1f4e1f
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-29 18:13:44 +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 |
|
Dan Balasescu
|
e4b876ff5b
|
Update ModButton.cs
|
2017-05-29 18:10:02 +09:00 |
|
Dean Herbert
|
7960b5cf26
|
More refactoring
Also allows rotation when reaching the end of the available mods.
|
2017-05-29 18:03:40 +09:00 |
|
Dan Balasescu
|
94ae730a20
|
Merge branch 'master' into storyboards
|
2017-05-29 17:49:51 +09:00 |
|
Dean Herbert
|
5e473c6c96
|
Merge remote-tracking branch 'upstream/master' into better-multimod-animation
|
2017-05-29 17:21:49 +09:00 |
|
Dean Herbert
|
31cc6917bc
|
Tidy up code, improve transition, add directionality
|
2017-05-29 17:20:55 +09:00 |
|
Dean Herbert
|
718eeb6df8
|
Use linq to tidy up casting
|
2017-05-29 16:18:07 +09:00 |
|
Dean Herbert
|
4a0c8fb5dd
|
Merge branch 'master' into breadcrumbs
|
2017-05-29 15:59:37 +09:00 |
|
Dean Herbert
|
f3422800b1
|
Merge remote-tracking branch 'upstream/master' into backbutton_beat
|
2017-05-29 13:04:43 +09:00 |
|
smoogipooo
|
c137ee822c
|
Give velocity a sane default value.
|
2017-05-29 12:19:51 +09:00 |
|
smoogipooo
|
231b1ae610
|
We don't need a curve.
|
2017-05-29 12:19:38 +09:00 |
|
smoogipooo
|
6101fe98e1
|
Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state.
|
2017-05-29 12:10:29 +09:00 |
|
smoogipooo
|
cd1da469c7
|
Cleanup + actually fix possible nullrefs.
|
2017-05-29 11:14:37 +09:00 |
|
smoogipooo
|
27d6cb6275
|
Merge remote-tracking branch 'origin/master' into mania-holdnote-input
|
2017-05-29 10:57:49 +09:00 |
|
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 |
|