EVAST9919
|
e785f1ddf1
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-17 16:12:38 +03:00 |
|
EVAST9919
|
1e029d05a8
|
Added bindable to adjust playback speed
|
2017-05-17 16:10:49 +03:00 |
|
Dean Herbert
|
41c252760d
|
Move all pause logic into PauseContainer
|
2017-05-17 21:57:01 +09:00 |
|
EVAST9919
|
0867ef814c
|
Visible only in replay
|
2017-05-17 15:54:12 +03:00 |
|
EVAST9919
|
e0625a9b30
|
More overlays and overall fixes
|
2017-05-17 15:39:26 +03:00 |
|
EVAST9919
|
fd2150aa49
|
Moved collectionsDropdown to it's own class
|
2017-05-17 15:32:16 +03:00 |
|
smoogipooo
|
74c23ff6d8
|
Add base for event parsing code.
|
2017-05-17 20:46:23 +09:00 |
|
Dean Herbert
|
88a70e407c
|
Fix and simplifty pause logic
Resolves #770
|
2017-05-17 20:11:41 +09:00 |
|
Dean Herbert
|
cba7796777
|
Fix ratio container being added to a level too high
That's a bad ratio container! How did we not notice this until now?
|
2017-05-17 18:49:30 +09:00 |
|
Dan Balasescu
|
b21be8f3f5
|
Merge branch 'master' into fix-chat-after-disconnect
|
2017-05-17 17:51:35 +09:00 |
|
Dean Herbert
|
7bb38e927b
|
Fix song select reverting to first difficulty of current group on entering
|
2017-05-17 17:33:20 +09:00 |
|
Dean Herbert
|
cab12ee55a
|
Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed
|
2017-05-17 17:33:16 +09:00 |
|
EVAST9919
|
1a4025ab3c
|
ingame options basic logic
|
2017-05-17 10:36:57 +03:00 |
|
EVAST9919
|
5fb8830e3a
|
Moved music controller buttons to it's own class
|
2017-05-17 10:36:24 +03:00 |
|
Dean Herbert
|
78c1d4581f
|
Revert "Use generic IComparable for message."
This reverts commit aaaee5ed10 .
|
2017-05-17 13:44:43 +09:00 |
|
smoogipooo
|
9565bb9572
|
Fix hold notes - remove glow for now.
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
|
2017-05-17 13:09:49 +09:00 |
|
smoogipooo
|
17466a662c
|
Add hold note conversion.
|
2017-05-17 13:09:07 +09:00 |
|
Dean Herbert
|
231f7939a6
|
Fix channels being unnecessarily recycled on disconnect
Resolves #768
|
2017-05-17 12:42:02 +09:00 |
|
Dean Herbert
|
12cb530358
|
Merge branch 'master' into tidy-up
|
2017-05-17 09:24:11 +09:00 |
|
nyaamara
|
a3e93afb37
|
Merge pull request #3 from ppy/master
cool
|
2017-05-16 16:57:45 -04:00 |
|
nyaamara
|
b22c84287a
|
Fix typo.
|
2017-05-16 16:54:33 -04:00 |
|
Huo Yaoyuan
|
e2a7f00a52
|
Remove unused namespace.
|
2017-05-16 22:20:05 +08:00 |
|
Huo Yaoyuan
|
f1d5a92950
|
Use generic IEqutable to avoid typeless Equals.
|
2017-05-16 21:49:38 +08:00 |
|
Huo Yaoyuan
|
aaaee5ed10
|
Use generic IComparable for message.
|
2017-05-16 21:46:22 +08:00 |
|
Huo Yaoyuan
|
e911441394
|
Why AbandonedMutexException?
|
2017-05-16 21:23:14 +08:00 |
|
Huo Yaoyuan
|
d929de466a
|
DateDisplay -> DateTimeDisplay for more exactly.
|
2017-05-16 21:16:52 +08:00 |
|
Huo Yaoyuan
|
d213706d07
|
Use DateTimeOffset.
|
2017-05-16 21:14:50 +08:00 |
|
Huo Yaoyuan
|
b9a40a841b
|
Use IsAssignableFrom.
|
2017-05-16 21:04:54 +08:00 |
|
Dean Herbert
|
5a9745b492
|
Update API endpoint
|
2017-05-16 21:37:55 +09:00 |
|
Dan Balasescu
|
be3953aeb2
|
Merge branch 'master' into general-fixes
|
2017-05-16 20:52:38 +09:00 |
|
Dan Balasescu
|
a7df99c6d2
|
Merge branch 'master' into fix-guest-user
|
2017-05-16 20:46:28 +09:00 |
|
Dean Herbert
|
85daddcf6f
|
Merge branch 'master' into mania-timing-sections
|
2017-05-16 20:12:26 +09:00 |
|
Dean Herbert
|
041d4f93c0
|
Fix typo
|
2017-05-16 20:08:22 +09:00 |
|
Dean Herbert
|
fdf0137fc2
|
Remove incorrect padding
|
2017-05-16 19:58:34 +09:00 |
|
Dean Herbert
|
23807aa3b9
|
Better handling of logged in state
|
2017-05-16 19:55:45 +09:00 |
|
Dean Herbert
|
2384f7b0c1
|
Ensure LocalUser is never null
|
2017-05-16 19:49:50 +09:00 |
|
Dean Herbert
|
a209a738ea
|
Merge branch 'master' into player-fixes
|
2017-05-16 19:11:23 +09:00 |
|
Dan Balasescu
|
ca9c52ce38
|
Merge branch 'master' into player-fixes
|
2017-05-16 18:54:55 +09:00 |
|
Dean Herbert
|
0c7ceea4fd
|
Merge branch 'master' into on-screen-display
|
2017-05-16 18:54:54 +09:00 |
|
Dean Herbert
|
71b14bb8af
|
Merge branch 'master' into fix-duplicate-channels
|
2017-05-16 18:50:21 +09:00 |
|
Dan Balasescu
|
0215b45088
|
Merge branch 'master' into player-fixes
|
2017-05-16 18:39:21 +09:00 |
|
smoogipooo
|
6231a19b8c
|
Merge remote-tracking branch 'origin/master' into mania-timing-sections
|
2017-05-16 18:35:32 +09:00 |
|
Dean Herbert
|
712bd21e25
|
Fix duplicate channels being created on connection loss
Resolves #763
|
2017-05-16 18:28:42 +09:00 |
|
Dean Herbert
|
3673e4af1f
|
Fade bold state of chat tabs better
|
2017-05-16 18:00:29 +09:00 |
|
Dean Herbert
|
6487bf45cf
|
Eagerly attempt to pause the game when the window is not focused
|
2017-05-16 17:59:14 +09:00 |
|
Dean Herbert
|
b016d53b85
|
Fix TwoLayerButton not capturing MouseDown events
Caused clicks to pass through the skip button to the progress bar.
|
2017-05-16 17:59:07 +09:00 |
|
Dean Herbert
|
0feaa407f2
|
Merge branch 'margin-padding-namespace' into on-screen-display
|
2017-05-16 16:40:06 +09:00 |
|
Dean Herbert
|
89e2a39d14
|
Merge remote-tracking branch 'upstream/master' into margin-padding-namespace
|
2017-05-16 16:36:34 +09:00 |
|
Dan Balasescu
|
91de72e161
|
Merge branch 'master' into on-screen-display
|
2017-05-16 16:27:19 +09:00 |
|
Dan Balasescu
|
fe3d035474
|
Merge branch 'master' into general-fixes
|
2017-05-16 16:16:43 +09:00 |
|
Dan Balasescu
|
83a8a27161
|
Merge branch 'master' into logo-shockwave
|
2017-05-16 16:10:34 +09:00 |
|
Dean Herbert
|
f0ea445e46
|
Fix initial requests of channel mesages not being performed
fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.
|
2017-05-16 15:59:01 +09:00 |
|
Dan Balasescu
|
2ad9aa2ae5
|
Merge branch 'master' into chat-error-messages
|
2017-05-16 15:12:59 +09:00 |
|
Dean Herbert
|
5e5ad9a899
|
Add basic on-screen display
|
2017-05-16 15:03:03 +09:00 |
|
Dean Herbert
|
e09f1c7c91
|
Remove AudioDevice from game-level setting
Should be (and is already) in FrameworkConfig.
|
2017-05-16 12:59:47 +09:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
Dean Herbert
|
23760d6805
|
Adjust osu! logo metrics and add shockwave impact animation
|
2017-05-15 19:36:03 +09:00 |
|
Dean Herbert
|
3b1d5ce7df
|
CI fix
|
2017-05-15 13:31:51 +09:00 |
|
Dean Herbert
|
dcd4b4450d
|
Add error message in chat when attempting to use commands
|
2017-05-15 13:26:35 +09:00 |
|
Dean Herbert
|
1f3039926f
|
Reword settings text slightly
|
2017-05-15 12:57:55 +09:00 |
|
Dean Herbert
|
f730769186
|
Rewrite to make better
|
2017-05-15 12:54:56 +09:00 |
|
Dean Herbert
|
3b87a938db
|
Merge branch 'master' into cursor_size.
|
2017-05-15 12:23:49 +09:00 |
|
Dean Herbert
|
622b155fda
|
OsuConfig -> OsuSetting
|
2017-05-15 10:56:27 +09:00 |
|
Dean Herbert
|
eaaba11586
|
Change all instances of options to settings where applicable
|
2017-05-15 10:55:29 +09:00 |
|
EVAST9919
|
b6460d89c9
|
Cleanup
|
2017-05-14 10:26:52 +03:00 |
|
EVAST9919
|
49f5364e9e
|
CI fixes
|
2017-05-14 07:35:23 +03:00 |
|
EVAST9919
|
12dab6f75c
|
iplemented stable-like algorithm
|
2017-05-14 07:28:12 +03:00 |
|
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 |
|