Commit Graph

3688 Commits

Author SHA1 Message Date
Dean Herbert 0322e66c25 Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist 2017-07-12 13:07:23 +09:00
Dean Herbert e1e7cb7178 Remove unnecessary using statements 2017-07-12 12:55:52 +09:00
Dean Herbert c8c1dcae28 Fix incorrect filename 2017-07-12 12:55:40 +09:00
Thomas Müller 9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Thomas Müller 4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
Dean Herbert cbb521e395 Merge master in 2017-07-11 15:11:44 +09:00
Dean Herbert a9c50786b2 Fix osu! logo on main menu ending up in the wrong place
Also switch to using BeginDelayedSequence where possible.
2017-07-11 13:27:45 +09:00
Dean Herbert d6d79432c9 Update framework 2017-07-11 09:59:08 +09:00
Thomas Müller e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
Thomas Müller d9b362489b Fix incorrect TimeUntilNextBeat and add TimeSinceLastBeat 2017-07-10 12:07:38 +03:00
Thomas Müller c4e378571b Update framework 2017-07-10 11:54:23 +03:00
Dean Herbert 0e0c32008b More changes 2017-07-10 15:40:40 +09:00
Dean Herbert 0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Dean Herbert f856e89b58 Fix CI issues 2017-07-10 03:37:51 +09:00
Dean Herbert 7952e7caa9 Fix typos 2017-07-10 03:22:08 +09:00
Dean Herbert 2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
Thomas Müller 1b55692368 Merge branch 'master' into better-fill-mode 2017-07-08 12:49:46 +03:00
Thomas Müller 45d07e39c1 Update framework & change logic slightly 2017-07-08 12:41:15 +03:00
Thomas Müller d1ae12b4f7 Merge branch 'master' into settingsoverlay-scrollto 2017-07-08 12:26:08 +03:00
Thomas Müller 178685292a Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode 2017-07-08 12:25:08 +03:00
Thomas Müller b6f90dada5 Merge branch 'master' into settingsoverlay-scrollto 2017-07-08 12:21:11 +03:00
Dean Herbert 3c425dd07f Fix CI issue 2017-07-08 18:06:59 +09:00
Thomas Müller 22a987f6cc Update test cases to new framework and fix old crashes 2017-07-07 15:05:55 +03:00
Thomas Müller 6de9776e05 Update framework with tooltip changes 2017-07-07 08:59:17 +03:00
Thomas Müller d68f17b697 Use tooltip and context menu containers as newly required 2017-07-06 15:15:12 +03:00
Dean Herbert 724e5aa99e Merge master into better-input 2017-07-05 13:59:40 -07:00
Dean Herbert 2f8e6f20a6 Fix CI issues 2017-07-05 13:46:53 -07:00
Dean Herbert ecfaac4eac Merge remote-tracking branch 'jai-sharma/master' into better-caching 2017-07-05 13:37:43 -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 2d7eefa6fe Update Cached usage according to framework 2017-07-02 13:00:02 +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
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 7469d0e3ba Merge remote-tracking branch 'upstream/master' into new-samples 2017-06-29 11:51:51 -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
Thomas Müller 40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
Dean Herbert 480cdba023 Add OsuClickableContainer with generic sounds 2017-06-27 21:05:49 +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
EVAST9919 127c473f3b Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-25 23:38:39 +03:00
Dean Herbert ec99d83f6d Merge branch 'master' into fix_logo_sound 2017-06-25 15:13:57 +09:00
Dean Herbert 7baa2b7421 Fix CI issues 2017-06-25 14:46:59 +09:00
MrTheMake d914a1b00e Added animation parameter 2017-06-24 13:47:34 +02:00