1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 23:42:54 +08:00
Commit Graph

6083 Commits

Author SHA1 Message Date
EVAST9919
adb88a8d49 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix 2017-07-08 12:28:41 +03:00
Thomas Müller
d1ae12b4f7 Merge branch 'master' into settingsoverlay-scrollto 2017-07-08 12:26:08 +03:00
Thomas Müller
912cac318f Update framework 2017-07-08 12:25:18 +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
Dean Herbert
3570ec52a5 Merge pull request #993 from Tom94/better-test-cases
Update test cases to new framework and fix old crashes
2017-07-08 02:24:54 -07:00
Thomas Müller
b6f90dada5 Merge branch 'master' into settingsoverlay-scrollto 2017-07-08 12:21:11 +03:00
Dean Herbert
bb8efcc12f Fix CI issues (pass #2) 2017-07-08 18:17:47 +09:00
Dean Herbert
3c425dd07f Fix CI issue 2017-07-08 18:06:59 +09:00
Dean Herbert
f2fa8dc2d2 Update framework 2017-07-08 18:01:30 +09:00
Dean Herbert
cb9950d846 Merge remote-tracking branch 'upstream/master' into better-test-cases 2017-07-08 18:00:16 +09:00
Thomas Müller
ec1da92639 Merge pull request #998 from peppy/fix-startup-crash
Fix crash on startup for release builds
2017-07-08 11:58:45 +03:00
Dean Herbert
96189fa749 Fix crash on startup for release builds 2017-07-08 16:16:49 +09:00
Dean Herbert
621a4e892a Merge pull request #991 from Tom94/update-framework
Use tooltip and context menu containers as newly required
2017-07-07 19:59:57 -07:00
Dean Herbert
42f86bb7d9 Merge branch 'master' into update-framework 2017-07-07 19:41:15 -07:00
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
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
26c40105e2 Update framework 2017-07-07 10:22:07 +03:00
Thomas Müller
6de9776e05 Update framework with tooltip changes 2017-07-07 08:59:17 +03:00
Jai Sharma
6eaeba5a92 Merge branch 'master' into remove-dragbar 2017-07-06 20:14:08 +01:00
Thomas Müller
eb64765848 Update framework 2017-07-06 15:44:05 +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
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
Huo Yaoyuan
cadc191602 Merge branch 'master' into profile 2017-07-02 22:03:30 +08: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
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00