4231 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	48368779ab	Avoid polluting Player with HUD-specific code.	2017-05-08 11:48:40 +09:00
Dean Herbert	10910cfcef	Make field readonly.	2017-05-08 11:47:06 +09:00
Dean Herbert	2f4fad9d41	Refactor colour selection.	2017-05-08 11:33:22 +09:00
Dean Herbert	df4a737c9b	Merge remote-tracking branch 'ppy/master' into hud-mod-display	2017-05-08 10:56:34 +09:00
Dean Herbert	ad4ec7023f	Merge pull request #718 from peppy/option-item-refactor ... Add OptionItem class	2017-05-08 10:41:49 +09:00
Dan Balasescu	11c2e66cee	Merge branch 'master' into option-item-refactor	2017-05-08 10:13:21 +09:00
Dan Balasescu	fbf05f12fc	Use controlWithCurrent as per comment.	2017-05-08 10:11:45 +09:00
Dan Balasescu	3adc203a86	Merge pull request #674 from peppy/vscode-updates ... Update vscode launch/task configuration.	2017-05-08 09:07:31 +09:00
Dan Balasescu	6d51ef2cc3	Merge branch 'master' into vscode-updates	2017-05-08 08:59:23 +09:00
Dean Herbert	91ad0cb75e	Merge pull request #723 from skettios/master ... Fix ModSelectOverlay accepting escape when it shouldn't	2017-05-06 10:21:11 +09:00
skettios	36dff94802	removed check if ModSelectOverlay is open	2017-05-05 18:16:48 -07:00
skettios	d129bd0c1f	Fix ModSelectOverlay accepting escape when it shouldn't ... Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.	2017-05-05 17:03:24 -07:00
Dean Herbert	4b385ded26	Tidy up ModIcon.	2017-05-05 13:22:10 +09:00
Dean Herbert	44f06e5423	Add hover expand support.	2017-05-05 13:17:36 +09:00
Dean Herbert	9c4f813da1	Remove unnecessary hide/show logic. ... Also change the way the overlay appears when actually playing.	2017-05-05 13:14:44 +09:00
Dean Herbert	b547dd6893	CI Fixes.	2017-05-05 13:06:54 +09:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
EVAST9919	95f6c999bd	Adjust scale and CI fixes	2017-05-04 17:59:01 +03:00
EVAST9919	66c858030a	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-04 17:35:41 +03:00
Dean Herbert	98b3b82c07	Apply CI fixes.	2017-05-04 23:32:27 +09:00
EVAST9919	475eb6fe5f	Cleanup	2017-05-04 17:29:52 +03:00
Dean Herbert	153951d3dd	Add OptionItem class ... Allow for centalised logic for all option UI controls.	2017-05-04 23:07:48 +09:00
EVAST9919	57c4232416	Added testcase	2017-05-04 11:58:37 +03:00
Dean Herbert	b98ae5d7c3	Merge pull request #704 from smoogipooo/mania-stage ... Mania playfield	2017-05-04 17:02:42 +09:00
Dean Herbert	efa60ee287	Merge branch 'master' into mania-stage	2017-05-04 16:58:16 +09:00
smoogipooo	72b2467e74	Throw exception if SpecialColumnPosition is set after IsLoaded.	2017-05-04 15:18:20 +09:00
smoogipooo	e307b6d563	Make SpecialColumnPosition only have an effect during load().	2017-05-04 15:12:32 +09:00
smoogipooo	a2bdd020e5	ColumnStyle -> ColumnPosition.	2017-05-04 14:54:31 +09:00
EVAST9919	6063231e40	float value fix	2017-05-03 16:58:10 +03:00
EVAST9919	26985dbc62	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 16:22:40 +03:00
Dean Herbert	f5981b1ab9	Merge pull request #699 from peppy/options-implementation ... Confine mouse mode and more	2017-05-03 22:02:58 +09:00
Dean Herbert	19f6d58723	Merge remote-tracking branch 'upstream/master' into options-implementation	2017-05-03 21:54:27 +09:00
Dean Herbert	c39b314ac2	Update framework.	2017-05-03 21:29:42 +09:00
Dean Herbert	330dd458bd	Trim whitespace.	2017-05-03 20:49:52 +09:00
Dean Herbert	489f586887	Add FPS display toggling. ... Kinda temporary but better than nothing.	2017-05-03 20:34:53 +09:00
Dan Balasescu	5574a8770b	Merge branch 'master' into mania-stage	2017-05-03 20:19:00 +09:00
Dan Balasescu	5024a74192	Update ManiaPlayfield.cs	2017-05-03 20:11:24 +09:00
EVAST9919	5f2f1d2763	CI fixes	2017-05-03 14:01:43 +03:00
EVAST9919	9e35eb8d97	Fixes	2017-05-03 13:53:45 +03:00
smoogipooo	8aa6bb636c	Reset column key when it can't be set.	2017-05-03 19:43:20 +09:00
smoogipooo	8d82a52942	Add revert to normal special style after all steps.	2017-05-03 19:38:27 +09:00
smoogipooo	14e4714f08	Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.	2017-05-03 19:38:15 +09:00
smoogipooo	06e014708a	Defer virtual method to load().	2017-05-03 15:57:15 +09:00
EVAST9919	e7a8619f01	ModIcon refactor	2017-05-03 09:48:10 +03:00
EVAST9919	898d9495ff	line fix	2017-05-03 08:27:47 +03:00
EVAST9919	f49cc124ed	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 08:26:54 +03:00
EVAST9919	6ea3629c9a	Adjust the size	2017-05-03 08:23:52 +03:00
Dan Balasescu	d21c3358b9	Less array explicivity.	2017-05-03 13:03:46 +09:00
smoogipooo	7de36b7aa2	CI cleanups.	2017-05-03 12:58:46 +09:00