1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 11:02:54 +08:00
Commit Graph

6189 Commits

Author SHA1 Message Date
Jai Sharma
e073100498 Merge branch 'master' into remove-dragbar 2017-06-24 08:55:02 +01: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
DrabWeb
b2c516238e Cleanup. 2017-06-24 01:48:55 -03:00
DrabWeb
0133f9c086 Medal sprite, make MedalOverlay auto-show when loaded. 2017-06-24 01:19:44 -03:00
DrabWeb
c71f34c507 Make the background strip expand from the disc edges. 2017-06-23 23:51:28 -03:00
DrabWeb
3c97f04826 Particles. 2017-06-23 23:18:44 -03:00
DrabWeb
e09625e49d Merge https://github.com/ppy/osu into medal-splash 2017-06-23 22:42:36 -03:00
DrabWeb
15cd4f77b2 Proper dismissing. 2017-06-23 22:35:06 -03:00
EVAST9919
817d2c3da1 Fixed logo heartbeat playing even without beating 2017-06-23 23:57:57 +03:00
Jai Sharma
de50a1694f Merge branch 'master' into remove-dragbar 2017-06-23 19:26:47 +01:00
Jai Sharma
a327f49d68 Updating progressBar.EndTime is more thread safe 2017-06-23 18:24:46 +01:00
Thomas Müller
f5829860a2 Get rid of AlwaysReceiveInput 2017-06-23 18:02:24 +02:00
Huo Yaoyuan
674e2a4395 Align placeholder. 2017-06-23 23:37:19 +08:00
Dean Herbert
b90c9bcacf Merge branch 'master' into profile 2017-06-23 22:51:31 +09: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
EVAST9919
3150bdb54b Fixed wrong display string 2017-06-23 14:56:43 +03:00
EVAST9919
a59af5b005 Applied suggested changes 2017-06-23 10:01:28 +03:00
EVAST9919
17494aed85 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes 2017-06-23 10:00:51 +03: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
EVAST9919
608f3fe8c5 oops 2017-06-23 08:41:48 +03:00
EVAST9919
b020fe0d50 Added TestCase 2017-06-23 08:36:47 +03:00
EVAST9919
266e1a29c3 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes 2017-06-23 08:34:30 +03:00
Dean Herbert
5dc0b87ef5 Apply some fixes for my own comments 2017-06-23 14:02:19 +09:00
Dean Herbert
076d561615 Merge branch 'master' into profile 2017-06-23 13:12:36 +09:00
Dean Herbert
eafd05e98f Fade shadow effect in to avoid appearing too early in transition 2017-06-23 11:54:32 +09:00
Jai Sharma
62aae899fa Fixed non-assigned MaxValue 2017-06-22 19:03:31 +01:00
Jai Sharma
73c004fb71 Removed DragBar from song progress 2017-06-22 17:42:29 +01:00
Jai Sharma
ce2242a979 Removed dragbar from MusicController 2017-06-22 16:32:50 +01:00
Huo Yaoyuan
35bec7ddc0 Hide profile when not showing overlays. 2017-06-22 21:43:58 +08:00
Huo Yaoyuan
8b8954b825 Add edge effect and adjust positioning. 2017-06-22 21:42:06 +08:00
Dean Herbert
4297c1a376 Use WaveOverlayContainer 2017-06-22 21:39:54 +09:00
Huo Yaoyuan
bb2e63e714 Avoid unverifiable capture. 2017-06-22 20:34:28 +08:00
Huo Yaoyuan
1d4add9079 Assign an explicit depth when reordering. 2017-06-22 20:26:06 +08: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
Dean Herbert
08cf5b6952 Merge pull request #941 from smoogipooo/better-drawablehitobject-lifetimes
Automatically determine lifetime for scrolling rulesets.
2017-06-21 20:26:48 +09:00
smoogipooo
3389c8a4dc CI fixes. 2017-06-21 20:17:15 +09:00
Dean Herbert
89c8a34025 Merge branch 'master' into better-drawablehitobject-lifetimes 2017-06-21 20:13:57 +09:00