1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 16:13:21 +08:00
Commit Graph

5648 Commits

Author SHA1 Message Date
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
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
Dean Herbert
e91348ff85 Merge pull request #952 from smoogipooo/fix-invalid-depth
Fix an invalid depth operation.
2017-06-23 15:37:54 +09:00
smoogipooo
5533ebabfc Update framework. 2017-06-23 15:32:45 +09:00
Dean Herbert
a0e7751cd1 Merge branch 'master' into fix-invalid-depth 2017-06-23 14:48:12 +09:00
Dean Herbert
94fdf0390d Merge pull request #962 from ColdVolcano/visualiser-fixes
Logo visualiser fixes.
2017-06-22 19:12:40 +09:00
Dean Herbert
2a583de31b Merge branch 'master' into visualiser-fixes 2017-06-22 19:07:50 +09:00
Dean Herbert
c68df5508b Merge pull request #963 from smoogipooo/general-fixes
Update framework.
2017-06-22 18:46:24 +09:00
smoogipooo
986e9687ea Update framework. 2017-06-22 14:08:28 +09:00
EVAST9919
be94163d21 Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-22 04:28:47 +03:00
ColdVolcano
c619de7f9b Rename const in all of the code 2017-06-21 18:55:44 -05:00
ColdVolcano
1978a4e8a6 Boost visualiser performance
Also fixes amplitudes being set wrongly if kiai was false.
2017-06-21 18:32:31 -05:00