Dean Herbert
|
b6b7ae47db
|
Merge branch 'master' into user-profile-fixes
|
2017-07-19 18:15:38 +09:00 |
|
Dean Herbert
|
0b53f1a7e3
|
Reference system
|
2017-07-19 18:09:59 +09:00 |
|
Dean Herbert
|
a01209cfe0
|
Simplify comparator
|
2017-07-19 18:09:59 +09:00 |
|
Dean Herbert
|
35157ca6b8
|
Make DefaultBeatmap private get.
|
2017-07-19 18:09:59 +09:00 |
|
Dean Herbert
|
2eccb3822a
|
Make link text not suck
|
2017-07-19 17:54:04 +09:00 |
|
Dan Balasescu
|
285790bae0
|
Merge pull request #1026 from peppy/beatmap-delete-fixes
Fix crashes related to deleting/importing beatmaps
|
2017-07-19 17:46:49 +09:30 |
|
Dan Balasescu
|
42af26a5a5
|
Merge branch 'master' into beatmap-delete-fixes
|
2017-07-19 17:34:12 +09:30 |
|
Dan Balasescu
|
11eecdd281
|
Merge pull request #1028 from peppy/fix-flashy-sides
Fix main menu flashy sides moving too much
|
2017-07-19 17:26:26 +09:30 |
|
Dean Herbert
|
c34856922c
|
Gratify CI
|
2017-07-19 16:34:18 +09:00 |
|
Dean Herbert
|
2a2f4e2a8b
|
Ensure side flashes are not visible during moving transitions
|
2017-07-19 16:13:01 +09:00 |
|
Dean Herbert
|
2b1e19814c
|
Side flashes should not be affected by parallax
|
2017-07-19 16:07:11 +09:00 |
|
Dean Herbert
|
c8593a38c8
|
Remove incorrect looping reset behaviour
Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.
|
2017-07-19 15:55:16 +09:00 |
|
Dean Herbert
|
64ebc01a3b
|
Remove many now unnecessary null-checks
|
2017-07-19 15:45:23 +09:00 |
|
Dean Herbert
|
21d07428fe
|
Fix some test regressions
|
2017-07-19 15:16:59 +09:00 |
|
Dean Herbert
|
8e8767cd37
|
Give song select a better default background whecn the beatmap's can't be loaded
|
2017-07-19 15:16:55 +09:00 |
|
Dean Herbert
|
d0dea33faa
|
Make Beatmap (bindable) non-nullable.
|
2017-07-19 15:16:53 +09:00 |
|
Dean Herbert
|
0846414c5b
|
Simplify state changes
|
2017-07-19 15:16:51 +09:00 |
|
Dean Herbert
|
632d2e8ba5
|
Dummy beatmap has dummy ruleset
|
2017-07-19 15:16:48 +09:00 |
|
Dean Herbert
|
f168ee660c
|
Move dummy to BeatmapDatabase
|
2017-07-19 15:16:43 +09:00 |
|
Dean Herbert
|
3289d93f22
|
Give the dummy beatmap a background
|
2017-07-19 15:16:42 +09:00 |
|
Dean Herbert
|
007b343854
|
Fix incorrect equality check when TimingPointAt returns a default T
|
2017-07-19 15:16:40 +09:00 |
|
Dean Herbert
|
21984ba764
|
Move DummyWorkingBeatmap to a more global level (OsuScreen)
|
2017-07-19 15:16:39 +09:00 |
|
Dean Herbert
|
6016310b09
|
Use a better default for difficulty values
|
2017-07-19 15:16:37 +09:00 |
|
Dean Herbert
|
df60fc0f0a
|
Stop playing previous beatmap even if new beatmap has no track
|
2017-07-19 15:16:36 +09:00 |
|
Dean Herbert
|
59416584c1
|
Don't show theme song in playlist
|
2017-07-19 15:16:35 +09:00 |
|
Dean Herbert
|
e47faf4e85
|
Add a dummy beatmap provider for use in BeatmapInfoWedge
|
2017-07-19 15:16:33 +09:00 |
|
Dean Herbert
|
6f59e5feec
|
Add null check on stream
|
2017-07-19 14:56:27 +09:00 |
|
Dean Herbert
|
f00140f0a4
|
Avoid crashes on attempting to import the same path twice in quick succession
|
2017-07-19 14:56:24 +09:00 |
|
Dean Herbert
|
5761eb30a0
|
Fix nullref error on re-importing a DeletePending beatmap
Callback was expecting the beatmap to be populated where it wasn't being.
|
2017-07-19 14:56:20 +09:00 |
|
Dean Herbert
|
11ddded6fc
|
Merge pull request #1023 from Tom94/custom-chat-colours
Use a background for custom-coloured users
|
2017-07-19 09:09:56 +09:00 |
|
Thomas Müller
|
3ba119c115
|
Ensure toolbar disappears when osu logo transition is cancelled
|
2017-07-18 17:09:53 +03:00 |
|
Thomas Müller
|
b40c897dbd
|
Fix osu logo shockwave playing when transition is aborted
This is a very nice use-case scenario for TransformSequence.OnComplete
|
2017-07-18 15:28:56 +03:00 |
|
Thomas Müller
|
ed793328f1
|
Update framework
|
2017-07-18 15:20:00 +03:00 |
|
Thomas Müller
|
4d8261fe0b
|
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
|
2017-07-18 15:16:02 +03:00 |
|
Huo Yaoyuan
|
ef2770b718
|
Bypass commit in SearchTextBox regardless of Shift and Ctrl.
|
2017-07-18 17:40:34 +08:00 |
|
Thomas Müller
|
6d8bdadf2d
|
Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
|
2017-07-18 12:35:48 +03:00 |
|
Thomas Müller
|
a225b542d5
|
Sender is always non-null
|
2017-07-18 12:35:36 +03:00 |
|
Thomas Müller
|
fce5a191f1
|
Migrate padding into the scroll content to not cut off effects
|
2017-07-18 12:26:27 +03:00 |
|
Thomas Müller
|
e58ea97604
|
Improve design as requested
|
2017-07-18 12:26:05 +03:00 |
|
Dean Herbert
|
b33c8226c1
|
Merge pull request #1024 from Tom94/fix-broken-tooltip
Fix OsuTooltipContainer.PopIn not overriding PopOut transforms
|
2017-07-18 18:11:26 +09:00 |
|
Huo Yaoyuan
|
a0c4fcdb4b
|
Move xml doc to the right class.
|
2017-07-18 17:03:59 +08:00 |
|
Thomas Müller
|
b2dd43075f
|
Update framework
|
2017-07-18 11:57:41 +03:00 |
|
Thomas Müller
|
7acff29bd3
|
Fix OsuTooltipContainer.PopIn not overriding PopOut transforms
|
2017-07-18 11:53:56 +03:00 |
|
Huo Yaoyuan
|
9cd895c249
|
Implement Ctrl+Enter in PlaySongSelect.
|
2017-07-18 15:55:21 +08:00 |
|
Thomas Müller
|
52acd23a5a
|
Update framework
|
2017-07-18 10:54:57 +03:00 |
|
Thomas Müller
|
c8eeea64c3
|
Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
|
2017-07-18 10:54:15 +03:00 |
|
Thomas Müller
|
e72c009dd7
|
Highlight custom-named users
|
2017-07-18 10:53:41 +03:00 |
|
Dean Herbert
|
0034b718a9
|
Merge pull request #966 from jai-sharma/remove-dragbar
Remove DragBar and replace with classes that inherit SliderBar
|
2017-07-18 15:43:40 +09:00 |
|
Dean Herbert
|
4b4b03756a
|
Don't use dodgy OnLoaded "event"
|
2017-07-18 15:37:58 +09:00 |
|
Dean Herbert
|
82217be988
|
Fix dodgy event clearing
Also use local ariables where possible.
|
2017-07-18 15:24:52 +09:00 |
|