18103 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jorolf	ccc804a9b2	get everything working again	2019-04-04 00:24:42 +02:00
jorolf	5bc6042309	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-04-03 22:59:27 +02:00
Dean Herbert	224c8d0f99	Merge pull request #4585 from Eclmist/bugfix/4584 ... Hides "Details" button when OnlineBeatmapID is null Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-04-04 01:54:22 +09:00
Dean Herbert	0919980cdd	Merge branch 'master' into bugfix/4584	2019-04-04 01:08:39 +09:00
Samuel Van Allen	bb516da5b6	Removed redundant empty argument list	2019-04-03 22:57:05 +08:00
Samuel Van Allen	3660924441	Trimmed whitespace	2019-04-03 22:40:20 +08:00
Samuel Van Allen	4d60f6fb6a	Use collection initializer and added missing blank line	2019-04-03 22:37:50 +08:00
Dean Herbert	6a5d913d37	Merge pull request #4581 from Eclmist/bugfix/4575 ... Avoid presenting beatmap when already at requested beatmap	2019-04-03 23:29:30 +09:00
Dean Herbert	2efab0ccbf	Merge branch 'master' into bugfix/4575	2019-04-03 23:08:02 +09:00
Samuel Van Allen	55a6e43778	Check against databasedSet instead of function param	2019-04-03 21:49:33 +08:00
Samuel Van Allen	73c7c6c316	Hides "Details" button when OnlineBeatmapID is null	2019-04-03 21:44:36 +08:00
David Zhao	8a40b27e8f	Remove need for logo relativePositionAxes none	2019-04-03 20:32:53 +09:00
David Zhao	2ed945605e	Fix Axes.None requirement for FacadeContainer	2019-04-03 19:57:22 +09:00
Dean Herbert	84da708d44	Fix nullref	2019-04-03 18:46:08 +09:00
Dean Herbert	cb417ebd77	Player -> User	2019-04-03 18:44:19 +09:00
Dean Herbert	a15a9bd03a	Rewrite updateDisplay logic to not fail on some cases	2019-04-03 18:29:46 +09:00
Dean Herbert	5c3c08566f	DrawableTopScore can be composite	2019-04-03 18:20:03 +09:00
Dean Herbert	5d37851d34	Rename and move test to correct location	2019-04-03 18:14:59 +09:00
smoogipoo	3b7d26cca8	Remove custom styled text	2019-04-03 17:49:01 +09:00
Dean Herbert	e88da95379	Merge branch 'master' into update-beatmap-scores-design	2019-04-03 17:02:17 +09:00
Dean Herbert	efd7bea771	Add further xmldoc	2019-04-03 17:01:11 +09:00
Dean Herbert	50f8ab3dfb	Fix gameplay offset handling on seeks	2019-04-03 16:58:20 +09:00
smoogipoo	3da008d293	Add a bit of padding between the sections	2019-04-03 16:43:56 +09:00
smoogipoo	f8596e055a	Separate into multiple files	2019-04-03 16:38:54 +09:00
smoogipoo	42c915190a	Reorder DrawableTopScore	2019-04-03 16:12:24 +09:00
smoogipoo	e246fad301	Clear table if no scores are provided	2019-04-03 16:09:34 +09:00
smoogipoo	2c18b6df1c	Fix score table using 300/100/50	2019-04-03 16:09:19 +09:00
Dan Balasescu	b0d6456523	Merge pull request #4582 from peppy/dont-ignore-nvika-return-code ... Correctly handle nvika/inspectcode return codes	2019-04-03 16:07:05 +09:00
smoogipoo	d6b15f040a	Improve statistics display	2019-04-03 15:57:36 +09:00
smoogipoo	0cf27e244d	Fix usages of SpriteText and obsolete members	2019-04-03 15:44:14 +09:00
Dean Herbert	542a46b0a7	Update r# version	2019-04-03 15:43:48 +09:00
Dean Herbert	f8d53a1e30	Fix variable mismatch	2019-04-03 15:43:36 +09:00
smoogipoo	dff58ab4ed	Initial cleanup pass of DrawableTopScore	2019-04-03 15:41:33 +09:00
smoogipoo	7f425059ae	Adjust transforms	2019-04-03 15:41:22 +09:00
Dean Herbert	1dad152363	Correctly handle nvika/inspectcode return codes	2019-04-03 15:37:22 +09:00
smoogipoo	ab4be3b75f	General refactoring	2019-04-03 15:20:38 +09:00
smoogipoo	0d127c21f1	Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design	2019-04-03 14:52:13 +09:00
Samuel Van Allen	e9269dc83b	Prevent unnecessary query in OsuGame::PresentBeatmap ... This resolves issue #4575	2019-04-02 23:57:31 +08:00
Dan Balasescu	caa2bdf012	Merge pull request #4578 from peppy/update-framework ... Update framework	2019-04-02 21:37:29 +09:00
Dean Herbert	072954e4c0	Update framework	2019-04-02 21:00:05 +09:00
Dean Herbert	bcd51afea1	Fix osu! icon font name mismatch	2019-04-02 19:55:46 +09:00
Dean Herbert	bc1077ed73	Remove remaining FontAwesome reference	2019-04-02 19:55:34 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dan Balasescu	b59e86f12e	Merge pull request #4529 from peppy/resume-cursor-2 ... Add osu! click-to-resume support	2019-04-02 13:07:12 +09:00
smoogipoo	d8af5e1c5a	Update in-line with drawnode changes	2019-04-02 11:56:22 +09:00
David Zhao	020be50f03	Merge remote-tracking branch 'upstream/master' into facade-container	2019-04-02 11:28:44 +09:00
Dean Herbert	184403c7e1	Merge branch 'master' into resume-cursor-2	2019-04-01 14:24:00 +09:00
Dean Herbert	14548e8a2d	Merge pull request #4566 from LeNitrous/colourable-menu-elements ... Make main menu elements colorable by skin Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-04-01 14:23:23 +09:00
Dean Herbert	14b606f761	Merge branch 'master' into colourable-menu-elements	2019-04-01 14:16:36 +09:00