EVAST9919
|
ca6df533bd
|
Automatic gameplay cursor size
|
2017-05-13 03:46:37 +03:00 |
|
Dean Herbert
|
fd9218b6d5
|
Use FirstOrDefault
|
2017-05-12 20:48:25 +09:00 |
|
Dean Herbert
|
24db423c4f
|
Merge remote-tracking branch 'upstream/master' into playlist-commit
|
2017-05-12 20:39:50 +09:00 |
|
Dean Herbert
|
e096dd8126
|
Merge branch 'master' into fix-beatmap-population
|
2017-05-12 20:30:06 +09:00 |
|
Dan Balasescu
|
815379646c
|
Merge branch 'master' into new-option-search
|
2017-05-12 20:22:11 +09:00 |
|
Dan Balasescu
|
d60da82c4c
|
Merge branch 'master' into fix-beatmap-population
|
2017-05-12 20:15:10 +09:00 |
|
Dean Herbert
|
6c117f15af
|
Remove unnecessary usings
|
2017-05-12 20:06:38 +09:00 |
|
Dean Herbert
|
a9b3f74218
|
Fix ruleset not always getting populated in a WorkingBeatmap
|
2017-05-12 20:05:44 +09:00 |
|
Dean Herbert
|
d3770d8395
|
Merge branch 'master' into chat-design-update
|
2017-05-12 19:57:57 +09:00 |
|
Dean Herbert
|
d2e066ca35
|
Move SearchTextBox to better namespace
Is being used in multiple places now.
|
2017-05-12 19:57:06 +09:00 |
|
Dan Balasescu
|
a5ff3f4d32
|
Merge branch 'master' into resizable-chat
|
2017-05-12 19:46:11 +09:00 |
|
Dan Balasescu
|
8ec79f788a
|
Merge branch 'master' into multiple-chat-channels
|
2017-05-12 19:35:12 +09:00 |
|
Dean Herbert
|
bc5bcfa66a
|
Make tab background opaque when chat is fullscreen
|
2017-05-12 19:15:04 +09:00 |
|
Dean Herbert
|
cf239f4d9c
|
Move chat into main content
Also changes the way parallax is applied to OsuScreens game-wide.
|
2017-05-12 19:03:21 +09:00 |
|
EVAST9919
|
9a04069123
|
removed useless booleans, using nullables instead
|
2017-05-12 10:16:31 +03:00 |
|
Dean Herbert
|
dbf60d24bf
|
Second design update pass.
|
2017-05-12 15:39:00 +09:00 |
|
Dean Herbert
|
6ea65009c4
|
Initial design update pass
|
2017-05-12 15:38:55 +09:00 |
|
Dean Herbert
|
c4a93cbc85
|
Move drawable chat related classes to better namespace
|
2017-05-12 15:38:51 +09:00 |
|
Dean Herbert
|
9cf4998701
|
Make chat resizable via drag, save user set size
|
2017-05-12 15:36:37 +09:00 |
|
EVAST9919
|
34b4efc4e9
|
Applied suggested changes
|
2017-05-12 08:12:34 +03:00 |
|
Dean Herbert
|
f248efb01f
|
CI Fixes
|
2017-05-12 13:25:50 +09:00 |
|
EVAST9919
|
79ed92a0d7
|
Simplified logic
|
2017-05-12 01:48:28 +03:00 |
|
EVAST9919
|
1f34cec5ce
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-11 22:22:57 +03:00 |
|
Dean Herbert
|
ffa59c6cb3
|
Support read-only channels, post to correct channel.
Also cache drawable channels better.
|
2017-05-11 23:51:26 +09:00 |
|
Dean Herbert
|
a77049213d
|
Add basic hard-coded inefficient multi-channel support.
|
2017-05-11 23:10:48 +09:00 |
|
Dean Herbert
|
f044b95ce8
|
Allow OsuTabControl to handle non-enum types.
|
2017-05-11 23:10:19 +09:00 |
|
Dan Balasescu
|
f5399f7f2b
|
Merge branch 'master' into mania-timing-sections
|
2017-05-11 22:02:58 +09:00 |
|
smoogipooo
|
9477024e7b
|
Merge remote-tracking branch 'origin/master' into mania-timing-sections
|
2017-05-11 21:48:20 +09:00 |
|
Dan Balasescu
|
02532e1dc8
|
Merge branch 'master' into general-fixes
|
2017-05-11 21:28:54 +09:00 |
|
Dean Herbert
|
9a1c662d1f
|
Update framework
|
2017-05-11 21:25:43 +09:00 |
|
Dan Balasescu
|
08f5cbca51
|
Merge branch 'master' into oauth-fixes
|
2017-05-11 21:07:13 +09:00 |
|
Dean Herbert
|
ca32caf9e4
|
Merge branch 'master' into new-option-search
|
2017-05-11 21:04:37 +09:00 |
|
smoogipooo
|
0739a76497
|
Make the playfield work in TestCaseGamefield.
|
2017-05-11 20:04:45 +09:00 |
|
Dean Herbert
|
c3d2cdd2f2
|
Fix typo
|
2017-05-11 19:49:28 +09:00 |
|
Dean Herbert
|
4e881644f6
|
Add thread-safety on access token validation logic.
|
2017-05-11 19:39:01 +09:00 |
|
Dean Herbert
|
7d221802a2
|
Fix refresh tokens not working correctly
Turns out there's plenty of slashes in refresh tokens.
|
2017-05-11 19:38:57 +09:00 |
|
Dean Herbert
|
b258109a9e
|
Fix chat input box not always keeping focus as expected
|
2017-05-11 19:38:36 +09:00 |
|
Dean Herbert
|
a2f6d8a3e6
|
Fix broken test cases, remove some recursive lookup methods.
|
2017-05-11 19:38:28 +09:00 |
|
Dean Herbert
|
6fd95e0c52
|
Fix post-merge breakage
|
2017-05-11 17:16:01 +09:00 |
|
Dean Herbert
|
bc54b3c85f
|
Merge branch 'master' into mania-notes
|
2017-05-11 17:13:29 +09:00 |
|
Dean Herbert
|
b0e522345c
|
Combine DrawableHitObject classes into one
|
2017-05-11 17:07:46 +09:00 |
|
smoogipooo
|
c0c33c09ab
|
Fix merge error.
|
2017-05-11 16:08:54 +09:00 |
|
Dean Herbert
|
ec67b617ae
|
Add OptionsHeader class
Makes search textbox anchor correctly. Also improves visual styling.
|
2017-05-11 16:06:18 +09:00 |
|
smoogipooo
|
a762f820c6
|
Fix possible nullrefs.
|
2017-05-11 14:50:18 +09:00 |
|
smoogipooo
|
2d2d1beddd
|
More concrete method to determine if all hit objects have been judged.
Covers the case where nested hit objects are involved.
|
2017-05-11 14:48:08 +09:00 |
|
smoogipooo
|
6445bea864
|
Make Playfield.HitObjects internal to playfields.
Because not all playfields will be using this.
|
2017-05-11 14:44:11 +09:00 |
|
Dean Herbert
|
df48204403
|
Fix OptionsOverlay stealing focus itself.
|
2017-05-11 13:56:21 +09:00 |
|
Dean Herbert
|
7d8af5f1da
|
Use SearchTextBox
Correctly handle focus.
|
2017-05-11 13:23:31 +09:00 |
|
smoogipooo
|
94585672b6
|
Merge remote-tracking branch 'origin/master' into mania-notes
|
2017-05-11 13:01:00 +09:00 |
|
Dean Herbert
|
6c5490e31c
|
Merge remote-tracking branch 'upstream/master' into new-option-search
|
2017-05-11 12:59:19 +09:00 |
|
Dean Herbert
|
70ef503403
|
Merge branch 'master' into metadata
|
2017-05-11 12:23:00 +09:00 |
|
Dean Herbert
|
262b42efe3
|
Merge branch 'master' into new-option-search
|
2017-05-11 12:20:58 +09:00 |
|
EVAST9919
|
ea0add2354
|
Fixed update condition
|
2017-05-11 02:34:57 +03:00 |
|
EVAST9919
|
d55c97a08a
|
Stop progress as soon as we at 100%
|
2017-05-11 01:48:46 +03:00 |
|
EVAST9919
|
5b469eff69
|
Fixes
|
2017-05-10 10:33:02 +03:00 |
|
EVAST9919
|
d8f9e71b84
|
Applied suggested changes
|
2017-05-10 10:14:44 +03:00 |
|
EVAST9919
|
7b17e331c4
|
cleanups
|
2017-05-10 03:45:31 +03:00 |
|
EVAST9919
|
113df86304
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-10 03:23:51 +03:00 |
|
smoogipooo
|
e1ed785cbf
|
Update framework.
|
2017-05-09 21:00:40 +09:00 |
|
smoogipooo
|
89bfc0ff22
|
Fix exception.
|
2017-05-09 20:55:38 +09:00 |
|
smoogipooo
|
ea76eff1e1
|
Merge remote-tracking branch 'origin/master' into mania-notes
|
2017-05-09 19:31:35 +09:00 |
|
EVAST9919
|
315f1f1256
|
CI fixes
|
2017-05-09 06:23:03 +03:00 |
|
EVAST9919
|
2c92ee432b
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-09 06:05:46 +03:00 |
|
EVAST9919
|
2826c663fd
|
Apply suggested changes
|
2017-05-09 06:05:37 +03:00 |
|
Dean Herbert
|
ab1768ef80
|
Merge branch 'master' into tidy-up
|
2017-05-09 10:27:29 +09:00 |
|
EVAST9919
|
de2486b8e6
|
Moved timeLeft recalculation to property
|
2017-05-08 20:36:02 +03:00 |
|
EVAST9919
|
17d1ecb8f5
|
Use float type for progress value
|
2017-05-08 19:42:36 +03:00 |
|
Jorolf
|
9aaac4ab0c
|
Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search
|
2017-05-08 18:30:33 +02:00 |
|
Jorolf
|
86f0173c6b
|
fix license header
|
2017-05-08 18:30:00 +02:00 |
|
EVAST9919
|
4b5e24cc36
|
Changed logic a bit
|
2017-05-08 19:14:19 +03:00 |
|
jorolf
|
3abf1b2a0b
|
Merge branch 'master' into new-option-search
|
2017-05-08 17:25:47 +02:00 |
|
EVAST9919
|
ae2186970c
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-08 18:16:16 +03:00 |
|
Huo Yaoyuan
|
cb21e98ae1
|
MatchCreate.ValidForResume = false.
|
2017-05-08 19:55:04 +08:00 |
|
Huo Yaoyuan
|
01616cc27c
|
Avoid extra MemoryStream in ArchiveReader.
|
2017-05-08 19:41:22 +08:00 |
|
Huo Yaoyuan
|
ced2332d20
|
Handle overlay in ToolbarOverlayToggleButton.
|
2017-05-08 19:37:41 +08:00 |
|
Huo Yaoyuan
|
e466380ee2
|
Generic infer for IJsonSerializable.DeepClone.
|
2017-05-08 19:33:37 +08:00 |
|
Huo Yaoyuan
|
345f80b775
|
Simplify constructor of SampleInfoList.
|
2017-05-08 19:30:55 +08:00 |
|
Huo Yaoyuan
|
dff05bec79
|
Use readonly fields.
|
2017-05-08 18:56:04 +08:00 |
|
Huo Yaoyuan
|
4c26a02e99
|
Remove unnecessary arguments in WorkingBeatmap's constructor.
|
2017-05-08 16:42:53 +08:00 |
|
Dean Herbert
|
9f1f926634
|
Add non-null assurance.
|
2017-05-08 12:45:55 +09:00 |
|
smoogipooo
|
e3b01e7b8c
|
Merge branch 'master' into mania-notes
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2017-05-08 12:12:40 +09:00 |
|
Dean Herbert
|
a38e95c607
|
Merge branch 'master' into master
|
2017-05-08 11:59:01 +09:00 |
|
Dean Herbert
|
48368779ab
|
Avoid polluting Player with HUD-specific code.
|
2017-05-08 11:48:40 +09:00 |
|
Dean Herbert
|
10910cfcef
|
Make field readonly.
|
2017-05-08 11:47:06 +09:00 |
|
Dean Herbert
|
2f4fad9d41
|
Refactor colour selection.
|
2017-05-08 11:33:22 +09:00 |
|
Dean Herbert
|
df4a737c9b
|
Merge remote-tracking branch 'ppy/master' into hud-mod-display
|
2017-05-08 10:56:34 +09:00 |
|
Dean Herbert
|
5131371c93
|
Merge branch 'master' into new-option-search
|
2017-05-08 10:49:49 +09:00 |
|
DrabWeb
|
de8428c95b
|
Make requested changes
|
2017-05-07 22:23:33 -03:00 |
|
Dan Balasescu
|
11c2e66cee
|
Merge branch 'master' into option-item-refactor
|
2017-05-08 10:13:21 +09:00 |
|
Dan Balasescu
|
fbf05f12fc
|
Use controlWithCurrent as per comment.
|
2017-05-08 10:11:45 +09:00 |
|
EVAST9919
|
f0145c7f4f
|
Trying to woke up AppVeyor
|
2017-05-08 02:16:56 +03:00 |
|
EVAST9919
|
926ed907c2
|
CI fixes
|
2017-05-08 02:00:21 +03:00 |
|
EVAST9919
|
dda25219bc
|
code fixes
|
2017-05-08 01:54:31 +03:00 |
|
EVAST9919
|
c3a42ded36
|
Fixed Graph/seeking offset
|
2017-05-08 01:23:51 +03:00 |
|
EVAST9919
|
531f2c410a
|
removed useless variable
|
2017-05-08 00:26:34 +03:00 |
|
EVAST9919
|
ea28a9f7ce
|
Adjust values
|
2017-05-08 00:16:58 +03:00 |
|
Jorolf
|
3c4faae554
|
add search box and the ability to search
|
2017-05-07 20:35:57 +02:00 |
|
Huo Yaoyuan
|
4f8549f220
|
Standardise usages of exceptions.
|
2017-05-07 00:38:17 +08:00 |
|
Jorolf
|
ef02f80881
|
Merge branch 'option-item-refactor' of git://github.com/peppy/osu into new-option-search
|
2017-05-06 17:55:28 +02:00 |
|
EVAST9919
|
d06b5783cb
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-06 17:33:51 +03:00 |
|
Huo Yaoyuan
|
f37c857af8
|
CI fixes.
|
2017-05-06 16:06:38 +08:00 |
|
Huo Yaoyuan
|
767cfaaac3
|
Access database recursively.
|
2017-05-06 15:37:53 +08:00 |
|
Huo Yaoyuan
|
146d57953d
|
Use metadata field of WorkingBeatmap.
|
2017-05-06 14:57:11 +08:00 |
|
Huo Yaoyuan
|
4f49151984
|
Make metadata a member of WorkingBeatmap.
|
2017-05-06 14:52:28 +08:00 |
|
skettios
|
36dff94802
|
removed check if ModSelectOverlay is open
|
2017-05-05 18:16:48 -07:00 |
|
skettios
|
d129bd0c1f
|
Fix ModSelectOverlay accepting escape when it shouldn't
Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.
|
2017-05-05 17:03:24 -07:00 |
|
WebFreak001
|
5aecc3d761
|
Made cursortrail work with multiple positions
|
2017-05-05 17:44:51 +02:00 |
|
DrabWeb
|
81d67cbe06
|
Play first visible set in playlist when commiting in the search field.
|
2017-05-05 01:59:24 -03:00 |
|
Dean Herbert
|
4b385ded26
|
Tidy up ModIcon.
|
2017-05-05 13:22:10 +09:00 |
|
Dean Herbert
|
44f06e5423
|
Add hover expand support.
|
2017-05-05 13:17:36 +09:00 |
|
Dean Herbert
|
9c4f813da1
|
Remove unnecessary hide/show logic.
Also change the way the overlay appears when actually playing.
|
2017-05-05 13:14:44 +09:00 |
|
Dean Herbert
|
b547dd6893
|
CI Fixes.
|
2017-05-05 13:06:54 +09:00 |
|
Dean Herbert
|
c9ba1ac4f6
|
Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
|
2017-05-05 13:00:05 +09:00 |
|
Dean Herbert
|
6298b3effd
|
Refactor ModSection and ModIcon to avoid null mods.
|
2017-05-05 12:16:41 +09:00 |
|
EVAST9919
|
95f6c999bd
|
Adjust scale and CI fixes
|
2017-05-04 17:59:01 +03:00 |
|
EVAST9919
|
66c858030a
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
|
2017-05-04 17:35:41 +03:00 |
|
Dean Herbert
|
98b3b82c07
|
Apply CI fixes.
|
2017-05-04 23:32:27 +09:00 |
|
EVAST9919
|
475eb6fe5f
|
Cleanup
|
2017-05-04 17:29:52 +03:00 |
|
Dean Herbert
|
153951d3dd
|
Add OptionItem class
Allow for centalised logic for all option UI controls.
|
2017-05-04 23:07:48 +09:00 |
|
EVAST9919
|
57c4232416
|
Added testcase
|
2017-05-04 11:58:37 +03:00 |
|
Dean Herbert
|
efa60ee287
|
Merge branch 'master' into mania-stage
|
2017-05-04 16:58:16 +09:00 |
|
WebFreak001
|
063b606a12
|
Fix readonly warning
|
2017-05-03 18:48:17 +02:00 |
|
WebFreak001
|
008ff9d2f9
|
InputResample CursorTrail
|
2017-05-03 18:33:42 +02:00 |
|
EVAST9919
|
6063231e40
|
float value fix
|
2017-05-03 16:58:10 +03:00 |
|
EVAST9919
|
26985dbc62
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
|
2017-05-03 16:22:40 +03:00 |
|
Dean Herbert
|
19f6d58723
|
Merge remote-tracking branch 'upstream/master' into options-implementation
|
2017-05-03 21:54:27 +09:00 |
|
Dean Herbert
|
330dd458bd
|
Trim whitespace.
|
2017-05-03 20:49:52 +09:00 |
|
Dean Herbert
|
489f586887
|
Add FPS display toggling.
Kinda temporary but better than nothing.
|
2017-05-03 20:34:53 +09:00 |
|
smoogipooo
|
956a7288fb
|
Add basic DrawableNote.
|
2017-05-03 20:12:27 +09:00 |
|
EVAST9919
|
5f2f1d2763
|
CI fixes
|
2017-05-03 14:01:43 +03:00 |
|
EVAST9919
|
9e35eb8d97
|
Fixes
|
2017-05-03 13:53:45 +03:00 |
|
smoogipooo
|
06e014708a
|
Defer virtual method to load().
|
2017-05-03 15:57:15 +09:00 |
|
EVAST9919
|
e7a8619f01
|
ModIcon refactor
|
2017-05-03 09:48:10 +03:00 |
|
EVAST9919
|
898d9495ff
|
line fix
|
2017-05-03 08:27:47 +03:00 |
|
EVAST9919
|
f49cc124ed
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
|
2017-05-03 08:26:54 +03:00 |
|
EVAST9919
|
a897dcbfbe
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-03 08:26:01 +03:00 |
|
EVAST9919
|
6ea3629c9a
|
Adjust the size
|
2017-05-03 08:23:52 +03:00 |
|
smoogipooo
|
1fa42b26e8
|
Make base DrawableHitObject<TJudgement> uninheritable.
|
2017-05-03 14:02:23 +09:00 |
|
Dean Herbert
|
8825277656
|
Merge branch 'master' into custom-drawings-flags
|
2017-05-03 09:36:51 +09:00 |
|
EVAST9919
|
2e30a69b67
|
removed using
|
2017-05-02 23:04:36 +03:00 |
|
EVAST9919
|
a955f9cbfd
|
Simplify hiding logic
|
2017-05-02 22:59:36 +03:00 |
|
EVAST9919
|
37c3133981
|
Fixes
|
2017-05-02 22:46:18 +03:00 |
|
EVAST9919
|
7e1efcc20b
|
Added ModsContainer
|
2017-05-02 22:34:07 +03:00 |
|
EVAST9919
|
00a8dbbacf
|
Added ModType for each mode
|
2017-05-02 21:36:55 +03:00 |
|
EVAST9919
|
6f44869875
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-02 17:20:10 +03:00 |
|
Dean Herbert
|
a036b059e8
|
Use provided parameters to avoid a second lookup.
|
2017-05-02 21:40:06 +09:00 |
|
Dean Herbert
|
691742b828
|
Remove most options which have not yet been implemented.
|
2017-05-02 19:40:30 +09:00 |
|
Dean Herbert
|
f9de733128
|
Formatting.
|
2017-05-02 18:53:33 +09:00 |
|
Dean Herbert
|
d4045ee2c0
|
We only have one release stream, so let's unlock it.
|
2017-05-02 18:40:30 +09:00 |
|
Dean Herbert
|
57c2dd1f49
|
Fix options dropdown labels never being displayed.
|
2017-05-02 18:35:23 +09:00 |
|