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
|
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
|
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
|
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 |
|
Huo Yaoyuan
|
26b36c08a3
|
Prefer ScrollTo in SectionsContainer.
|
2017-07-14 22:56:27 +08:00 |
|
Huo Yaoyuan
|
6cf36da389
|
Merge branch 'master' into profile
|
2017-07-14 22:52:19 +08:00 |
|
Dan Balasescu
|
aa15d369c3
|
Merge pull request #1009 from peppy/fix-track-rotation
Fix track rotation
|
2017-07-14 19:48:43 +10:00 |
|
Dan Balasescu
|
fa0c0e3b48
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:38:48 +10:00 |
|
Dan Balasescu
|
68d1e920fd
|
Merge pull request #1016 from peppy/settings-improvements
Settings improvements
|
2017-07-14 19:32:08 +10:00 |
|
Dan Balasescu
|
c13dc943f8
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:25:54 +10:00 |
|
Dan Balasescu
|
a6d917285a
|
Merge branch 'master' into settings-improvements
|
2017-07-14 19:22:45 +10:00 |
|
Dan Balasescu
|
cb213a5f0f
|
Merge pull request #1013 from peppy/right-mouse-scrollbar
Add support for right mouse absolute scrolling (when enabled)
|
2017-07-14 19:22:29 +10:00 |
|
Dan Balasescu
|
3914b3ba13
|
Merge branch 'master' into right-mouse-scrollbar
|
2017-07-14 19:15:00 +10:00 |
|
Dean Herbert
|
b7612af20c
|
Make comment different
|
2017-07-14 18:08:47 +09:00 |
|
Dean Herbert
|
9dba363b08
|
Use button boundaries to decide when to expand sidebar
|
2017-07-14 17:57:01 +09:00 |
|
Dan Balasescu
|
3702d4b921
|
Merge branch 'master' into settings-improvements
|
2017-07-14 18:43:08 +10:00 |
|
Dean Herbert
|
36594afee3
|
Merge pull request #978 from EVAST9919/mods_overlay_fix
Hide "Unranked" text in ModDisplay if play is ranked
|
2017-07-14 17:36:46 +09:00 |
|
Dean Herbert
|
95a40e39ec
|
Merge branch 'master' into mods_overlay_fix
|
2017-07-14 17:31:52 +09:00 |
|