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 |
|
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 |
|
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 |
|
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 |
|
Dean Herbert
|
c5d23daa6b
|
Merge remote-tracking branch 'upstream/master' into remove-dragbar
# Conflicts:
# osu.Game/Overlays/DragBar.cs
|
2017-07-18 13:44:23 +09:00 |
|
Dean Herbert
|
ef869cb501
|
Merge pull request #949 from MrTheMake/songselect-preview-fix
Fix not applying song select preview seek
|
2017-07-18 13:09:59 +09:00 |
|
Dean Herbert
|
b5035ec245
|
Merge branch 'master' into songselect-preview-fix
|
2017-07-18 13:05:03 +09:00 |
|
Dean Herbert
|
4229f933fe
|
Rename link class, add hover colour
|
2017-07-18 10:51:11 +09:00 |
|
Dean Herbert
|
ae58e18178
|
Reorder code based on depth (and avoid possible conflicts)
|
2017-07-18 10:41:52 +09:00 |
|
Jorolf
|
9c70d03a33
|
replace SpriteText with OsuSpriteText
|
2017-07-17 21:12:50 +02:00 |
|
Jorolf
|
80dc888769
|
address CI concerns
|
2017-07-17 21:11:54 +02:00 |
|
Jorolf
|
edd4e622cf
|
add hyper links to twitter, website and skype
|
2017-07-17 20:31:10 +02:00 |
|
Jorolf
|
b9eb7a8445
|
make chat message users open UserProfileOverlay
|
2017-07-17 20:26:55 +02:00 |
|
Jorolf
|
689866f5dd
|
minor improvements
|
2017-07-17 20:25:57 +02:00 |
|
Thomas Müller
|
440878945e
|
Remove remaining usages of AddDelay
|
2017-07-17 18:16:15 +03:00 |
|
Thomas Müller
|
546efc0181
|
Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu
|
2017-07-17 17:05:24 +03:00 |
|
Thomas Müller
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
Dean Herbert
|
406cf9d0d4
|
Merge pull request #936 from huoyaoyuan/profile
Basic User Profile Page
|
2017-07-17 14:10:52 +09:00 |
|
Dean Herbert
|
93290ef966
|
Rename populate method
|
2017-07-17 13:56:50 +09:00 |
|
Dean Herbert
|
a63124c935
|
User property instead of weirdly named method
|
2017-07-17 13:39:29 +09:00 |
|
Dean Herbert
|
f322c264a0
|
One constant per line
|
2017-07-17 13:24:05 +09:00 |
|
Dean Herbert
|
5d77a5f988
|
Allow closing profile by clicking basically anywhere
|
2017-07-17 10:15:55 +09:00 |
|