Jorolf
|
9f005488f7
|
make it work again after merge
|
2017-08-09 17:32:09 +02:00 |
|
Jorolf
|
7d7cfe5d92
|
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
|
2017-08-08 23:13:25 +02:00 |
|
Dean Herbert
|
fa7ef8ed52
|
Merge remote-tracking branch 'upstream/master' into taiko-fixes
# Conflicts:
# osu.Desktop.Tests/Visual/TestCaseTaikoHitObjects.cs
# osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2017-08-04 18:04:23 +09:00 |
|
Dean Herbert
|
f8448b8b19
|
Update to support new framework VisualTests structure
|
2017-08-04 15:37:31 +09:00 |
|
smoogipooo
|
0a4464bbe8
|
Merge remote-tracking branch 'origin/master' into taiko-fixes
# Conflicts:
# osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
|
2017-08-03 20:02:19 +09:30 |
|
smoogipooo
|
09c0e18a04
|
Fix incorrect size reset function.
|
2017-08-03 15:47:23 +09:30 |
|
Dean Herbert
|
0d9ea97828
|
Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
|
2017-08-03 14:36:21 +09:00 |
|
smoogipooo
|
8553e1cad3
|
Same default value for parameter.
|
2017-08-03 14:38:24 +09:30 |
|
smoogipooo
|
8ef949ce38
|
Remove TestCaseTaikoHitObjects.
|
2017-08-03 13:56:36 +09:30 |
|
smoogipooo
|
324fd456a7
|
Rework border + fillmodes + size in TaikoPlayfield.
|
2017-08-03 13:35:07 +09:30 |
|
smoogipooo
|
17cad76054
|
Make TestCaseTaikoPlayfield able to visualise kiai hits.
|
2017-08-03 13:33:46 +09:30 |
|
smoogipooo
|
13af804bbb
|
Fix TestCaseTaikoPlayfield not correctly setting strong hit objects.
|
2017-08-03 13:11:53 +09:30 |
|
MrTheMake
|
4d8e5898fd
|
Updates according to the framework and formatting
|
2017-08-01 17:28:18 +02:00 |
|
Dean Herbert
|
209d024caa
|
Merge branch 'master' into musiccontroller-canbeatmapchange
|
2017-08-01 11:54:05 +09:00 |
|
Dean Herbert
|
17c5bdbc92
|
Merge branch 'master' into fix-notification-threading
|
2017-07-31 16:33:34 +09:00 |
|
Jorolf
|
cca49d6ed5
|
some renaming, a show more button and a placeholder if no scores exist
|
2017-07-29 15:06:46 +02:00 |
|
Jorolf
|
c02165c820
|
remove unused usings
|
2017-07-29 01:18:42 +02:00 |
|
Jorolf
|
33ce8737cc
|
fix merge
|
2017-07-29 00:47:23 +02:00 |
|
Jorolf
|
4720a47363
|
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
|
2017-07-29 00:45:14 +02:00 |
|
Jorolf
|
0fc36065f4
|
replace Play with Score
|
2017-07-29 00:31:52 +02:00 |
|
Dean Herbert
|
f705589bf2
|
Rename NotificationManager to NotificationOverlay
|
2017-07-28 15:03:42 +09:00 |
|
Dean Herbert
|
cd22ff11e9
|
Fix VisualTests
|
2017-07-27 20:50:26 +09:00 |
|
Dean Herbert
|
5f53426a9a
|
*Database -> *Store
Welcome back BeatmapManager
|
2017-07-27 16:56:41 +09:00 |
|
Dean Herbert
|
cbe7b08642
|
Make BeatmapStore's BeatmapDatabase private
|
2017-07-27 15:34:13 +09:00 |
|
Jorolf
|
7b8997cfc2
|
CI stuff
|
2017-07-26 19:42:34 +02:00 |
|
Jorolf
|
8e685a98d4
|
add RanksSection
|
2017-07-26 19:21:45 +02:00 |
|
Dean Herbert
|
87add0765e
|
Initial documentation pass on BeatmapDatabase
Also a bit of tidying up.
|
2017-07-27 00:08:19 +09:00 |
|
Dean Herbert
|
898a601098
|
Introduce a reference counting file store
|
2017-07-26 20:22:02 +09:00 |
|
Dean Herbert
|
9e20a02c0a
|
Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
|
2017-07-26 16:31:34 +09:00 |
|
Dean Herbert
|
fce580d717
|
Reshuffle namespaces
|
2017-07-26 13:22:46 +09:00 |
|
Dean Herbert
|
64f2e2dc32
|
Use Colour instead of ColourInfo
|
2017-07-23 13:06:16 +02:00 |
|
Thomas Müller
|
e68675f970
|
Rename EasingTypes to Easing
|
2017-07-22 20:53:53 +02:00 |
|
Thomas Müller
|
4755529d43
|
Minor refactor of TestCaseBeatSyncedContainer
|
2017-07-22 10:48:15 +02:00 |
|
Thomas Müller
|
c4619f614a
|
Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
# osu-framework
|
2017-07-19 19:15:51 +02:00 |
|
MrTheMake
|
6ff2b73c30
|
Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
|
2017-07-19 16:50:29 +02:00 |
|
Dean Herbert
|
21d07428fe
|
Fix some test regressions
|
2017-07-19 15:16:59 +09:00 |
|
Dean Herbert
|
d0dea33faa
|
Make Beatmap (bindable) non-nullable.
|
2017-07-19 15:16:53 +09: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
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
Thomas Müller
|
19fb03e737
|
Try different formatting style
|
2017-07-16 18:28:20 +03:00 |
|
Thomas Müller
|
032e9df67b
|
ApplyDelay -> AddDelay
|
2017-07-16 17:47:29 +03:00 |
|
Thomas Müller
|
99221260c4
|
Replace several usages of BeginDelayedSequence with LINQ-style
|
2017-07-16 17:42:01 +03:00 |
|
Thomas Müller
|
71105bb9ee
|
Delay -> ApplyDelay; DelayReset -> ResetDelay
|
2017-07-16 14:06:46 +03:00 |
|
Thomas Müller
|
5372b94674
|
Remove some unnecessary usings
|
2017-07-14 19:35:44 +03:00 |
|
Thomas Müller
|
a5e610a7ba
|
Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
|
2017-07-14 19:18:12 +03:00 |
|
Huo Yaoyuan
|
6cf36da389
|
Merge branch 'master' into profile
|
2017-07-14 22:52:19 +08:00 |
|
MrTheMake
|
b01a6d46c9
|
Added beatmap lock functionallity to the music controller's test case
|
2017-07-14 12:54:37 +02:00 |
|
Dean Herbert
|
3aeed86392
|
Merge branch 'master' into drawable-room-update
|
2017-07-14 15:29:27 +09:00 |
|
Dean Herbert
|
133bcdec7a
|
Move async loading to a higher level to simplify logic
|
2017-07-14 14:39:15 +09:00 |
|
Dean Herbert
|
ab5341eadc
|
Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash
|
2017-07-14 09:46:36 +09:00 |
|