Dean Herbert
|
23ffee3d38
|
Merge branch 'master' into drawable-composite-hit-object
|
2018-03-16 15:38:52 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Dean Herbert
|
afeab481ee
|
Merge pull request #2209 from peppy/more-skinning
Update framework
|
2018-03-13 13:12:23 +09:00 |
|
Dean Herbert
|
6ecd2afd24
|
Update framework
|
2018-03-13 12:59:49 +09:00 |
|
Dan Balasescu
|
f06f31a269
|
Merge pull request #2181 from peppy/more-skinning
Add skin support for hit judgements
|
2018-03-13 12:58:44 +09:00 |
|
smoogipoo
|
706c26c32b
|
Remove extra whitespace
|
2018-03-13 09:27:33 +09:00 |
|