1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 17:52:58 +08:00
Commit Graph

11640 Commits

Author SHA1 Message Date
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09:00
TocoToucan
34dc8e7375 Resolve merge conflict 2018-03-14 23:22:19 +03:00
TocoToucan
5a1af062d3 Handle GlobalAction.TakeScreenshot in ScreenshotManager 2018-03-14 22:55:24 +03:00
smoogipoo
f693fbf92d Add forward snapping from inbetween beat test 2018-03-14 23:08:43 +09:00
Dean Herbert
551b67ac16
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-14 21:46:19 +09:00
smoogipoo
0da3ae0944 Add some basic tests + fixes to seek/seekforward functionality 2018-03-14 20:52:48 +09:00
FreezyLemon
070decf890 small code cleanups 2018-03-14 12:38:22 +01:00
FreezyLemon
a438e45434 make SelectTypes set mods instead of only adding new ones
also made the method actually take types as parameter to make it consistent
2018-03-14 12:33:08 +01:00
TocoToucan
25f738c4ae Do not support bmp screenshots 2018-03-14 12:57:55 +03:00
Joseph Madamba
1eeacb7bf7
Change descriptions and special section 2018-03-14 01:05:19 -07:00
Dean Herbert
edd053fcd2
Merge pull request #2195 from smoogipoo/editor-hitobject-movement
Implement an interface for moving hitobjects in the editor
2018-03-14 15:55:15 +09:00
Dean Herbert
a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
Dean Herbert
149ee381e9 Update framework 2018-03-14 13:55:16 +09:00
Dean Herbert
1d01dbd462 Merge remote-tracking branch 'upstream/master' into api-as-component 2018-03-14 13:54:17 +09:00
Dean Herbert
d42cd5c8f0
Merge branch 'master' into fix-combo-colours 2018-03-14 12:45:48 +09:00
Dean Herbert
4a3145f08b
Merge pull request #2169 from smoogipoo/fix-mania-conversion
Make osu!mania conversions more in-line with osu!stable
2018-03-14 12:35:13 +09:00
Dean Herbert
908d38279b
Merge branch 'master' into fix-mania-conversion 2018-03-14 12:27:32 +09:00
Dean Herbert
ea649f9650 Avoid scheduling during non-current screen 2018-03-14 12:09:19 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
Dean Herbert
ef8d595914 Apply formatting changes 2018-03-14 11:44:19 +09:00
Dean Herbert
c3a3d76b88 Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging 2018-03-14 11:43:33 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
smoogipoo
e2dc9a975a Merge branch 'master' into editor-wheel-movement 2018-03-14 11:39:02 +09:00
Dean Herbert
ce2997419a Expose API scheduling internally 2018-03-14 11:37:50 +09:00
Dean Herbert
07642546bb Make APIAccess a component 2018-03-14 11:29:54 +09:00
smoogipoo
9e09d434dd Fix argument null exception in ManiaBeatmapConverter 2018-03-14 11:27:14 +09:00
Dean Herbert
83cd2fd317 Move token saving logic to APIAccess 2018-03-14 10:15:05 +09:00
Dean Herbert
afc3646450 Move API configuration hooks out of OsuGameBase
Also makes username more private, and password completely private.
2018-03-14 10:15:05 +09:00
Dean Herbert
1d7be2ad0b Fix incorrect variable name 2018-03-14 10:14:42 +09:00
Dean Herbert
d2a0ca6faa Merge remote-tracking branch 'upstream/master' into fix-combo-colours 2018-03-14 10:13:48 +09:00
Dean Herbert
586ac9c3f1
Merge pull request #2214 from VPeruS/fix-username-login
Fixed exit from game saves username instead of email
2018-03-14 10:08:11 +09:00
TocoToucan
0e69ab1615 Introduce ScreenshotManager class 2018-03-14 00:17:12 +03:00
Dean Herbert
c55d70ec13
Merge branch 'master' into fix-combo-colours 2018-03-13 19:19:45 +09:00
Dean Herbert
16eab2eebf Fix combo colours not working until now 2018-03-13 19:19:08 +09:00
Dean Herbert
e43de68ad3 Move colour parsing to LegacyDecoder 2018-03-13 19:13:50 +09:00
vperus
ba44813c00 Fixed exit from game save username instead of email. Resolve #2156 2018-03-13 12:10:47 +02:00
smoogipoo
299de4b866 Rewrite seeking to better handle timing point boundaries 2018-03-13 16:54:34 +09:00
Dean Herbert
c332233a65
Merge pull request #2206 from smoogipoo/base-editor-testcase
Create a base TestCaseEditor for rulesets to derive
2018-03-13 16:44:12 +09:00
Dean Herbert
d6fa7d69d7 Add missing fonts section 2018-03-13 16:13:07 +09:00
smoogipoo
e97349fd63 Derive ScreenTestCase + use LoadComponentAsync 2018-03-13 16:00:56 +09:00
smoogipoo
0c705b0397 Rename to EditorTestCase 2018-03-13 15:57:05 +09:00
Dean Herbert
b93e83e3d2
Merge branch 'master' into base-editor-testcase 2018-03-13 15:53:33 +09:00
Dean Herbert
c0248e1b23
Merge pull request #2205 from smoogipoo/test-beatmap
Move test beatmap from TestCasePlayer into an instantiable class
2018-03-13 15:52:46 +09:00
Dean Herbert
e9cd97c43a
Merge branch 'master' into test-beatmap 2018-03-13 15:42:30 +09:00
smoogipoo
e32eec9259 No more caching 2018-03-13 15:22:46 +09:00
smoogipoo
df352c98d6 Change wheel direction to match stable 2018-03-13 14:30:50 +09:00
smoogipoo
e580819621 Rename to seekAmount 2018-03-13 14:08:43 +09:00
smoogipoo
6c148930b5 Don't skip beats when scrolling in the direction of the closest beat 2018-03-13 14:02:37 +09:00
Dean Herbert
afeab481ee
Merge pull request #2209 from peppy/more-skinning
Update framework
2018-03-13 13:12:23 +09:00