1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 07:52:55 +08:00
Commit Graph

6340 Commits

Author SHA1 Message Date
smoogipooo
54503eef71 Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract. 2017-08-04 22:50:29 +09:30
smoogipooo
d42faa02df Update framework. 2017-08-04 20:11:51 +09:30
smoogipooo
4a9f3aa70d Merge remote-tracking branch 'origin/master' into timingchange-improvements 2017-08-04 20:11:24 +09:30
smoogipooo
0f901c99a0 Implement SpeedAdjustedPlayfield and a new HitRenderer derivation. 2017-08-04 20:11:18 +09:30
Dean Herbert
5cf8121d29 Merge pull request #1025 from huoyaoyuan/fixes
Implement Ctrl+Enter for Auto in song select.
2017-08-04 17:48:47 +09:00
Dean Herbert
083248872b Revert all changes on OsuGame 2017-08-04 17:36:31 +09:00
Dean Herbert
e8021c2b92 Move line inside if 2017-08-04 17:20:05 +09:00
Dean Herbert
0f8d46a990 Merge remote-tracking branch 'upstream/master' into fixes 2017-08-04 17:19:32 +09:00
Dan Balasescu
1c37efdd28 Merge pull request #1080 from peppy/visual-test-updates
Update to support new framework VisualTests structure
2017-08-04 17:44:45 +09:30
smoogipooo
17900f3353 Update VSCode with new configurations. 2017-08-04 17:18:44 +09:30
Huo Yaoyuan
74facb32b4 Use removeAutoModOnResume as a field. 2017-08-04 15:34:11 +08:00
Dean Herbert
fc97fdb8c1 Use a common build directory between both build ccnfigurations
There's no need to build to VisualTests when they share everything
2017-08-04 16:07:25 +09:00
Dean Herbert
7e89b1021d FirstOrDefault 2017-08-04 15:58:59 +09:00
Dean Herbert
104c25266d Add missing licence headers 2017-08-04 15:48:42 +09:00
Dean Herbert
e6ef50c4e4 Update framework 2017-08-04 15:40:28 +09:00
Dean Herbert
f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b Pass input state in OnSelected. 2017-08-04 00:09:41 +08:00
Dean Herbert
c86f23baea Merge pull request #1077 from MrTheMake/osulegacydecoder-parser
Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified
2017-08-03 16:36:01 +09:00
Dean Herbert
248486f8f9 Merge branch 'master' into osulegacydecoder-parser 2017-08-03 16:30:37 +09:00
Dan Balasescu
ecf102f568 Merge pull request #1079 from peppy/ruleset-icons-revamp
Allow Rulesets to create a non-FontAwesome icon
2017-08-03 16:28:51 +09:30
Dean Herbert
a5a5c1a315 Remove debug code 2017-08-03 15:50:59 +09:00
Dean Herbert
91f3d8deb4 Improve class xmldoc 2017-08-03 15:48:06 +09:00
Dean Herbert
bb032508bd Add comment explaining why we use scale 2017-08-03 15:47:26 +09:00
Dean Herbert
c7f5b83e9e Derive from CompositeDrawable instead
We need to expose EdgeEffect as it's used in places.
2017-08-03 15:45:59 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
MrTheMake
be3c7ec5f8 Added missing space 2017-08-02 16:17:33 +02:00
MrTheMake
79724e8018 Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified 2017-08-02 16:05:09 +02:00
Dan Balasescu
d72a479d9d Merge pull request #1075 from peppy/import-from-stable-part-two
Tidy up osu-stable import process
2017-08-02 17:18:39 +09:30
Dean Herbert
2c1767e496 Update framework 2017-08-02 16:37:20 +09:00
Dan Balasescu
1f205d87f8 Merge branch 'master' into import-from-stable-part-two 2017-08-02 17:05:46 +09:30
Dean Herbert
7cb87c7145 Run each import in a single transaction
Improves performance substantially.
2017-08-02 14:18:35 +09:00
Dean Herbert
211731d017 Merge pull request #955 from MrTheMake/musiccontroller-canbeatmapchange
Disable track changing buttons in the music controller depending on the current screen
2017-08-02 12:51:22 +09:00
Dean Herbert
256daeaf68 Rename variable 2017-08-02 11:56:29 +09:00
MrTheMake
4d8e5898fd Updates according to the framework and formatting 2017-08-01 17:28:18 +02:00
Dean Herbert
6eb960010f Speed up startup cleanup operations. 2017-08-01 17:58:21 +09:00
Dean Herbert
3b1166d1e6 Optimise file lookups and other database operations
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
2017-08-01 17:37:21 +09:00
Dean Herbert
e7e822ecd5 Fix StableStorage having "Songs" in the path twice 2017-08-01 16:37:43 +09:00
Dean Herbert
941f3f0934 Tidy up osu-stable import process
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Dean Herbert
209d024caa Merge branch 'master' into musiccontroller-canbeatmapchange 2017-08-01 11:54:05 +09:00
Dean Herbert
c9c1a628af Merge pull request #1074 from Alex4386/master
Hide the notification overlay on screens which explicitly hide overlays
2017-08-01 11:45:20 +09:00
Dean Herbert
fc7f9cbae2 Merge branch 'master' into master 2017-08-01 11:34:59 +09:00
Alex Park (박상희)
bb3a8a29ea Hide Notification when playing osu
Hide Notification Overlay when playing osu
2017-08-01 11:31:11 +09:00
Dean Herbert
ab4be26ec3 Merge pull request #1072 from EVAST9919/scroll_to_selected
Reset carousel position when mouse leaves the carousel area
2017-08-01 11:28:45 +09:00
Dean Herbert
024a34a9b3 Merge branch 'master' into scroll_to_selected 2017-08-01 11:17:16 +09:00
Dan Balasescu
d645563ad3 Merge pull request #1073 from peppy/fix-file-references
Store filenames against BeatmapSetFileInfo for correctness
2017-08-01 11:46:41 +09:30
Dean Herbert
c8b5c1b8a5 Merge branch 'master' into scroll_to_selected 2017-08-01 11:06:32 +09:00
Dean Herbert
b4acdd5f90 Merge remote-tracking branch 'upstream/master' into fix-file-references 2017-08-01 11:05:38 +09:00
Dean Herbert
9db4caafba Update framework 2017-08-01 11:05:33 +09:00