2962 Commits

Author	SHA1	Message	Date
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
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