Commit Graph

5863 Commits

Author SHA1 Message Date
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
fd58c6e835 Nicer generic rolling counters 2017-07-14 19:14:07 +03:00
b5fbb26f8f Merge branch 'master' of https://github.com/ppy/osu into better-transforms 2017-07-14 16:46:18 +03:00
c73a1ae058 Use TransformTo in rolling counters 2017-07-14 16:46:00 +03:00
aa15d369c3 Merge pull request #1009 from peppy/fix-track-rotation
Fix track rotation
2017-07-14 19:48:43 +10:00
fa0c0e3b48 Merge branch 'master' into fix-track-rotation 2017-07-14 19:38:48 +10:00
68d1e920fd Merge pull request #1016 from peppy/settings-improvements
Settings improvements
2017-07-14 19:32:08 +10:00
c13dc943f8 Merge branch 'master' into fix-track-rotation 2017-07-14 19:25:54 +10:00
a6d917285a Merge branch 'master' into settings-improvements 2017-07-14 19:22:45 +10:00
cb213a5f0f Merge pull request #1013 from peppy/right-mouse-scrollbar
Add support for right mouse absolute scrolling (when enabled)
2017-07-14 19:22:29 +10:00
3914b3ba13 Merge branch 'master' into right-mouse-scrollbar 2017-07-14 19:15:00 +10:00
b7612af20c Make comment different 2017-07-14 18:08:47 +09:00
9dba363b08 Use button boundaries to decide when to expand sidebar 2017-07-14 17:57:01 +09:00
3702d4b921 Merge branch 'master' into settings-improvements 2017-07-14 18:43:08 +10:00
36594afee3 Merge pull request #978 from EVAST9919/mods_overlay_fix
Hide "Unranked" text in ModDisplay if play is ranked
2017-07-14 17:36:46 +09:00
95a40e39ec Merge branch 'master' into mods_overlay_fix 2017-07-14 17:31:52 +09:00
b957bca4c5 Merge branch 'master' into settings-improvements 2017-07-14 17:27:09 +09:00
e433684899 Merge pull request #970 from DrabWeb/drawable-room-update
DrawableRoom design update
2017-07-14 15:35:44 +09:00
3aeed86392 Merge branch 'master' into drawable-room-update 2017-07-14 15:29:27 +09:00
e2223a24f6 Merge pull request #1012 from DrabWeb/medal-splash
Medal splash
2017-07-14 14:47:24 +09:00
bce4b838d8 Formatting 2017-07-14 14:40:50 +09:00
133bcdec7a Move async loading to a higher level to simplify logic 2017-07-14 14:39:15 +09:00
980fb18ed6 Remove unnecessary alpha/alwayspresent changes 2017-07-14 14:30:35 +09:00
20052b060c Nest delays and implement IStateful, allowing for flushing on early dismiss
Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.
2017-07-14 13:25:31 +09:00
ab5341eadc Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash 2017-07-14 09:46:36 +09:00
e3ff79fdd1 Merge pull request #1018 from Nabile-Rahmani/skip-button-fix
Make the skip button clickable only once.
2017-07-14 09:45:16 +09:00
6c9219856d Add comment 2017-07-14 09:39:40 +09:00
b1d447bf71 Add missing access modifier 2017-07-14 07:05:39 +09:00
bfa6a9aa4e Add missing licence header 2017-07-14 06:43:33 +09:00
840cc918ea Use Enabled instead of a private field. 2017-07-13 23:35:19 +02:00
a6ac61f735 Update framework 2017-07-14 06:24:07 +09:00
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09:00
8014cd55a2 Make the skip button clickable only once. 2017-07-13 21:59:17 +02:00
2ff92ac25a Contract sidebar on click
Also makes queueing of expand more correct.
2017-07-13 17:09:12 +09:00
939e167d6a Correct offset settings vertically based on toolbar visibility 2017-07-13 17:09:12 +09:00
f4fd263671 Fix settings not offsetting scroll operations by fixed header content 2017-07-13 17:09:12 +09:00
8460e29bcb Sidebar now pushes full settings out further 2017-07-13 17:09:12 +09:00
61c45b0b44 Merge pull request #1003 from Jorolf/ruleset-settings
Add ruleset settings
2017-07-13 17:08:51 +09:00
d3f5de9bf9 Move to UI namespace 2017-07-13 15:44:42 +09:00
25344d2345 Fix incorrect header 2017-07-13 15:43:18 +09:00
fc28617099 Merge remote-tracking branch 'upstream/master' into ruleset-settings 2017-07-13 15:35:53 +09:00
ed42f50058 Merge pull request #1015 from peppy/redundant-empty-arglist
Remove all unnecessary parenthesis where object initialisers are used
2017-07-13 15:56:58 +09:30
fcfd8b5465 Update framework 2017-07-13 15:19:47 +09:00
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
2017-07-13 15:11:33 +09:00
b196b1d3c6 CI fixes, switch RoomInspector to use BeatmapSetCover. 2017-07-13 01:24:59 -03:00
fea40ccc1a Share BeatmapSet cover sprite code. 2017-07-13 01:17:47 -03:00
80f88cf5bb Merge pull request #977 from VPeruS/window-icon-lin-mac
Insert window icon as EmbeddedResource into osu!.exe
2017-07-13 13:11:10 +09:00
0624f578eb Update with online beatmap changes. 2017-07-13 01:06:46 -03:00
e73382f313 Merge branch 'master' into window-icon-lin-mac 2017-07-13 13:03:44 +09:00
dc5ec319a2 Merge https://github.com/ppy/osu into drawable-room-update 2017-07-13 01:00:32 -03:00