1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 09:39:04 +08:00
Commit Graph

5781 Commits

Author SHA1 Message Date
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
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
Dean Herbert
722e519e0f Merge pull request #956 from EVAST9919/heartbeat
Add heartbeat sound effect when hovering osu! logo
2017-06-21 15:40:28 +09:00
Dean Herbert
d0d0f11857 Merge branch 'master' into heartbeat 2017-06-21 15:35:54 +09:00
Dan Balasescu
e93d0cbb3a Merge pull request #957 from paparony03/shapes-renamespace
Shapes namespace
2017-06-21 11:41:01 +09:00
smoogipooo
b191d96aab CI fixes. 2017-06-21 11:35:19 +09:00
smoogipooo
fc0e44b214 Update framework. 2017-06-21 11:28:27 +09:00
paparony03
c8720bc5d5 Oops 2017-06-20 16:00:09 +10:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
EVAST9919
a991cff908 OsuLogo beat sound 2017-06-19 17:37:00 +03:00
Dean Herbert
ee2c649971 Merge pull request #953 from ColdVolcano/logo-visualizer
Add a visualizer around the logo
2017-06-19 19:34:40 +09:00
Dean Herbert
17cb043cb2 Visualiser 2017-06-19 18:41:35 +09:00
Dean Herbert
a1b9499480 More documentation and constants 2017-06-19 18:41:11 +09:00
Dean Herbert
8c063fe2b8 Simplify AccentColour property for now 2017-06-19 18:38:39 +09:00
Dean Herbert
25b1058cd3 Update framework 2017-06-19 18:30:44 +09:00
Dean Herbert
e269bdbad7 Use additive colour; adjust constants a bit 2017-06-19 18:30:13 +09:00
Dean Herbert
359cb4c083 Add kiai support 2017-06-19 18:29:44 +09:00
ColdVolcano
77ca48c1bd CI Fixes 2017-06-18 23:52:42 -05:00
ColdVolcano
84aa17dea3 Attempt to fix possible loss of fraction 2017-06-18 23:08:27 -05:00
ColdVolcano
63aabc162b Fix TestCaseMenuButtonSystem not starting up 2017-06-18 22:34:45 -05:00
ColdVolcano
3764c1d799 Make bar length and visualizer count floats 2017-06-18 22:28:18 -05:00
ColdVolcano
cea8dc5602 Fix possible loss of fraction 2017-06-18 22:13:21 -05:00
ColdVolcano
d3662636d6 CI fixes 2017-06-18 22:01:07 -05:00
ColdVolcano
cc7f341f98 Update framework 2017-06-18 21:52:39 -05:00
smoogipooo
34ac932fe2 Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject. 2017-06-19 10:54:23 +09:00
ColdVolcano
ccac2e9a75 Add a visualizer around the logo 2017-06-18 19:33:50 -05:00
smoogipooo
1d5c5a0a4d Fix an invalid depth operation. 2017-06-19 07:50:26 +09:00
Dan Balasescu
45b0c28461 Merge pull request #944 from peppy/fix-resources-again-again
Fix resources being reset incorrectly to an old revision
2017-06-17 14:13:31 +09:00
Dean Herbert
87f6ba57d3 Fix resources being reset incorrectly to an old revision 2017-06-17 14:08:18 +09:00
Dean Herbert
8c0850d679 Merge branch 'master' into better-drawablehitobject-lifetimes 2017-06-16 21:57:41 +09:00
Dan Balasescu
f41789889b Merge pull request #940 from peppy/update-framework
Update framework
2017-06-16 21:15:07 +09:00
Dean Herbert
7128d73178 Update framework 2017-06-16 21:08:23 +09:00