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
|
8fbaa86e64
|
Fix testcases
|
2018-03-15 18:24:57 +09:00 |
|
smoogipoo
|
d05947ef48
|
Pass adjustable clocks to components, rather than relying on the track
|
2018-03-15 18:19:28 +09:00 |
|
smoogipoo
|
c8f6a6980b
|
Move clock construction to Editor
|
2018-03-15 17:27:37 +09:00 |
|
smoogipoo
|
5e742eb466
|
Move editor constructions to BDL load
|
2018-03-15 17:10:08 +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 |
|
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 |
|