Dan Balasescu
|
be3953aeb2
|
Merge branch 'master' into general-fixes
|
2017-05-16 20:52:38 +09:00 |
|
Dan Balasescu
|
14b06f3600
|
Merge pull request #765 from peppy/fix-guest-user
Fix guest user being null
|
2017-05-16 20:52:25 +09:00 |
|
Dan Balasescu
|
a7df99c6d2
|
Merge branch 'master' into fix-guest-user
|
2017-05-16 20:46:28 +09:00 |
|
Dean Herbert
|
1112dbb113
|
Merge pull request #738 from smoogipooo/mania-timing-sections
Mania timing sections
|
2017-05-16 20:17:20 +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 |
|
smoogipooo
|
0eba553138
|
Comments?
|
2017-05-16 19:33:56 +09:00 |
|
smoogipooo
|
bc629d193d
|
InternalChildren -> Children.
|
2017-05-16 19:26:46 +09:00 |
|
Dan Balasescu
|
d1c198d9bf
|
Merge pull request #762 from peppy/player-fixes
Player fixes
|
2017-05-16 19:20:33 +09:00 |
|
smoogipooo
|
9b0aed7c48
|
Add tween to time span changing.
|
2017-05-16 19:14:27 +09:00 |
|
Dean Herbert
|
a209a738ea
|
Merge branch 'master' into player-fixes
|
2017-05-16 19:11:23 +09:00 |
|
Dean Herbert
|
5786efd379
|
Merge pull request #759 from peppy/on-screen-display
On-screen display
|
2017-05-16 19:10:45 +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
|
3a12fbd581
|
Merge pull request #764 from peppy/fix-duplicate-channels
Fix duplicate channels being created on connection loss
|
2017-05-16 18:54:35 +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
|
3c8d75effb
|
Fix unused directive.
|
2017-05-16 18:36:38 +09:00 |
|
smoogipooo
|
6231a19b8c
|
Merge remote-tracking branch 'origin/master' into mania-timing-sections
|
2017-05-16 18:35:32 +09:00 |
|
Dan Balasescu
|
4e569f72c9
|
Merge pull request #761 from peppy/smoother-chat-tab-bold
Fade bold state of chat tabs better
|
2017-05-16 18:31:38 +09:00 |
|
Dean Herbert
|
712bd21e25
|
Fix duplicate channels being created on connection loss
Resolves #763
|
2017-05-16 18:28:42 +09:00 |
|
smoogipooo
|
235a5b1dff
|
Add notes to test case.
|
2017-05-16 18:27:33 +09:00 |
|
smoogipooo
|
be4ff5c038
|
Fix possible no-children-in-sequence exception.
|
2017-05-16 18:26:49 +09:00 |
|
smoogipooo
|
620b4bf863
|
Cleanup.
|
2017-05-16 18:17:34 +09:00 |
|
smoogipooo
|
60666dc824
|
Rename.
|
2017-05-16 18:05:09 +09:00 |
|
smoogipooo
|
f4a03ec1cf
|
Fix usings.
|
2017-05-16 18:03:30 +09:00 |
|
smoogipooo
|
8ed97a8335
|
Let's invert the playfield by default for now.
|
2017-05-16 18:02:54 +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 |
|
smoogipooo
|
ac02d1ab10
|
TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation).
|
2017-05-16 17:50:09 +09:00 |
|
smoogipooo
|
7039205363
|
Invert the playfield by default to make calculations a bit simpler and clean up a lot of code.
|
2017-05-16 17:34:41 +09:00 |
|
Dean Herbert
|
5bb4666c4d
|
Merge branch 'master' into on-screen-display
|
2017-05-16 17:07:18 +09:00 |
|
Dean Herbert
|
318549ec33
|
Merge pull request #757 from peppy/margin-padding-namespace
Update namespaces in line with framework
|
2017-05-16 17:07:08 +09:00 |
|
smoogipooo
|
62139015fb
|
Clamp TimeSpan.
|
2017-05-16 17:06:54 +09:00 |
|
smoogipooo
|
8d19bafc19
|
Add ability to hold down speed-changing keys.
|
2017-05-16 17:04:05 +09:00 |
|
smoogipooo
|
da932276e8
|
Make timing sections scroll again.
|
2017-05-16 17:03:43 +09:00 |
|
Dean Herbert
|
0feaa407f2
|
Merge branch 'margin-padding-namespace' into on-screen-display
|
2017-05-16 16:40:06 +09:00 |
|
Dean Herbert
|
ed92a1ee4e
|
Update framework
|
2017-05-16 16:37:05 +09:00 |
|
Dean Herbert
|
89e2a39d14
|
Merge remote-tracking branch 'upstream/master' into margin-padding-namespace
|
2017-05-16 16:36:34 +09:00 |
|
Dean Herbert
|
694b85c4b0
|
Update framework
|
2017-05-16 16:29:18 +09:00 |
|
Dan Balasescu
|
91de72e161
|
Merge branch 'master' into on-screen-display
|
2017-05-16 16:27:19 +09:00 |
|
Dan Balasescu
|
e501176e1c
|
Merge pull request #758 from peppy/general-fixes
General fixes
|
2017-05-16 16:27:02 +09:00 |
|
Dan Balasescu
|
fe3d035474
|
Merge branch 'master' into general-fixes
|
2017-05-16 16:16:43 +09:00 |
|
Dan Balasescu
|
e69469f4fb
|
Merge pull request #756 from peppy/logo-shockwave
Adjust osu! logo metrics and add shockwave impact animation
|
2017-05-16 16:16:11 +09:00 |
|
Dan Balasescu
|
83a8a27161
|
Merge branch 'master' into logo-shockwave
|
2017-05-16 16:10:34 +09:00 |
|
Dan Balasescu
|
6cbaf1ba05
|
Merge pull request #760 from peppy/message-fetch-fix
Fix initial requests of channel mesages not being performed
|
2017-05-16 16:07:40 +09:00 |
|