Dean Herbert
|
552a361a24
|
Merge remote-tracking branch 'upstream/master' into intro-v2
|
2017-11-08 11:08:42 +09:00 |
|
Dean Herbert
|
5af2cc29f5
|
Merge branch 'master' into song_select_delete
|
2017-11-07 16:42:40 +09:00 |
|
EVAST9919
|
1afe2c18be
|
Fix osu! deleting beatmaps on startup if MenuMusic is disabled
|
2017-11-04 19:42:28 +03:00 |
|
Dean Herbert
|
3adcfa8c38
|
Many fixes
|
2017-11-03 17:54:35 +09:00 |
|
Dean Herbert
|
2f205d1f63
|
Merge branch 'single-osu-logo' into intro-v2
|
2017-11-03 15:37:24 +09:00 |
|
Dean Herbert
|
6a206c616b
|
Update in line with framework changes
|
2017-11-03 14:34:12 +09:00 |
|
Dean Herbert
|
8f78d84ad6
|
Make intro resume slower
|
2017-11-02 21:52:23 +09:00 |
|
Dean Herbert
|
c99ffb4aa3
|
Fix potential nullref
|
2017-11-02 21:52:12 +09:00 |
|
Dean Herbert
|
9b2d41f4eb
|
Fix quick retry looking bad
|
2017-11-02 21:52:01 +09:00 |
|
Dean Herbert
|
b8b05fe8d2
|
Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
|
2017-11-02 20:38:02 +09:00 |
|
Dean Herbert
|
6fa02ce9bb
|
Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
|
2017-11-01 17:10:54 +09:00 |
|
Dean Herbert
|
27156aeb93
|
Fix the shit
|
2017-11-01 17:07:03 +09:00 |
|
Dean Herbert
|
15197b9a76
|
Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
|
2017-11-01 16:57:59 +09:00 |
|
Dean Herbert
|
f486ab1f6c
|
Merge branch 'master' into song_select_delete
|
2017-10-30 21:07:02 +09:00 |
|
EVAST9919
|
189b51551d
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
|
2017-10-26 14:40:40 +03:00 |
|
Dean Herbert
|
5001e9f264
|
Fix Hide/Restore/Delete etc.
|
2017-10-25 22:08:34 +09:00 |
|
Dean Herbert
|
26d8b67f25
|
Merge branch 'master' into config-slider-keyboardstep
|
2017-10-24 08:14:56 +09:00 |
|
Dean Herbert
|
dc9c474033
|
Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
|
2017-10-23 19:32:02 +09:00 |
|
Shane Woolcock
|
ea2934d92c
|
Add KeyboardStep values for configuration options
|
2017-10-23 16:06:08 +10:30 |
|
Dean Herbert
|
f69fa0cf1f
|
Fix selection after hiding all difficulties in a set
|
2017-10-20 11:16:56 +09:00 |
|
Dean Herbert
|
5d5ea5fb2e
|
Fix all remaining db structure issues
|
2017-10-19 14:05:11 +09:00 |
|
Dean Herbert
|
a85de09c0f
|
Fix beatmap carousel interactions with deletion when not yet displayed
|
2017-10-18 18:36:35 +09:00 |
|
Dean Herbert
|
2f3319552d
|
Merge remote-tracking branch 'upstream/master' into EfCore
|
2017-10-18 11:43:37 +09:00 |
|
EVAST9919
|
bae91d7de7
|
Simplify gradient usage in Letterbox Overlay
|
2017-10-18 05:06:17 +03:00 |
|
Dean Herbert
|
31dc5c97f2
|
Fix intro and duplicate inserts
|
2017-10-17 11:22:42 +09:00 |
|
Huo Yaoyuan
|
c2836a8393
|
Use format string for double instead of Math.Round.
|
2017-10-16 12:59:59 +09:00 |
|
Huo Yaoyuan
|
9b3676c562
|
Use format string for double instead of Math.Round.
|
2017-10-15 16:44:15 +08:00 |
|
EVAST9919
|
e3ce641ea0
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
|
2017-10-15 00:15:25 +03:00 |
|
EVAST9919
|
24ca7a5119
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete
|
2017-10-15 00:09:50 +03:00 |
|
smoogipoo
|
9924f518b7
|
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/BeatmapMetadata.cs
# osu.Game/osu.Game.csproj
# osu.Game/packages.config
|
2017-10-14 16:36:37 +09:00 |
|
smoogipoo
|
b178be21d1
|
Let's not rename columns yet
|
2017-10-14 14:30:58 +09:00 |
|
smoogipoo
|
b83d7cd4df
|
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
# osu-framework
# osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
# osu.Game/Beatmaps/BeatmapInfo.cs
# osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
|
2017-10-14 12:38:59 +09:00 |
|
Dean Herbert
|
cd722e4abb
|
Fix beatmap author being stored in two different places
|
2017-10-14 11:39:55 +09:00 |
|
EVAST9919
|
6711331f66
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
|
2017-10-14 05:18:03 +03:00 |
|
EVAST9919
|
502940ddf3
|
Fix deleting last visible beatmap doesn't trigger selecting null beatmap
|
2017-10-14 05:05:38 +03:00 |
|
EVAST9919
|
583f8358b6
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete
|
2017-10-14 04:32:12 +03:00 |
|
Dean Herbert
|
c0d64bf409
|
Use Gray instead of FromHex for grays
|
2017-10-12 22:19:29 +09:00 |
|
Dean Herbert
|
37fc69b9f7
|
Set a default zoom level that isn't the whole track
|
2017-10-12 22:19:02 +09:00 |
|
Dean Herbert
|
37b88d834e
|
Adjust padding slightly
|
2017-10-12 22:10:37 +09:00 |
|
smoogipoo
|
ab62390336
|
Make TimelineButtons combined take up the full height of the timeline
|
2017-10-12 18:32:39 +09:00 |
|
smoogipoo
|
a6901c0a27
|
Change TimelineButton icon colour to white when hovered
|
2017-10-12 18:17:36 +09:00 |
|
smoogipoo
|
5ccfc1918e
|
Hook up more bindables for hitobjects/hitsounds
|
2017-10-12 17:51:01 +09:00 |
|
smoogipoo
|
db672becbc
|
Implement waveform checkbox
|
2017-10-12 17:50:51 +09:00 |
|
smoogipoo
|
3c35a7a6ae
|
graph -> waveform
|
2017-10-12 17:37:40 +09:00 |
|
smoogipoo
|
4586877239
|
Implement magnification buttons
|
2017-10-12 17:31:21 +09:00 |
|
smoogipoo
|
de8f9325a3
|
Implement TimelineButton and use for the magnification buttons
|
2017-10-12 16:10:33 +09:00 |
|
smoogipoo
|
2844764e3c
|
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
|
2017-10-12 15:37:45 +09:00 |
|
smoogipoo
|
e12fa49436
|
Integrate timeline into Compose
|
2017-10-12 15:37:00 +09:00 |
|
smoogipoo
|
6fbf52c3eb
|
Remove unused usings
|
2017-10-12 15:32:18 +09:00 |
|
EVAST9919
|
7cff413ab0
|
Fix wrong beatmap selection in song-select menu on deleting selected beatmap
|
2017-10-11 20:25:12 +03:00 |
|