2273 Commits

Author	SHA1	Message	Date
Dean Herbert	8f3f886805	Merge branch 'master' into PlayerBase	2018-03-08 16:12:12 +09:00
pdrapoport	3731cbe5eb	Removing "mouse wheel disabled" checkbox from visual settings gameplay menu	2018-03-07 14:20:59 +01:00
smoogipoo	78d73d4c11	Additional fixes for flow ordering after framework changes	2018-03-06 17:20:58 +09:00
smoogipoo	148551afa2	osu!-side changes in-line with framework layout changes	2018-03-06 14:12:37 +09:00
TocoToucan	697ad63d72	Resolve merge conflicts	2018-03-05 22:24:25 +03:00
Dean Herbert	bd510e5356	Merge remote-tracking branch 'upstream/master' into clock-fixes	2018-03-02 21:01:53 +09:00
Dean Herbert	6dc9411a90	Don't use BufferedContainer for OsuLogo ... Minor performance improvement. Not sure why this was done but it's not required any more.	2018-03-01 16:01:42 +09:00
Dean Herbert	bda673e6fe	Merge branch 'master' into player-reduced-parallax	2018-02-28 23:15:25 +09:00
Dan Balasescu	33a64cb497	Merge branch 'master' into fix-multiple-tracks-playing	2018-02-28 22:53:02 +09:00
Dan Balasescu	25c748ed45	Merge branch 'master' into fix-player-exit	2018-02-28 22:05:44 +09:00
Dean Herbert	f9faf8e3d8	Localise offset clock usage out of Player as much as possible	2018-02-28 22:01:52 +09:00
Dean Herbert	01fcf9c813	Update in line with framework changes	2018-02-28 22:01:48 +09:00
Dan Balasescu	b898226a91	Merge branch 'master' into fix-mod-select	2018-02-28 21:52:07 +09:00
Dan Balasescu	a3d26d7d55	Merge branch 'master' into fix-song-select-iteration	2018-02-28 21:40:25 +09:00
Dean Herbert	08497427fd	Merge branch 'master' into fix-multiple-tracks-playing	2018-02-28 15:32:16 +09:00
Dean Herbert	bc0bbd2e3b	Merge branch 'master' into reduce-transforms	2018-02-28 14:39:31 +09:00
Dean Herbert	4a52db14d1	Fix depth of already-visible panels not being updates after a sorting change	2018-02-28 14:18:25 +09:00
Dean Herbert	dd6cf1379e	Reduce parallax effect during gameplay ... This also cleans up some shared code in OsuScreen.	2018-02-28 11:42:47 +09:00
Dean Herbert	0cd049c6b0	Rely less on zero-duration transform helpers ... They have huge overheads. See ppy/osu-framework#1411.	2018-02-28 11:00:54 +09:00
Dean Herbert	510ecd7c87	Ensure selection is finalised before exiting song select ... Resolves #2080.	2018-02-28 00:07:28 +09:00
Dean Herbert	f64afc738d	Fix incorrect exit block conditional ... Resolves #2130.	2018-02-27 23:59:34 +09:00
Dean Herbert	84a8fbe0b3	Fix null ref	2018-02-27 21:26:06 +09:00
Dean Herbert	034875be47	Fix bindings not being unbound on ModSelect ... Resolves #2018. Closes #2079.	2018-02-27 20:45:32 +09:00
Dean Herbert	9b44f447ca	Fix song select iteration when all panels are filtered ... Resolves #2069.	2018-02-27 17:52:12 +09:00
Dean Herbert	cff17f1864	Update in line with inverse ShoudProcessClock default	2018-02-27 17:23:38 +09:00
Dean Herbert	8e78a7b114	Fix HUD using incorrect clock for time display	2018-02-27 17:23:38 +09:00
Dean Herbert	37d2a2c3cc	Rename clock types to match across classes	2018-02-27 17:23:38 +09:00
Dean Herbert	3d52ead213	Rename sourceClock	2018-02-27 17:23:38 +09:00
Dean Herbert	fee258f2f2	Rework PauseContainer to better pause	2018-02-27 17:23:38 +09:00
Dean Herbert	d4f1723ae6	Remove unnecessary secondary argument from HUDOverlay	2018-02-27 17:23:38 +09:00
Dean Herbert	0635ae2293	Include missing offset	2018-02-27 17:23:38 +09:00
Dean Herbert	9c0dfb7c8c	Avoid creating an extra framed clock in SkipButton	2018-02-27 17:23:38 +09:00
Dean Herbert	c0d983bbdf	Merge branch 'master' into PlayerBase	2018-02-23 13:51:11 +09:00
Dean Herbert	f2b3d9a0e8	Change some missed instances	2018-02-22 14:17:35 +09:00
Dan Balasescu	34f76a4136	Merge branch 'master' into storyboard-improvements	2018-02-19 15:40:09 +09:00
Dan Balasescu	5401b0dfcd	Merge branch 'master' into abstract-model-managers	2018-02-19 14:56:21 +09:00
Dean Herbert	7c43a3b4c0	Merge branch 'master' into storyboard-improvements	2018-02-19 14:54:12 +09:00
Dean Herbert	e0faf14a3e	Actually consume ReplacesBackground	2018-02-19 12:33:07 +09:00
Dean Herbert	29adedfa96	Collapse visual settings by default in player	2018-02-16 12:47:32 +09:00
Dean Herbert	9760f30ce9	Tidy things up to make more sense	2018-02-16 12:08:36 +09:00
Dean Herbert	f22f9b5de0	Merge branch 'master' into PlayerBase	2018-02-16 11:26:57 +09:00
Dean Herbert	ddf49c2e65	Fix intro not being replaced by a playable song when entering song select	2018-02-16 10:45:15 +09:00
TocoToucan	c57e8785e2	Move all storyboard loading to Player itself	2018-02-15 23:57:53 +03:00
Dean Herbert	d340509b1d	Move ArchiveReaders to a more global namespace ... Also moves delete and action logic to a shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	6ff63c2f0c	Move deletion to ArchiveModelImportManager	2018-02-15 14:22:39 +09:00
Dean Herbert	d8f84fcca3	Give ArchiveReader a filename	2018-02-15 14:22:39 +09:00
Dean Herbert	6f29cd35af	Merge branch 'master' into PlayerResumeHotfix	2018-02-13 20:21:45 +09:00
Shane Woolcock	d603d032d5	Inlined delete beatmap dialog	2018-02-13 16:26:05 +10:30
Shane Woolcock	8d313486b3	Add a confirmation dialog to the Delete option in the beatmap context menu	2018-02-13 00:40:34 +10:30
TocoToucan	86f200e257	Fix possible nullref	2018-02-09 22:04:39 +03:00