1479 Commits

Author	SHA1	Message	Date
MrTheMake	fd518e2294	Don't start a beatmap's track until the intro is done playing	2017-07-20 01:57:46 +02:00
Thomas Müller	c4619f614a	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-19 19:15:51 +02:00
smoogipooo	d75e439f94	Fix Player crashing due to null BeatmapInfo (now unused).	2017-07-20 01:27:27 +09:30
Dean Herbert	38431f8555	Fix remaining test case issues	2017-07-19 19:10:04 +09:00
Dean Herbert	8ce71ef235	Fix broken test case	2017-07-19 18:48:27 +09:00
Dean Herbert	da92fccdb0	Merge branch 'master' into non-null-beatmap	2017-07-19 18:32:42 +09:00
Dean Herbert	35157ca6b8	Make DefaultBeatmap private get.	2017-07-19 18:09:59 +09:00
Dean Herbert	c34856922c	Gratify CI	2017-07-19 16:34:18 +09:00
Dean Herbert	2a2f4e2a8b	Ensure side flashes are not visible during moving transitions	2017-07-19 16:13:01 +09:00
Dean Herbert	2b1e19814c	Side flashes should not be affected by parallax	2017-07-19 16:07:11 +09:00
Dean Herbert	c8593a38c8	Remove incorrect looping reset behaviour ... Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.	2017-07-19 15:55:16 +09:00
Dean Herbert	64ebc01a3b	Remove many now unnecessary null-checks	2017-07-19 15:45:23 +09:00
Dean Herbert	8e8767cd37	Give song select a better default background whecn the beatmap's can't be loaded	2017-07-19 15:16:55 +09:00
Dean Herbert	d0dea33faa	Make Beatmap (bindable) non-nullable.	2017-07-19 15:16:53 +09:00
Dean Herbert	0846414c5b	Simplify state changes	2017-07-19 15:16:51 +09:00
Dean Herbert	632d2e8ba5	Dummy beatmap has dummy ruleset	2017-07-19 15:16:48 +09:00
Dean Herbert	f168ee660c	Move dummy to BeatmapDatabase	2017-07-19 15:16:43 +09:00
Dean Herbert	3289d93f22	Give the dummy beatmap a background	2017-07-19 15:16:42 +09:00
Dean Herbert	21984ba764	Move DummyWorkingBeatmap to a more global level (OsuScreen)	2017-07-19 15:16:39 +09:00
Dean Herbert	df60fc0f0a	Stop playing previous beatmap even if new beatmap has no track	2017-07-19 15:16:36 +09:00
Dean Herbert	e47faf4e85	Add a dummy beatmap provider for use in BeatmapInfoWedge	2017-07-19 15:16:33 +09:00
Thomas Müller	3ba119c115	Ensure toolbar disappears when osu logo transition is cancelled	2017-07-18 17:09:53 +03:00
Thomas Müller	b40c897dbd	Fix osu logo shockwave playing when transition is aborted ... This is a very nice use-case scenario for TransformSequence.OnComplete	2017-07-18 15:28:56 +03:00
Thomas Müller	4d8261fe0b	Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs	2017-07-18 15:16:02 +03:00
Huo Yaoyuan	9cd895c249	Implement Ctrl+Enter in PlaySongSelect.	2017-07-18 15:55:21 +08:00
Dean Herbert	c5d23daa6b	Merge remote-tracking branch 'upstream/master' into remove-dragbar ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-07-18 13:44:23 +09:00
Huo Yaoyuan	cd7c04c54d	Simplify misc null-coalescing expression.	2017-07-18 12:30:10 +08:00
Dean Herbert	b5035ec245	Merge branch 'master' into songselect-preview-fix	2017-07-18 13:05:03 +09:00
Thomas Müller	87bcd526f3	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
Thomas Müller	19fb03e737	Try different formatting style	2017-07-16 18:28:20 +03:00
Thomas Müller	032e9df67b	ApplyDelay -> AddDelay	2017-07-16 17:47:29 +03:00
Thomas Müller	99221260c4	Replace several usages of BeginDelayedSequence with LINQ-style	2017-07-16 17:42:01 +03:00
Thomas Müller	71105bb9ee	Delay -> ApplyDelay; DelayReset -> ResetDelay	2017-07-16 14:06:46 +03:00
Thomas Müller	6063219b72	Update framework	2017-07-16 13:59:26 +03:00
Thomas Müller	a5e610a7ba	Update framework and fix compilation ... Most issues were related to BeginLoopedSequence usage and lack of "this." in front of transform helpers.	2017-07-14 19:18:12 +03:00
Thomas Müller	fd58c6e835	Nicer generic rolling counters	2017-07-14 19:14:07 +03:00
Thomas Müller	b5fbb26f8f	Merge branch 'master' of https://github.com/ppy/osu into better-transforms	2017-07-14 16:46:18 +03:00
Thomas Müller	c73a1ae058	Use TransformTo in rolling counters	2017-07-14 16:46:00 +03:00
Dan Balasescu	c13dc943f8	Merge branch 'master' into fix-track-rotation	2017-07-14 19:25:54 +10:00
Dan Balasescu	3914b3ba13	Merge branch 'master' into right-mouse-scrollbar	2017-07-14 19:15:00 +10:00
Dean Herbert	95a40e39ec	Merge branch 'master' into mods_overlay_fix	2017-07-14 17:31:52 +09:00
Dean Herbert	3aeed86392	Merge branch 'master' into drawable-room-update	2017-07-14 15:29:27 +09:00
Dean Herbert	6c9219856d	Add comment	2017-07-14 09:39:40 +09:00
Nabile Rahmani	840cc918ea	Use Enabled instead of a private field.	2017-07-13 23:35:19 +02:00
Dean Herbert	ce204b8e7b	Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar	2017-07-14 06:23:07 +09:00
Nabile Rahmani	8014cd55a2	Make the skip button clickable only once.	2017-07-13 21:59:17 +02:00
Dean Herbert	de46f3ab07	Remove all unnecessary parenthesis where object initialisers are used ... Enforces at CI.	2017-07-13 15:11:33 +09:00
DrabWeb	b196b1d3c6	CI fixes, switch RoomInspector to use BeatmapSetCover.	2017-07-13 01:24:59 -03:00
DrabWeb	fea40ccc1a	Share BeatmapSet cover sprite code.	2017-07-13 01:17:47 -03:00
DrabWeb	0624f578eb	Update with online beatmap changes.	2017-07-13 01:06:46 -03:00
DrabWeb	dc5ec319a2	Merge https://github.com/ppy/osu into drawable-room-update	2017-07-13 01:00:32 -03:00
Dean Herbert	2c1f3de47a	Rename 2X resources to be defaults	2017-07-13 10:27:39 +09:00
Dean Herbert	56c817e4b6	Merge branch 'master' into osu-direct-search	2017-07-13 10:16:27 +09:00
Dean Herbert	9d47dd9ff9	Add support for right mouse absolute scrolling (when enabled) ... Will likely need to be bindable when hooked up to settings and actually used.	2017-07-12 18:57:44 +09:00
EVAST9919	0b1db1502d	removed useless bool	2017-07-12 09:42:38 +03:00
EVAST9919	ab8fb2edab	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-12 09:31:56 +03:00
Dean Herbert	04e99d1369	Only apply disable rules when in a screen stack.	2017-07-12 13:40:17 +09:00
Dean Herbert	54f6befd67	Merge branch 'master' into fix-track-rotation	2017-07-12 13:18:16 +09:00
Dean Herbert	0322e66c25	Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist	2017-07-12 13:07:23 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
Seth	b30721edbe	Merge branch 'master' into drawable-room-update	2017-07-11 20:42:44 -03:00
Thomas Müller	4045083dcd	Update sorting comparers in line with framework changes	2017-07-11 21:21:58 +03:00
Dean Herbert	9bbcc0526d	Disable beatmap changes in specified screens	2017-07-11 18:39:10 +09:00
DrabWeb	b448603d6c	CI fixes.	2017-07-11 01:42:51 -03:00
Dean Herbert	a9c50786b2	Fix osu! logo on main menu ending up in the wrong place ... Also switch to using BeginDelayedSequence where possible.	2017-07-11 13:27:45 +09:00
DrabWeb	c449491c04	Fix RoomInspector covers.	2017-07-11 01:18:16 -03:00
DrabWeb	84701846ec	Merge https://github.com/ppy/osu into osu-direct-search	2017-07-11 00:26:49 -03:00
Thomas Müller	c4e378571b	Update framework	2017-07-10 11:54:23 +03:00
Dean Herbert	0e0c32008b	More changes	2017-07-10 15:40:40 +09:00
Dean Herbert	0e2dc9388a	More changes in-line with framework changes.	2017-07-10 12:55:47 +09:00
Dean Herbert	2c8b8c3f9c	Update loop logic in line with framework changes	2017-07-09 18:23:34 +09:00
EVAST9919	33206fcf0e	Use Hide instead of FadeTo(0)	2017-07-08 12:34:24 +03:00
EVAST9919	adb88a8d49	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-08 12:28:41 +03:00
Thomas Müller	178685292a	Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode	2017-07-08 12:25:08 +03:00
Dean Herbert	3c425dd07f	Fix CI issue	2017-07-08 18:06:59 +09:00
Thomas Müller	22a987f6cc	Update test cases to new framework and fix old crashes	2017-07-07 15:05:55 +03:00
Thomas Müller	6de9776e05	Update framework with tooltip changes	2017-07-07 08:59:17 +03:00
Jai Sharma	6eaeba5a92	Merge branch 'master' into remove-dragbar	2017-07-06 20:14:08 +01:00
Dean Herbert	724e5aa99e	Merge master into better-input	2017-07-05 13:59:40 -07:00
Thomas Müller	2d7eefa6fe	Update Cached usage according to framework	2017-07-02 13:00:02 +03:00
Dean Herbert	3a82d77e5b	Add missing tab	2017-07-01 07:10:04 -07:00
Thomas Müller	bb15bc0467	Use ReceiveMouseInputAt whenever possible	2017-06-30 09:54:03 +03:00
Dean Herbert	f3f3952ba5	More unused usings	2017-06-29 12:20:05 -07:00
Dean Herbert	6865f9b231	Remove unused parameters	2017-06-29 12:05:37 -07:00
Dean Herbert	1e50840a8e	Fix unused usings	2017-06-29 12:04:04 -07:00
Dean Herbert	7469d0e3ba	Merge remote-tracking branch 'upstream/master' into new-samples	2017-06-29 11:51:51 -07:00
Dean Herbert	ee96d39b93	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07:00
Dean Herbert	28f0da606a	Add OsuFocusedOverlayContainer with predefined sounds.	2017-06-28 10:18:12 -07:00
Thomas Müller	40225238d9	Set RelativeSizeAxes for updated FillMode behavior	2017-06-28 12:24:23 +03:00
DrabWeb	24283b9500	Remove animation from ModeTypeInfo layout (was causing visual issues).	2017-06-27 22:22:14 -03:00
Dean Herbert	480cdba023	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
EVAST9919	2ad6d3fa77	Simplify property	2017-06-27 05:41:24 +03:00
EVAST9919	714d53f329	Hide "Unranked" text in ModDisplay if play is ranked	2017-06-27 05:17:21 +03:00
Dan Balasescu	803bb3c780	Cleanup.	2017-06-26 23:05:35 +09:00
Dean Herbert	cbf188c293	Add new main menu backgrounds	2017-06-26 19:10:13 +09:00
EVAST9919	127c473f3b	Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random	2017-06-25 23:38:39 +03:00
Dean Herbert	df74a84b35	Merge branch 'master' into drawable-room-update	2017-06-25 15:55:36 +09:00
Dean Herbert	ec99d83f6d	Merge branch 'master' into fix_logo_sound	2017-06-25 15:13:57 +09:00
Dean Herbert	7baa2b7421	Fix CI issues	2017-06-25 14:46:59 +09:00
DrabWeb	5e1cb14e62	Use Vertical instead of Top and Bottom.	2017-06-24 19:11:02 -03:00
DrabWeb	091d786d47	Split long MarginPadding onto multiple lines.	2017-06-24 18:37:28 -03:00
Thomas Müller	1bca9ca0e9	Update framework with better children list	2017-06-24 12:56:35 +02:00
DrabWeb	68915d79a6	Remove unused fields.	2017-06-24 06:03:40 -03:00
DrabWeb	9f417743b6	Cleanup.	2017-06-24 05:54:00 -03:00
DrabWeb	bcd82a02f4	Licenses.	2017-06-24 05:45:34 -03:00
DrabWeb	fe875957a7	Share ruleset and type displaying, fix tag team icon.	2017-06-24 05:43:52 -03:00
DrabWeb	35951ffc40	Line endings.	2017-06-24 05:23:31 -03:00
DrabWeb	05b5fe8ae7	Share host/participant info displaying.	2017-06-24 05:21:42 -03:00
Jai Sharma	a0262e32b1	CI Fixes	2017-06-24 09:15:53 +01:00
DrabWeb	0de55776c0	Update DrawableRoom design.	2017-06-24 05:05:48 -03:00
Jai Sharma	e073100498	Merge branch 'master' into remove-dragbar	2017-06-24 08:55:02 +01:00
Thomas Müller	e3489928b7	Remove now obsolete InternalContains	2017-06-24 09:21:08 +02:00
EVAST9919	817d2c3da1	Fixed logo heartbeat playing even without beating	2017-06-23 23:57:57 +03:00
Jai Sharma	de50a1694f	Merge branch 'master' into remove-dragbar	2017-06-23 19:26:47 +01:00
Jai Sharma	a327f49d68	Updating progressBar.EndTime is more thread safe	2017-06-23 18:24:46 +01:00
Thomas Müller	f5829860a2	Get rid of AlwaysReceiveInput	2017-06-23 18:02:24 +02:00
Dean Herbert	1a8f207db3	Code formatting	2017-06-23 22:19:41 +09:00
Dean Herbert	81de1bd5a7	Merge branch 'master' into multiplayer-room-inspector	2017-06-23 21:55:18 +09:00
Jai Sharma	73c004fb71	Removed DragBar from song progress	2017-06-22 17:42:29 +01:00
EVAST9919	be94163d21	Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random	2017-06-22 04:28:47 +03:00
ColdVolcano	c619de7f9b	Rename const in all of the code	2017-06-21 18:55:44 -05:00
ColdVolcano	1978a4e8a6	Boost visualiser performance ... Also fixes amplitudes being set wrongly if kiai was false.	2017-06-21 18:32:31 -05:00
Dean Herbert	d0d0f11857	Merge branch 'master' into heartbeat	2017-06-21 15:35:54 +09:00
smoogipooo	fc0e44b214	Update framework.	2017-06-21 11:28:27 +09:00
paparony03	c8720bc5d5	Oops	2017-06-20 16:00:09 +10:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
EVAST9919	a991cff908	OsuLogo beat sound	2017-06-19 17:37:00 +03:00
Dean Herbert	17cb043cb2	Visualiser	2017-06-19 18:41:35 +09:00
Dean Herbert	a1b9499480	More documentation and constants	2017-06-19 18:41:11 +09:00
Dean Herbert	8c063fe2b8	Simplify AccentColour property for now	2017-06-19 18:38:39 +09:00
Dean Herbert	e269bdbad7	Use additive colour; adjust constants a bit	2017-06-19 18:30:13 +09:00
Dean Herbert	359cb4c083	Add kiai support	2017-06-19 18:29:44 +09:00
ColdVolcano	77ca48c1bd	CI Fixes	2017-06-18 23:52:42 -05:00
ColdVolcano	84aa17dea3	Attempt to fix possible loss of fraction	2017-06-18 23:08:27 -05:00
ColdVolcano	63aabc162b	Fix TestCaseMenuButtonSystem not starting up	2017-06-18 22:34:45 -05:00
ColdVolcano	3764c1d799	Make bar length and visualizer count floats	2017-06-18 22:28:18 -05:00
ColdVolcano	cea8dc5602	Fix possible loss of fraction	2017-06-18 22:13:21 -05:00
ColdVolcano	d3662636d6	CI fixes	2017-06-18 22:01:07 -05:00
ColdVolcano	ccac2e9a75	Add a visualizer around the logo	2017-06-18 19:33:50 -05:00
MrTheMake	a399b18837	Removed debug line	2017-06-19 00:11:47 +02:00
MrTheMake	3b3cc59471	Fix NullReferenceException	2017-06-18 20:21:24 +02:00
MrTheMake	23d1c89a67	Fix not applying song select preview seek	2017-06-18 20:12:28 +02:00
Dean Herbert	ae79ba48be	Merge branch 'master' into numpad-enter	2017-06-16 15:32:52 +09:00
MrTheMake	06089a74e3	Handle the numpad's Enter in cases where only the normal Enter was handled	2017-06-15 23:06:28 +02:00
EVAST9919	5117baae66	Make random works with panels too	2017-06-15 06:37:20 +03:00
Dan Balasescu	5a1edaa93c	Merge branch 'master' into cancel-select-random	2017-06-14 14:11:45 +09:00
smoogipooo	99a93d98dc	Merge remote-tracking branch 'origin/master' into fix-hacky-tabs	2017-06-13 19:46:01 +09:00
Dean Herbert	3ca80eb149	Add readonly	2017-06-13 15:54:26 +09:00
Dean Herbert	3efe8629d6	Fix hacky tabs	2017-06-12 18:39:22 +09:00
Dean Herbert	e94425f311	Improve the loading animation and use it in multiple places ... - Supersedes https://github.com/ppy/osu/pull/926. - [ ] Depends on https://github.com/ppy/osu-framework/pull/817.	2017-06-12 17:04:42 +09:00