14430 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	80f146e4bd	Fix a locally set beatmap getting overridden by the game-global one.	2016-11-12 18:26:27 +09:00
Dean Herbert	099b309645	Introduce back the concept of Rulesets.	2016-11-12 18:26:21 +09:00
Dean Herbert	16a0be44df	Add local InputManager to Player; handle Z and X.	2016-11-12 18:26:14 +09:00
Dean Herbert	18c0e431c1	Fix some nullrefs.	2016-11-12 18:25:58 +09:00
Dean Herbert	3b99a8fd06	Add a shadow and bit of elasticity to MusicController.	2016-11-12 17:09:58 +09:00
Dean Herbert	b65eb33774	Fix weird artifacting when the MusicController fades in and out by using a buffered container.	2016-11-12 16:44:31 +09:00
Dean Herbert	8d56a881d0	Merge pull request #157 from SirCmpwn/string-options ... Add TextBoxOption and wire it up	2016-11-12 16:11:09 +09:00
Dean Herbert	12bc259071	Merge pull request #158 from SirCmpwn/implement-options ... Implement ShowUnicode option behavior	2016-11-12 16:10:27 +09:00
Dean Herbert	a39d28efe2	Merge pull request #159 from SirCmpwn/platform-options ... Remove certain options when not running on Windows	2016-11-12 16:05:47 +09:00
Drew DeVault	00cc4278da	Split off SidebarButton	2016-11-12 01:53:20 -05:00
Drew DeVault	d346e49c4f	Update framework	2016-11-12 01:44:26 -05:00
Drew DeVault	a8bba445db	Move scroll logic into Update	2016-11-12 01:44:26 -05:00
Drew DeVault	32196c57af	Track the visible section in options	2016-11-12 01:44:11 -05:00
Drew DeVault	e535681bb5	Update framework	2016-11-11 00:21:59 -05:00
Dean Herbert	226d1aa0da	Merge pull request #160 from peppy/general-fixes ... Update framework.	2016-11-11 13:37:56 +09:00
Dean Herbert	ff67b77c5b	Merge pull request #154 from peppy/sidebar-toolbar-coexistence ... Make options overlay coexist with toolbar.	2016-11-11 13:34:08 +09:00
Dean Herbert	27542d9747	Merge pull request #151 from SirCmpwn/options-sidebar ... Expand the options sidebar on hover	2016-11-11 13:33:10 +09:00
Dean Herbert	a0e1513df6	Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence ... # Conflicts: # osu.Game/OsuGame.cs	2016-11-11 13:30:57 +09:00
Dean Herbert	d589542fc6	Update framework.	2016-11-11 13:28:51 +09:00
Drew DeVault	d36c8e9203	Remove certain options when not running on Windows	2016-11-10 21:54:01 -05:00
Drew DeVault	d49b418449	Implement ShowUnicode option behavior	2016-11-10 21:35:58 -05:00
Drew DeVault	e2365cfad2	s/internalText/InternalText/g	2016-11-10 18:25:20 -05:00
Drew DeVault	a81f099d40	Add TextBoxOption and wire it up	2016-11-10 18:17:15 -05:00
Drew DeVault	0d4560a054	Update to latest DI stuff	2016-11-10 17:40:42 -05:00
Drew DeVault	7327db307b	Fix player loading from song select	2016-11-10 16:43:04 -05:00
Drew DeVault	2362665b8a	Re-cache the new FontStore when overwritten ... Fixes issues with font loading	2016-11-10 16:43:04 -05:00
Drew DeVault	fe9034323b	Get the game running, though not perfectly	2016-11-10 16:42:29 -05:00
Drew DeVault	ee24cd310c	Convert everything to DI pattern	2016-11-10 16:41:18 -05:00
Drew DeVault	dc03f36793	Use DI for Player	2016-11-10 16:38:44 -05:00
Drew DeVault	19fd6fe249	Introduce dependency injection	2016-11-10 16:38:25 -05:00
Dean Herbert	788c11de10	Merge pull request #103 from huoyaoyuan/music-controller ... Music controller	2016-11-10 12:54:56 +09:00
Dean Herbert	904d258dc3	Fix checkbox not updating correctly.	2016-11-09 20:13:13 +09:00
Dean Herbert	a5dcae859c	Give OptionsOverlay an offset to make up for toolbar possibly being present.	2016-11-09 15:24:27 +09:00
Dean Herbert	d9bd3717d0	Re-organise overlay-level elements in OsuGame.	2016-11-09 15:24:24 +09:00
Dean Herbert	fdb83bed79	Make OsuGameModes self-aware of if they want a toolbar or not.	2016-11-09 15:24:22 +09:00
Dean Herbert	9d1d5a5cea	Modify toolbar tooltips to be closer to design.	2016-11-09 15:24:19 +09:00
Drew DeVault	676cdc44b2	Add expanding options sidebar	2016-11-08 23:36:06 -05:00
Dean Herbert	d6dafd6b70	Merge pull request #150 from SirCmpwn/options ... Wire up all of the boolean options	2016-11-09 13:24:18 +09:00
Drew DeVault	3ad633f363	Wire up all of the boolean options	2016-11-08 23:17:08 -05:00
Dean Herbert	485f60b418	Merge pull request #149 from peppy/general-fixes ... Use margin instead of padding so mouseDown events on the sidebar butt…	2016-11-09 12:39:42 +09:00
Dean Herbert	04fa1f897e	Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling.	2016-11-09 12:32:38 +09:00
Dean Herbert	f1395b8408	Merge pull request #147 from peppy/options-fixes ... Options: Fix paddings, transitions, const variable names.	2016-11-09 12:20:15 +09:00
Dean Herbert	b2291ed615	Update framework.	2016-11-09 12:15:15 +09:00
Dean Herbert	d41d7b8e9a	Don't derive ScrollContainer unnecessarily.	2016-11-09 12:10:22 +09:00
Dean Herbert	d70e8806b4	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes	2016-11-09 11:41:36 +09:00
Dean Herbert	fe843edc4e	Merge pull request #148 from peppy/generic-container ... Generic containers.	2016-11-09 11:33:58 +09:00
Dean Herbert	2cbb74a2b8	Update framework.	2016-11-09 08:00:44 +09:00
Dean Herbert	28a94e2df1	Remove unused constant.	2016-11-08 20:35:21 +09:00
Dean Herbert	3ef26a6bf0	Fix paddings, transitions, const variable names.	2016-11-08 20:23:18 +09:00
Dean Herbert	97f3023cd9	Ctrl+O for options.	2016-11-08 19:27:37 +09:00