17238 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	340997f505	Rename remaining usage of PathWidth naming convention	2019-03-07 20:21:59 +09:00
Dean Herbert	27edc41c11	Update framework	2019-03-07 20:14:43 +09:00
Dean Herbert	5ab9f45a8f	Merge branch 'drawnode-changes'	2019-03-07 20:10:42 +09:00
Dean Herbert	7fa84335ce	Merge branch 'line-graph-fix'	2019-03-07 20:10:11 +09:00
Dean Herbert	1f44dde96b	Fix autoplay tests not working	2019-03-07 18:34:56 +09:00
smoogipoo	04d756524d	Adjust with shader changes	2019-03-07 18:30:18 +09:00
smoogipoo	e430b8a640	Merge remote-tracking branch 'nekodex/master' into drawnode-changes	2019-03-07 18:15:12 +09:00
David Zhao	b3e046c4d1	Rename PathWidth to PathRadius	2019-03-07 17:39:19 +09:00
David Zhao	b2f4850275	Apply twice the line radius in order to properly account for diameter	2019-03-07 17:25:51 +09:00
Jamie Taylor	c34e110a2c	Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel	2019-03-07 17:01:24 +09:00
Jamie Taylor	50c1b3a576	Move room resetting logic from MatchSubScreen to LoungeSubScreen	2019-03-07 16:49:48 +09:00
Dean Herbert	c9ca5098d9	Merge pull request #4430 from peppy/jit-abbreviation ... Add JIT as abbreviation	2019-03-07 16:17:37 +09:00
Dan Balasescu	ae4ca2cb66	Merge branch 'master' into fix-duplicate-bg-sprites	2019-03-07 16:11:33 +09:00
Dan Balasescu	235865ef8f	Merge pull request #4427 from nekodex/fix-mp-chat-in-own-room ... Fix inability to send messages to a newly created room	2019-03-07 16:11:10 +09:00
Dean Herbert	64b6eaa844	Simplify inward bindings	2019-03-07 16:04:11 +09:00
Dean Herbert	57204b4361	Add JIT as abbreviation	2019-03-07 16:03:24 +09:00
Dean Herbert	58ef397f4f	Move all clock related gameplay logic inside GameplayClockContainer	2019-03-07 16:02:24 +09:00
Dan Balasescu	7783c33398	Merge branch 'master' into fix-mp-chat-in-own-room	2019-03-07 15:59:53 +09:00
Dean Herbert	0b4f10950f	Merge pull request #4424 from nekodex/fix-mp-songselect-regression ... Fix crash on cancelling multiplayer song select when no existing song is selected	2019-03-07 15:40:20 +09:00
Jamie Taylor	ee076bbbe3	Fix chat channel ids not being updated on room creation	2019-03-07 15:35:57 +09:00
Jamie Taylor	e13516c2ba	Only attempt to restore CurrentItem state if present	2019-03-07 14:09:28 +09:00
David Zhao	d97c070ef1	Account for path width correctly in LineGraph	2019-03-07 13:45:55 +09:00
Jamie Taylor	6e5ea78ca2	Fix some nullref crashes when escaping out of new room creation	2019-03-06 20:03:37 +09:00
Jamie Taylor	5de6e29294	Reset currentRoom state when cancelling room creation	2019-03-06 20:03:37 +09:00
Jamie Taylor	8a69fc5534	Use AddUntilStep instead of AddWaitStep	2019-03-06 19:57:09 +09:00
Jamie Taylor	b5e89e2f3b	Add additional testing to check for extra children in the future	2019-03-06 19:13:25 +09:00
Jamie Taylor	ab0ac7a82a	Pass through timeBeforeLoad instead of hardcoding	2019-03-06 19:12:37 +09:00
Jamie Taylor	06b65e00c4	Prevent null beatmap from creating an extra drawable	2019-03-06 19:12:28 +09:00
Jamie Taylor	eb80549782	Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites	2019-03-06 19:12:22 +09:00
Dean Herbert	ffe53411f6	Add back cursor proxying	2019-03-06 17:44:58 +09:00
Dean Herbert	62716851a1	Revert some unnecessary changes	2019-03-06 17:41:54 +09:00
Dean Herbert	7aa30ca3f6	Change method of cursor creation	2019-03-06 17:41:54 +09:00
Dean Herbert	18826b3a59	Adjust cursor scale for its new surroundings	2019-03-06 17:41:54 +09:00
Dean Herbert	acf518c208	Move cursor inside playfield	2019-03-06 17:41:54 +09:00
Dean Herbert	5411c63093	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-06 17:14:08 +09:00
Dean Herbert	2300e59e91	Formatting and simplification	2019-03-06 14:19:00 +09:00
Dean Herbert	d70b373af9	Merge branch 'master' into mod-wind	2019-03-06 14:04:04 +09:00
Dean Herbert	00cdb3a44a	Merge pull request #4400 from nyquillerium/LobbyList ... Use correct background display type for multiplayer lobby listing	2019-03-06 13:34:15 +09:00
Dean Herbert	9441f88033	Use actual reference to default beatmap for fallback ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-03-06 13:01:37 +09:00
Dean Herbert	b94d080b1c	Merge branch 'master' into LobbyList	2019-03-06 12:34:36 +09:00
Dean Herbert	6b042eae94	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-05 22:22:56 +09:00
Dan Balasescu	60af8e2820	Merge pull request #4408 from peppy/simplify-gameplay-clock ... Simplify gameplay clocks	2019-03-05 20:43:44 +09:00
Dean Herbert	8a6fa0915e	Merge branch 'master' into simplify-gameplay-clock	2019-03-05 20:22:46 +09:00
Dean Herbert	558dbafb71	Use a safer method of setting the clock	2019-03-05 20:14:04 +09:00
Dean Herbert	d5943330b1	Fix potential infinite loop	2019-03-05 20:06:04 +09:00
Dean Herbert	cc855a8dcc	Merge pull request #4412 from LeNitrous/local-leaderboard-display ... Fix local leaderboard not displaying when logged out	2019-03-05 19:33:17 +09:00
Dean Herbert	76ce3954a0	Rename PauseContainer	2019-03-05 19:30:55 +09:00
David Zhao	89987210c3	Merge remote-tracking branch 'upstream/master' into LobbyList	2019-03-05 18:59:38 +09:00
David Zhao	34b2553b95	Remove redundant boolean	2019-03-05 18:59:25 +09:00
Dan Balasescu	fafc80818c	Fix typo ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-05 18:50:46 +09:00