1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 08:07:26 +08:00
Commit Graph

4561 Commits

Author SHA1 Message Date
EVAST9919
e18f95185f More constants 2017-05-19 06:39:39 +03:00
EVAST9919
c3647e4056 dropdown-like animation 2017-05-19 06:26:54 +03:00
EVAST9919
f2af31aceb Naming fixes 2017-05-18 20:21:58 +03:00
EVAST9919
a1b90ee70e Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 18:26:38 +03:00
Dean Herbert
9b8d7745c7 Merge pull request #791 from peppy/spinner-refresh
Spinner design refresh
2017-05-18 22:37:45 +09:00
Dean Herbert
3004a44b98 Further colour adjustments 2017-05-18 22:21:41 +09:00
Dean Herbert
c78dfb4a13 Oops colours were wrong 2017-05-18 21:56:19 +09:00
Dean Herbert
e3ae2bca6d Design improvements
paired with smoogi
2017-05-18 21:38:19 +09:00
Dean Herbert
4100c4fe9f Fix order of methods 2017-05-18 21:04:09 +09:00
Dean Herbert
ae676b48b2 Fix whitespace 2017-05-18 19:51:45 +09:00
Dean Herbert
9cd41c0e87 Spinner design refresh 2017-05-18 19:42:20 +09:00
Dean Herbert
f112546085 Don't load a mode when opening TestCaseHitObjects 2017-05-18 19:42:20 +09:00
EVAST9919
640c940fce Make field readonly 2017-05-18 11:50:15 +03:00
EVAST9919
1d80555d3b Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 11:47:52 +03:00
EVAST9919
83a89ce22d options -> settings 2017-05-18 11:39:22 +03:00
Dean Herbert
dc5a9eb740 Merge pull request #775 from smoogipooo/fast-random
Add FastRandom class for use in beatmap conversion.
2017-05-18 15:38:14 +09:00
Dean Herbert
521a0d8d04 Merge branch 'master' into fast-random 2017-05-18 15:33:00 +09:00
EVAST9919
d07d94d606 better resizing 2017-05-18 07:09:36 +03:00
EVAST9919
35bc3a42aa Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 06:36:15 +03:00
Dean Herbert
25385d408c Merge pull request #783 from peppy/pause-container
PauseContainer
2017-05-18 09:43:39 +09:00
Dan Balasescu
32c471d285 Merge branch 'master' into pause-container 2017-05-18 01:22:37 +09:00
Dan Balasescu
55d4d83712 Merge pull request #782 from peppy/fix-fail-pause-conflict
Fix and simplify pause logic
2017-05-18 01:22:00 +09:00
Dean Herbert
8084c575ef Merge branch 'master' into fix-fail-pause-conflict 2017-05-17 23:32:41 +09:00
Dean Herbert
0242e37bb3 Merge pull request #778 from peppy/song-select-selection-fixes
Fix song select reverting to first difficulty of current group on entering
2017-05-17 23:31:24 +09:00
EVAST9919
733ae16489 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-17 17:28:05 +03:00
EVAST9919
a9f37d3e78 now button can hide content 2017-05-17 17:24:52 +03:00
Dean Herbert
d1f85c3f8e Update framework 2017-05-17 23:21:23 +09:00
Dean Herbert
25f217505e Merge branch 'master' into song-select-selection-fixes 2017-05-17 23:17:10 +09:00
Dean Herbert
bab8997b43 Merge pull request #780 from peppy/bad-bad-ratio-container
Fix ratio container being added to a level too high
2017-05-17 23:16:58 +09:00
EVAST9919
a21343da23 CI fixes 2017-05-17 17:14:09 +03:00
EVAST9919
eec813ad65 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-17 17:14:00 +03:00
Dean Herbert
1278d9c53d Merge branch 'master' into bad-bad-ratio-container 2017-05-17 23:01:56 +09:00
Dean Herbert
3fd9edfcde Merge pull request #784 from peppy/general-fixes
Fix CI warning
2017-05-17 22:57:01 +09:00
EVAST9919
60ed7a2372 fixed license header 2017-05-17 16:54:49 +03:00
Dean Herbert
d606b5b3a7 Fix CI warning 2017-05-17 22:13:56 +09:00
EVAST9919
e785f1ddf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-17 16:12:38 +03:00
EVAST9919
1e029d05a8 Added bindable to adjust playback speed 2017-05-17 16:10:49 +03:00
Dan Balasescu
8bcbc2cc26 Merge pull request #774 from peppy/fix-chat-after-disconnect
Fix channels being unnecessarily recycled on disconnect
2017-05-17 22:02:25 +09:00
Dean Herbert
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
EVAST9919
0867ef814c Visible only in replay 2017-05-17 15:54:12 +03:00
EVAST9919
e0625a9b30 More overlays and overall fixes 2017-05-17 15:39:26 +03:00
EVAST9919
fd2150aa49 Moved collectionsDropdown to it's own class 2017-05-17 15:32:16 +03:00
Dean Herbert
88a70e407c Fix and simplifty pause logic
Resolves #770
2017-05-17 20:11:41 +09:00
Dean Herbert
cba7796777 Fix ratio container being added to a level too high
That's a bad ratio container! How did we not notice this until now?
2017-05-17 18:49:30 +09:00
Dan Balasescu
b21be8f3f5 Merge branch 'master' into fix-chat-after-disconnect 2017-05-17 17:51:35 +09:00
Dean Herbert
7bb38e927b Fix song select reverting to first difficulty of current group on entering 2017-05-17 17:33:20 +09:00
Dean Herbert
cab12ee55a Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed 2017-05-17 17:33:16 +09:00
EVAST9919
1a4025ab3c ingame options basic logic 2017-05-17 10:36:57 +03:00
EVAST9919
5fb8830e3a Moved music controller buttons to it's own class 2017-05-17 10:36:24 +03:00
Dan Balasescu
12716d2ab4 Merge pull request #776 from peppy/fix-duplicate-messages
Revert "Use generic IComparable for message."
2017-05-17 13:51:13 +09:00