15609 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	328de07615	Merge branch 'master' into ArrangeMod	2018-09-14 18:58:00 +09:00
Dean Herbert	14c2aec53e	Merge remote-tracking branch 'upstream/master' into ArrangeMod	2018-09-14 18:48:32 +09:00
Dean Herbert	ccabad60fb	Merge pull request #3419 from peppy/fix-system-user ... Fix system user attempting to show in profile overlay	2018-09-14 18:46:22 +09:00
Dean Herbert	bf10561052	Merge pull request #3362 from MaxOhn/wiggle-branch ... Add "wiggle" mod	2018-09-14 18:30:14 +09:00
Dean Herbert	ec6185cd31	Reduce random allocations	2018-09-14 18:21:12 +09:00
Dean Herbert	ef31698f56	Further code tidying	2018-09-14 18:21:12 +09:00
Dean Herbert	00daaef27a	Use a slightly more suiting icon	2018-09-14 18:21:12 +09:00
Dean Herbert	9d94aa4e62	Fix formatting and constants	2018-09-14 18:21:12 +09:00
MaxOhn	b1f6828a1a	Added OsuModWiggle class and adjusted OsuRuleset.cs	2018-09-14 18:21:11 +09:00
Dean Herbert	da8b838438	Merge branch 'master' into ArrangeMod	2018-09-14 17:20:04 +09:00
Dean Herbert	a1328fb4e5	Merge branch 'master' into fix-system-user	2018-09-14 17:19:17 +09:00
Dean Herbert	3c8c7a0459	Move ChannelManager to OsuGame ... There's no reason for it to exist at OsuGameBase	2018-09-14 13:31:25 +09:00
Dean Herbert	be1365fb18	Improve exception text	2018-09-14 11:58:23 +09:00
Dean Herbert	24e0a984f0	Merge branch 'master' into Private_Messages	2018-09-14 11:52:04 +09:00
Dan Balasescu	7a9fe15a27	Merge pull request #3416 from Hanamuke/fix_hyperdash ... Fixes hyperdash computation (for nested objects)	2018-09-14 11:36:42 +09:00
Dan Balasescu	e9a522023b	Merge branch 'master' into fix_hyperdash	2018-09-14 11:27:27 +09:00
Hanamuke	b8afd01950	Merge branch 'master' into fix_combo	2018-09-13 21:55:19 +02:00
Hanamuke	1c2cc3837a	Compute combo for nested Objects. Display fruit depending on Combo for ... osu!catch	2018-09-13 21:52:15 +02:00
Dean Herbert	f280e910bb	Bump squirrel version	2018-09-14 04:26:30 +09:00
Dean Herbert	e430a3dd6a	Merge pull request #3414 from smoogipoo/judgement-fixes ... Fix hitobjects getting masked away before receiving a result	2018-09-14 04:25:09 +09:00
Dean Herbert	c6b909e4a5	Merge branch 'master' into judgement-fixes	2018-09-14 04:03:54 +09:00
Hanamuke	9b6f5c9097	Fix redundant paranthesis	2018-09-13 17:29:10 +02:00
Hanamuke	7e07a07c01	Fix HitObjects being out of order because of nested objects	2018-09-13 17:15:46 +02:00
Hanamuke	7d3380db66	Fixed comment. Created static CatchArea.GetCatcheWidth method	2018-09-13 17:01:33 +02:00
Hanamuke	623f8bfaf5	Merge branch 'master' into fix_hyperdash	2018-09-13 16:52:55 +02:00
Unknown	04853b8c83	don't show StatusPill without a difficulty	2018-09-13 13:49:57 +02:00
Unknown	638a2e5ba8	populate Status for Beatmap + BeatmapSet ... also added Status to APIBeatmap + APIBeatmapSet	2018-09-13 11:57:40 +02:00
Unknown	5414ce9932	add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet	2018-09-13 10:18:20 +02:00
Unknown	13b988053a	add status column to BeatmapInfo + BeatmapSetInfo	2018-09-13 10:10:58 +02:00
Unknown	221a99d886	fix StatusPill not setting text when initially set with NONE	2018-09-13 10:07:26 +02:00
Dean Herbert	4341d258af	Make readonly instead	2018-09-13 14:03:21 +09:00
Dean Herbert	0be3ba946f	Fix system user attempting to show in profile overlay	2018-09-13 13:40:46 +09:00
Dean Herbert	40f7c1bd99	Merge pull request #3411 from smoogipoo/texture-dispose-fix ... Reference whether texture is available rather than disposed	2018-09-13 13:15:27 +09:00
smoogipoo	067bc39185	Update nuget package	2018-09-13 12:47:26 +09:00
Dan Balasescu	96b4cb7821	Merge branch 'master' into texture-dispose-fix	2018-09-13 11:54:23 +09:00
Dan Balasescu	dbcbd82554	Merge pull request #3397 from peppy/fix-collection-modified ... Fix thread-safety of queued events list in ArchiveModelManager	2018-09-13 11:53:56 +09:00
Dan Balasescu	04f49200e2	Merge branch 'master' into fix-collection-modified	2018-09-13 11:43:48 +09:00
Dan Balasescu	9a590d5621	Merge pull request #3412 from peppy/fix-leaked-player-failures ... Wait longer before confirming test players are cleaned up	2018-09-13 11:41:50 +09:00
Roman Kapustin	60c0428979	Remove redundant empty argument list	2018-09-12 20:54:40 +03:00
Hanamuke	a3c3bfb1a8	Fixes hyperdash computation (for nested objects)	2018-09-12 19:48:35 +02:00
Roman Kapustin	749e89bd25	Introduce IdleTracker	2018-09-12 20:34:52 +03:00
Roman Kapustin	761d7629cd	Return to large logo after idle period	2018-09-12 18:09:19 +03:00
smoogipoo	356a60b561	Fix hitobjects in scrolling rulesets getting masked away	2018-09-12 15:14:51 +09:00
miterosan	e20b084900	Report the test results to appveyor	2018-09-11 22:11:25 +02:00
miterosan	2e91b86e00	Remove Redundant parentheses	2018-09-11 22:07:14 +02:00
miterosan	79c3c826ba	Merge branch 'master' of https://github.com/ppy/osu into Cakefy_osu!	2018-09-11 21:49:21 +02:00
miterosan	399d456edb	Pin the addin and tool versions down.	2018-09-11 21:49:10 +02:00
Dean Herbert	5d264fdbdd	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-09-11 13:56:57 +09:00
Dean Herbert	02313c6d6e	Wait longer before confirming test players are cleaned up	2018-09-11 13:21:05 +09:00
smoogipoo	9b0954ab81	Reference whether texture is available rather than disposed	2018-09-11 11:28:02 +09:00