5658 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Balasescu	1119905b77	Merge pull request #995 from peppy/update-resources ... Update resources	2017-07-07 19:19:20 -07:00
Dean Herbert	51f14ed21a	Update resources	2017-07-08 11:13:33 +09:00
Dean Herbert	7162de09f9	Merge pull request #982 from Tom94/better-input ... Replace Contains overrides with ReceiveMouseInputAt	2017-07-05 14:08:46 -07:00
Dean Herbert	724e5aa99e	Merge master into better-input	2017-07-05 13:59:40 -07:00
Dean Herbert	d3bb62d7fe	Merge pull request #985 from Tom94/better-caching ... Update Cached usage according to framework	2017-07-05 13:55:18 -07:00
Dean Herbert	2f8e6f20a6	Fix CI issues	2017-07-05 13:46:53 -07:00
Dean Herbert	192600066c	Update framework	2017-07-05 13:38:04 -07:00
Dean Herbert	ecfaac4eac	Merge remote-tracking branch 'jai-sharma/master' into better-caching	2017-07-05 13:37:43 -07:00
Dean Herbert	19e8f6ea90	Merge pull request #986 from Jorolf/sample-fix ... fix mod button samples	2017-07-05 12:57:32 -07:00
Jorolf	5df33ad2d7	use Length instead of Count()	2017-07-02 13:33:42 +02:00
Jorolf	c9784f57d3	fix mod button samples	2017-07-02 13:16:22 +02:00
Thomas Müller	3f8ddaaa23	Update framework	2017-07-02 13:09:56 +03:00
Thomas Müller	2d7eefa6fe	Update Cached usage according to framework	2017-07-02 13:00:02 +03:00
Thomas Müller	2ba3c4b87a	Merge pull request #981 from peppy/new-samples ... Shuffle sound samples around and make more conformant	2017-07-01 17:27:36 +03:00
Dean Herbert	3a82d77e5b	Add missing tab	2017-07-01 07:10:04 -07:00
Dean Herbert	043c7756f7	public -> protected	2017-07-01 07:09:26 -07:00
Thomas Müller	bbae6e2590	Remove unnecessary using	2017-06-30 10:02:07 +03:00
Thomas Müller	bb15bc0467	Use ReceiveMouseInputAt whenever possible	2017-06-30 09:54:03 +03:00
Thomas Müller	5c02f1812f	Remove now unneeded Contains overrides	2017-06-30 09:53:52 +03:00
Thomas Müller	b6fdbd6128	Update framework	2017-06-30 09:53:05 +03:00
Dean Herbert	f3f3952ba5	More unused usings	2017-06-29 12:20:05 -07:00
Dean Herbert	6865f9b231	Remove unused parameters	2017-06-29 12:05:37 -07:00
Dean Herbert	1e50840a8e	Fix unused usings	2017-06-29 12:04:04 -07:00
Dean Herbert	3fa6d106a5	Update framework	2017-06-29 11:52:49 -07:00
Dean Herbert	7469d0e3ba	Merge remote-tracking branch 'upstream/master' into new-samples	2017-06-29 11:51:51 -07:00
Dean Herbert	5900d260ce	Update resources submodule	2017-06-29 11:05:28 -07:00
Dean Herbert	ee96d39b93	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07:00
Dean Herbert	28f0da606a	Add OsuFocusedOverlayContainer with predefined sounds.	2017-06-28 10:18:12 -07:00
Dean Herbert	480cdba023	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
Dan Balasescu	5910d7f971	Merge pull request #975 from peppy/new-menu-backgrounds ... Add new main menu backgrounds	2017-06-27 00:02:30 +09:00
smoogipooo	b40526ced2	Update framework.	2017-06-26 23:47:15 +09:00
Dan Balasescu	803bb3c780	Cleanup.	2017-06-26 23:05:35 +09:00
Dean Herbert	cbf188c293	Add new main menu backgrounds	2017-06-26 19:10:13 +09:00
Dan Balasescu	e6818a45be	Merge pull request #891 from EVAST9919/cancel-select-random ... Add the ability to go back in random selection history	2017-06-26 18:03:36 +09:00
EVAST9919	127c473f3b	Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random	2017-06-25 23:38:39 +03:00
Dean Herbert	b582fc3f39	Merge pull request #968 from EVAST9919/fix_logo_sound ... Fix logo heartbeat playing when not hovered	2017-06-25 15:50:37 +09:00
Dean Herbert	ec99d83f6d	Merge branch 'master' into fix_logo_sound	2017-06-25 15:13:57 +09:00
Dean Herbert	7291f1d5c4	Merge pull request #971 from Tom94/children-list ... Update framework with better children list	2017-06-25 15:02:17 +09:00
Dean Herbert	7baa2b7421	Fix CI issues	2017-06-25 14:46:59 +09:00
Dean Herbert	63aeb42657	Update framework	2017-06-25 14:38:00 +09:00
Thomas Müller	1bca9ca0e9	Update framework with better children list	2017-06-24 12:56:35 +02:00
Dean Herbert	f70bdd80aa	Merge pull request #967 from Tom94/better-input ... Get rid of AlwaysReceiveInput (update framework)	2017-06-24 16:43:40 +09:00
Thomas Müller	494a77aa0d	Update framework	2017-06-24 09:35:54 +02:00
Thomas Müller	e3489928b7	Remove now obsolete InternalContains	2017-06-24 09:21:08 +02:00
EVAST9919	817d2c3da1	Fixed logo heartbeat playing even without beating	2017-06-23 23:57:57 +03:00
Thomas Müller	f5829860a2	Get rid of AlwaysReceiveInput	2017-06-23 18:02:24 +02:00
Dean Herbert	7e5b920c92	Merge pull request #885 from DrabWeb/multiplayer-room-inspector ... Multiplayer room inspector	2017-06-23 22:47:53 +09:00
Dean Herbert	f314f5f7ea	CI fixes	2017-06-23 22:34:36 +09:00
Dean Herbert	1a8f207db3	Code formatting	2017-06-23 22:19:41 +09:00
Dean Herbert	81de1bd5a7	Merge branch 'master' into multiplayer-room-inspector	2017-06-23 21:55:18 +09:00