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

11274 Commits

Author SHA1 Message Date
smoogipoo
df0b8a24c5 Rename + renamespace 2018-03-19 20:21:19 +09:00
smoogipoo
879dbc75b5 Nest TickContainer in BeatSnapVisualiser 2018-03-19 20:20:29 +09:00
smoogipoo
b25c564ecb Integrate into editor's compose screen 2018-03-19 20:14:58 +09:00
smoogipoo
32fecc6ff4 Adjust icon scale + text 2018-03-19 20:14:34 +09:00
smoogipoo
e96dad441d Offset the icon buttons a little bit to look a bit more centered
Maybe it's just me, but this is really triggering me.
2018-03-19 20:14:13 +09:00
smoogipoo
c86ddb7ee3 Add slight easing to marker movements 2018-03-19 19:57:02 +09:00
smoogipoo
fbc92bfa01 Add previous/next divisor button actions 2018-03-19 19:55:49 +09:00
smoogipoo
070db63157 Privatise tick to TickContainer 2018-03-19 19:52:22 +09:00
smoogipoo
7182442b21 Add divisor text 2018-03-19 19:49:57 +09:00
smoogipoo
66e4e45882 Offset test case a little bit for dynamic compilation message 2018-03-19 19:49:46 +09:00
smoogipoo
6b035e8c53 Add basic structure/layout for the beat snap visualiser 2018-03-19 19:46:26 +09:00
Dean Herbert
cbe2de33c5
Merge pull request #2225 from smoogipoo/editor-wheel-movement
Implement mousewheel time scrolling in the editor
2018-03-16 23:31:45 +09:00
smoogipoo
6f7163769d Adjust comment for readability 2018-03-16 19:57:14 +09:00
Dean Herbert
e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement 2018-03-16 18:19:42 +09:00
Dean Herbert
1b2e4bb8f7
Merge pull request #2207 from FreezyLemon/fix-autoplay-button-deselect
Fix autoplay button wrongly being active after a Ctrl-Enter play
2018-03-16 18:01:55 +09:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-16 17:31:14 +09:00
Dan Balasescu
18615ce8fd
Merge pull request #2223 from peppy/drawable-composite-hit-object
Make DrawableHitObject a CompositeDrawable
2018-03-16 16:24:26 +09:00
smoogipoo
20acc601bb Fix up breaking taiko changes 2018-03-16 16:10:09 +09:00
Dean Herbert
bca4b620b6
Merge branch 'master' into editor-wheel-movement 2018-03-16 15:56:51 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
Dean Herbert
f640b874df
Merge pull request #2219 from Joehuu/mod-fixes
Improve mods description and adjust multipliers to match stable
2018-03-16 15:53:04 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:38:52 +09:00
Dean Herbert
46f5c0fc19
Merge branch 'master' into mod-fixes 2018-03-16 15:38:41 +09:00
Dan Balasescu
39bf393682
Merge pull request #2218 from peppy/api-as-component
Consolidate API into its own component
2018-03-16 15:38:17 +09:00
smoogipoo
2ba2556d2a Update submodules 2018-03-16 15:24:47 +09:00
smoogipoo
aa82393824 Merge master into api-as-component 2018-03-16 15:22:48 +09:00
Dan Balasescu
41036ab79e
Merge pull request #2215 from peppy/fix-combo-colours
Fix beatmap combo colours not being applied
2018-03-16 15:19:43 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours 2018-03-16 14:59:45 +09:00
Dan Balasescu
e406cf2207
Merge pull request #2170 from peppy/cursor-trail
Make gameplay cursor vs skip button feel nice again
2018-03-16 14:57:00 +09:00
smoogipoo
b27b6c7eb7 Merge branch 'master' into cursor-trail 2018-03-16 14:43:27 +09:00
smoogipoo
7ded1635fa Update submodules 2018-03-16 14:43:14 +09:00
Dan Balasescu
b39c04e122
Merge pull request #2078 from UselessToucan/DoNotMoveToPlayerWhileDragging
Improve mouse-based load inhibition at player loading screen
2018-03-16 14:31:19 +09:00
Dean Herbert
7ed84465fb
Merge branch 'master' into mod-fixes 2018-03-16 11:27:39 +09:00
smoogipoo
fc15c63a88 Re-order methods 2018-03-15 18:28:08 +09:00
smoogipoo
c937ef5d24 Fix not being able to scroll before the first timing point 2018-03-15 18:26:53 +09:00
smoogipoo
9e0aeec574 Use a decoupled clock for accurate clock times 2018-03-15 17:03:33 +09:00
smoogipoo
50f9d810dd Add more testcases + fix up seeking a bit more 2018-03-15 15:40:52 +09:00
Dean Herbert
0474b7ca2d
Merge branch 'master' into api-as-component 2018-03-15 14:13:23 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
cdf435aedd
Merge branch 'master' into DoNotMoveToPlayerWhileDragging 2018-03-15 11:14:30 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09: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
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