EVAST9919
56bde64839
Add arrows overlay
2017-09-22 01:16:05 +03:00
gabixdev
8438ea1267
Fix formatting ;_;
2017-09-21 22:11:35 +02:00
EVAST9919
5383e33f3d
Remove useless clock assignment
2017-09-21 22:58:49 +03:00
EVAST9919
22ab2c5e5d
Apply suggested changes
2017-09-21 22:54:46 +03:00
DrabWeb
01e70f9bef
Change type check to safe cast.
2017-09-21 14:53:42 -03:00
DrabWeb
46af17f00c
Fix preview button potential null ref.
2017-09-21 14:46:51 -03:00
DrabWeb
cb4818e84e
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-21 14:25:34 -03:00
EVAST9919
9667270336
Remove using
2017-09-21 01:56:50 +03:00
EVAST9919
e051bcc6df
Fix wrong arrows position on startup
2017-09-21 01:51:40 +03:00
EVAST9919
c79568135a
Add arrows
2017-09-21 01:44:30 +03:00
EVAST9919
18a714df74
Move every class to it's own file
2017-09-20 22:33:07 +03:00
EVAST9919
581689a84d
CI fixes
2017-09-20 20:58:20 +03:00
EVAST9919
4699a44608
Add info container
2017-09-20 20:50:14 +03:00
EVAST9919
8d7db52200
Add remaining time counter
2017-09-20 19:45:38 +03:00
EVAST9919
eb93706c26
Remove useless usings
2017-09-20 16:03:31 +03:00
EVAST9919
0f04d8c6a7
Add remaining time container
2017-09-20 15:58:28 +03:00
smoogipooo
e65a17ad96
Remove redundant usings
2017-09-20 18:40:41 +09:00
smoogipooo
7168e8fd99
Improve layout of bottom bar in the Editor
2017-09-20 18:16:03 +09:00
smoogipooo
58b09a161f
CI fixes
2017-09-20 17:16:12 +09:00
smoogipooo
7588f1b6ca
Add SummaryTimeline to Editor
2017-09-20 17:09:38 +09:00
smoogipooo
f9568619e7
Move SummaryTimeline into /Edit/Components/SummaryTimeline
2017-09-20 16:59:03 +09:00
smoogipooo
3da3ef1a50
CI fixes
2017-09-20 16:53:01 +09:00
smoogipooo
5978668d2b
Mini -> Summary
2017-09-20 16:48:30 +09:00
smoogipooo
967bfa404e
Generate a set beatmap instead of using the available beatmaps
2017-09-20 16:40:37 +09:00
smoogipooo
6a9572db6c
Merge branch 'master' into editor-timing-timeline
...
# Conflicts:
# osu-framework
2017-09-20 16:19:08 +09:00
smoogipooo
01d84893a0
Cleanup + commenting
2017-09-20 15:55:23 +09:00
smoogipooo
fd278256ad
EditorTimingTimeline -> EditorMiniTimeline
2017-09-20 15:50:32 +09:00
smoogipooo
252121968d
Actually load a beatmap for TestCaseEditorTimingTimeline
2017-09-20 15:40:42 +09:00
smoogipooo
01c3818ea0
Make EditorTimingTimeline support beatmap changes
2017-09-20 15:40:27 +09:00
Dean Herbert
120446e4a7
Ensure only one dialog is being displayed by the SongSelect footer at a time
...
Fixes #1208
2017-09-20 14:32:15 +09:00
Damnae
fcaabf7fdf
Merge branch 'master' into storyboard_integration
2017-09-19 17:36:29 +02:00
EVAST9919
4cf88c72bf
Move testcase to the correct project
2017-09-19 17:37:34 +03:00
EVAST9919
c59d398aa5
Fix includes
2017-09-19 17:26:17 +03:00
EVAST9919
1b0ab414fa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-19 17:23:10 +03:00
smoogipooo
67d3861226
Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline
...
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
2017-09-19 23:09:08 +09:00
EVAST9919
1de8bca7f6
Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix
2017-09-19 17:08:32 +03:00
Dean Herbert
3000323727
Give WorkingBeatmap's Metadata a non-null default
2017-09-19 21:41:18 +09:00
Dean Herbert
f96875a470
Add a catch specific player test
2017-09-19 21:40:57 +09:00
Dean Herbert
4b0eee2bcc
Merge remote-tracking branch 'upstream/master' into merge-projects
2017-09-19 20:43:20 +09:00
Dean Herbert
ef210018d9
Run headless tests with a unique name based on the executing assembly
2017-09-19 20:04:37 +09:00
Dean Herbert
390c212dcb
Don't die on a null connection during disposal
...
May be caused by a startup error. This shouldn't result in an additional exception here.
2017-09-19 20:04:13 +09:00
Dean Herbert
99b512cce5
Output ruleset assemblies to the game folder rather than adding special logic
2017-09-19 19:27:14 +09:00
Dean Herbert
c41ca10715
Allow files missing on disk to be restored on beatmap import
...
Previously, in the rare case the database became out of sync with the disk store, it was impossible to feasibly repair a beatmap. Now reimporting checks each file exists on disk and adds it back if it doesn't.
2017-09-19 18:35:52 +09:00
Dean Herbert
51cdff1d9a
Fix TestCasePlaySongSelect incorrectly using live app data
2017-09-19 17:22:45 +09:00
Dean Herbert
f2a9e95d56
Fix type resolution in RulesetStore
2017-09-19 17:22:24 +09:00
Dean Herbert
296ebbfc54
Read ruleset assemblies from project folders
2017-09-19 16:07:00 +09:00
Dean Herbert
096f53d769
Use new static IsDebug method
2017-09-19 16:07:00 +09:00
Dean Herbert
511874389a
Define trace for VisualTests
2017-09-19 16:07:00 +09:00
Dean Herbert
1f20c5eb69
Optimise project references
2017-09-19 16:07:00 +09:00
Dean Herbert
6db705a3a8
Update relative paths
2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Damnae
5a76ed4000
Fix LegacyFilesystemReader Filenames property.
2017-09-18 10:14:29 +02:00
Dean Herbert
067dac495f
Merge branch 'master' into file-count-fix
2017-09-18 10:43:49 +09:00
gabixdev
387705b2b6
revert csproj
2017-09-17 19:43:53 +02:00
gabixdev
3c00a7cc51
Reformat again...
2017-09-17 01:44:49 +02:00
ColdVolcano
8944d0f705
make it only look for files instead of directories
2017-09-16 18:44:32 -05:00
gabixdev
a33dfbba25
Code reformat
2017-09-17 01:40:38 +02:00
gabixdev
48008cd7e6
...
2017-09-17 01:34:56 +02:00
gabixdev
a8ada75633
CODE STYLE XD
2017-09-17 01:28:02 +02:00
gabixdev
846838c621
Move to MenuCursor
2017-09-17 01:14:33 +02:00
gabixdev
bfe1febef2
Fix field access + remove unneeded this
2017-09-17 01:00:44 +02:00
gabixdev
e8462ac134
Add option to disable cursor rotation.
2017-09-17 00:47:55 +02:00
TocoToucan
51a5e963bb
Dispose IDisposable object before method returns
2017-09-16 15:10:24 +03:00
Damnae
2201fc745e
Fix storyboard loops start time when none of their commands start at 0.
2017-09-16 13:32:51 +02:00
Dan Balasescu
02ccea1c4e
Merge branch 'master' into scores-lookup-requires-id
2017-09-16 08:43:59 +09:00
ColdVolcano
47b62803d8
Account for all files instead of just the main directory ones
2017-09-15 15:47:56 -05:00
DrabWeb
7e30c55bf4
CI fix.
2017-09-15 13:54:16 -03:00
DrabWeb
9787b92129
Merge branch 'online-beatmap-set-overlay' of https://github.com/DrabWeb/osu into online-beatmap-set-overlay
2017-09-15 13:47:34 -03:00
DrabWeb
1bac1e2c0e
Make PreviewButton async.
2017-09-15 13:47:03 -03:00
EVAST9919
429e7723b3
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-15 19:40:30 +03:00
EVAST9919
740e766201
BreakOverlay and LetterboxOverlay implementation
2017-09-15 19:39:55 +03:00
Damnae
5f6b300a3a
Fix visual test crash when BeatmapInfo doesn't have a BeatmapSet.
2017-09-15 15:12:16 +02:00
Damnae
291486a4d1
Only create drawables for storyboard elements that will be visible.
2017-09-15 14:31:59 +02:00
Damnae
757a159516
Display a non-parallax background at the appropriate size when storyboards do not replace it.
2017-09-15 14:31:54 +02:00
Damnae
f5368505ab
Load the storyboard asynchronously if it wasn't loaded with the beatmap.
2017-09-15 11:58:37 +02:00
Damnae
4a15762139
Don't create drawables for hidden storyboards.
2017-09-15 11:58:37 +02:00
Damnae
c8cdf6787e
Better property name.
2017-09-15 11:58:31 +02:00
Damnae
7c3ce7e830
Unbind events affecting the background after gameplay has ended.
2017-09-15 09:16:56 +02:00
Damnae
cb8029af9e
Add a setting to hide storyboards.
2017-09-15 09:16:56 +02:00
Damnae
ddaf28d7f6
Integrate storyboards with gameplay.
2017-09-15 09:16:56 +02:00
Damnae
010a6ec252
Fix player loading.
2017-09-15 09:06:27 +02:00
EVAST9919
e7c9ad245e
Fix icons in main button system jumps on one side for a long time
2017-09-15 09:24:31 +03:00
Dean Herbert
b72921b30e
Ensure an OnlineBeatmapID is present before attempting API requests
2017-09-15 12:44:48 +09:00
Dean Herbert
6ea22cc6c7
Add missing return to PlayerLoader
...
was being a bit too eager previously
2017-09-15 08:15:23 +09:00
MrTheMake
1e0ce6dabd
Removed unnecessary casting of KeyBindingRow.FilterTerms
2017-09-14 13:18:50 +02:00
Dan Balasescu
77d2b1e478
Merge branch 'master' into more_context_menus
2017-09-14 19:21:29 +09:00
Dean Herbert
7cd6caacaa
Update to support newer return structure from osu-web API
2017-09-14 18:08:12 +09:00
Dean Herbert
cbed9bc141
Merge branch 'master' into more_context_menus
2017-09-14 17:55:32 +09:00
Dean Herbert
02fa9eeb3b
Merge branch 'master' into online-beatmap-set-overlay
2017-09-14 16:52:44 +09:00
Dean Herbert
33d33a49ae
Merge branch 'master' into storyboards
2017-09-14 16:06:19 +09:00
Dean Herbert
b7c9819680
Add context menus to chat names and user panels
2017-09-14 15:43:47 +09:00
Dean Herbert
396a56ddf4
Remove global OsuContextMenuContainer
2017-09-14 15:41:32 +09:00
Dean Herbert
d330b39db4
Remove max
2017-09-14 13:47:25 +09:00
Dean Herbert
4f09f30b7a
Fix incorrect exception
2017-09-14 13:13:54 +09:00
Dean Herbert
b1145272d1
Update code to support new inspectcode analysis rules
2017-09-14 12:58:32 +09:00
DrabWeb
022e39b843
CI fixes.
2017-09-13 18:31:53 -03:00
DrabWeb
d83cd3ecf9
Make Header and it's components updateable.
2017-09-13 18:25:23 -03:00
DrabWeb
63c50f82eb
Make Info updateable.
2017-09-13 12:37:18 -03:00
DrabWeb
574d7b24ff
Fix some visual issues.
2017-09-13 12:07:31 -03:00
MrTheMake
89b5a6670e
Changed type of IHasFilterTerms.FilterTerms according to framework update
2017-09-13 16:18:02 +02:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
Dean Herbert
fb7740a3ab
Update all dependencies in line with framework
2017-09-13 20:25:40 +09:00
Damnae
bab3ef0669
Rename storyboard classes.
2017-09-13 11:22:24 +02:00
smoogipooo
5e32d95ad2
Remove Ruleset's CreateScoreProcessor method
2017-09-13 16:37:05 +09:00
smoogipooo
f1130eb899
Add default implementation for ScoreProcessor using Exponential scoring
2017-09-13 16:35:13 +09:00
Dean Herbert
e37a354db0
Merge branch 'master' into fix-sliderhead-depth
2017-09-13 16:19:37 +09:00
smoogipooo
093d82ac45
Set depths from playfield add methods instead of DrawableHitObject
2017-09-13 16:17:01 +09:00
smoogipooo
e146bcacf1
Make BasePortion and ComboPortion constants
2017-09-13 16:13:27 +09:00
smoogipooo
e472518e4f
Standardized is default for now
2017-09-13 15:58:50 +09:00
smoogipooo
d83a2d4dc6
Disable masking optimisations for scrolling hit objects
...
Lifetime is very tightly controlled here, so all should be okay.
2017-09-13 15:57:40 +09:00
smoogipooo
05ac23f99a
Remove AffectsAccuracy for now
2017-09-13 15:44:03 +09:00
Dean Herbert
f4f7ae12b3
Merge branch 'master' into channelselection-minimum-size
2017-09-13 15:40:22 +09:00
Dean Herbert
7681d97f10
Fix typo in user profile header
...
Replays watched, not replay watched.
2017-09-13 15:21:04 +09:00
smoogipooo
ba3e44cd71
Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)
2017-09-13 15:17:32 +09:00
Dean Herbert
7835269f95
Merge branch 'master' into channelselection-minimum-size
2017-09-13 14:21:44 +09:00
DrabWeb
0a5c963c4b
Remove redundant .this
2017-09-13 00:18:00 -03:00
DrabWeb
9e6f94b818
Make BeatmapPicker buttons more independent.
2017-09-13 00:13:45 -03:00
DrabWeb
0e9dc6fb85
Don't recreate header buttons on beatmap change.
2017-09-12 23:55:48 -03:00
DrabWeb
d36fc13487
Make success rate percent move with the bar.
2017-09-12 23:46:21 -03:00
DrabWeb
ba90fc87d0
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-12 23:41:57 -03:00
DrabWeb
97e5a0d4a3
CI fixes.
2017-09-12 23:41:10 -03:00
Dean Herbert
1de1b882e3
Fix BeatmapInfo's comparator when not being sourced from database
2017-09-13 10:36:58 +09:00
DrabWeb
08b5d4e16c
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-12 21:26:06 -03:00
DrabWeb
680f2e232c
Cleanup.
2017-09-12 21:24:43 -03:00
DrabWeb
d09bcabc8f
Add a background to the overlay.
2017-09-12 21:00:20 -03:00
DrabWeb
a291bd3020
Add second beatmap set to test, fix some visual issues.
2017-09-12 20:55:17 -03:00
DrabWeb
169bfe134b
Fix incorrect BasicStats padding.
2017-09-12 20:24:48 -03:00
MrTheMake
a30bd90641
Merge branch 'channelselection-minimum-size' of https://github.com/MrTheMake/osu into channelselection-minimum-size
2017-09-12 18:48:11 +02:00
MrTheMake
9839a3b937
Smoothly transform the chat height when opening the channel selection
2017-09-12 18:47:21 +02:00
MrTheMake
c78695cfe0
Removed redundant call
2017-09-12 18:26:52 +02:00
smoogipooo
3619f7c1eb
Fix possible NaN accuracy
2017-09-13 00:38:52 +09:00
smoogipooo
7b44ad300f
Remove accurateHits, make Accuracy once again tied to comboScore
2017-09-13 00:33:01 +09:00
smoogipooo
2a45451308
Fix combo duplication.
2017-09-13 00:19:17 +09:00
smoogipooo
7dd79f5a0b
Fix incorrect accuracy calculation
2017-09-13 00:11:56 +09:00
smoogipooo
ba4f81d022
Woops, fix incorrectly deleted line
2017-09-12 23:30:15 +09:00
smoogipooo
4269533bab
Remove remaining AllObjectsJudged in RulesetContainer
2017-09-12 22:29:44 +09:00
smoogipooo
89cb38386c
Set accuracy
2017-09-12 22:28:16 +09:00
smoogipooo
dc9b47559a
Multiply standardised combos by the HighestCombo to make higher combos matter more
2017-09-12 22:28:10 +09:00
smoogipooo
b5f48c2368
Add storeResults as a parameter to Reset
...
Whether to store the current state of the ScoreProcessor for future use.
2017-09-12 22:27:27 +09:00
smoogipooo
2e0218f388
Move AllObjectsJudged into ScoreProcessor as AllJudged
...
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
smoogipooo
cc6bb81a73
Reimplement Exponential scoring with a simpler and more intuitive calculation
...
Default for all rulesets for now.
2017-09-12 21:47:09 +09:00
smoogipooo
d0774c7bc6
ComputeTargets -> SimulateAutoplay + improve xmldoc
2017-09-12 21:16:47 +09:00
smoogipooo
3e3618d724
More cleanups
2017-09-12 21:12:57 +09:00
smoogipooo
abab2a4878
Revamp score processing to once more unify scoring methods
2017-09-12 21:05:50 +09:00
smoogipooo
0b94939474
Make Accuracy = 1, Health = 1 the default for ScoreProcessor
2017-09-12 20:53:26 +09:00
smoogipooo
195c2d7a31
Keep track of maximum hits + combo at base ScoreProcessor level
2017-09-12 19:48:17 +09:00
smoogipooo
cba642f781
Reduce nesting, because we don't have partial judgements any more
2017-09-12 19:45:14 +09:00
smoogipooo
c07e831b17
Move HasFailed override to base ScoreProcessor
2017-09-12 19:39:54 +09:00
smoogipooo
3af8345068
Add AffectsAccuracy to Judgement
2017-09-12 19:39:44 +09:00
Dan Balasescu
f4a2ffbeea
Merge branch 'master' into judgement-revamp
2017-09-12 19:13:33 +09:00
smoogipooo
112429051e
Fix XMLDoc CI errors
2017-09-12 19:05:37 +09:00
Dan Balasescu
ee8ec31c6e
Merge branch 'master' into judgement-revamp
2017-09-12 18:57:37 +09:00
smoogipooo
d5bd005c01
Remove unused code for now
...
I don't think we'll ever be using this anyway.
2017-09-12 18:52:15 +09:00
smoogipooo
92b3e203e8
judgementOccurred should be passed upwards
...
So only one hit object is ever judged in a single frame.
2017-09-12 18:50:30 +09:00
smoogipooo
a38e0062a4
Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement.
2017-09-12 18:49:50 +09:00
Dan Balasescu
d25c382adf
Merge branch 'master' into workingbeatmap-track-disposal
2017-09-12 18:44:52 +09:00
Dean Herbert
86de4fa2e2
Apply CI fixes
2017-09-12 18:36:19 +09:00
Dean Herbert
f32d444d68
Remove generics from Playfield (fixes catch)
2017-09-12 18:19:28 +09:00
Dean Herbert
d7ac02d090
Ensure judgements aren't updated when ArmedState is not idle
2017-09-12 18:00:41 +09:00
Dean Herbert
1194e46ef1
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-12 17:46:21 +09:00
Dean Herbert
20dae5ee11
Minor refactors
2017-09-12 17:36:46 +09:00
Damnae
58e65397b0
Add support for storyboards using numerical values.
2017-09-12 10:13:55 +02:00
Dean Herbert
5b9d906ad5
Improve beatmap track disposal logic
...
- [ ] Depends on https://github.com/ppy/osu-framework/pull/1035
2017-09-12 16:56:46 +09:00
Dan Balasescu
3be9d3c747
Merge branch 'master' into mania-autoplay
2017-09-12 16:44:05 +09:00
smoogipooo
8737a1b1a5
Implement osu!mania auto replay generation.
2017-09-12 15:52:32 +09:00
smoogipooo
d6bf5c38b7
Move Kiai bool to HitObject.
2017-09-12 10:01:07 +09:00
Dean Herbert
7c7849f189
Fix icon states being updated incorrectly when being set too early
2017-09-11 21:40:58 +09:00
Dean Herbert
b38da61ef6
Merge branch 'master' into fix-paused-osu-logo
2017-09-11 19:53:36 +09:00
Damnae
2fb203159f
CI fixes.
2017-09-11 12:39:50 +02:00
Damnae
47cd1d486b
Merge branch 'master' into storyboards
2017-09-11 12:29:19 +02:00
Damnae
cd15cfc864
Use case insensitive paths to find storyboard textures.
2017-09-11 12:06:13 +02:00
Damnae
9eaa1cb5cd
Fix sprites not being visible when all their commands are inside loops.
2017-09-11 12:06:00 +02:00
Shane Woolcock
262aea8b6b
Fix osu! logo triangles going super fast when the track is paused
2017-09-11 19:16:44 +09:30
Dean Herbert
ba4b9e3411
Merge branch 'master' into mania-hit-explosions
2017-09-11 18:32:36 +09:00
Dean Herbert
18ad0956b4
Merge branch 'master' into maybefix
2017-09-11 18:23:00 +09:00
Dean Herbert
7b92bbfa86
Merge branch 'master' into mania-hit-explosions
2017-09-11 17:34:14 +09:00
Dean Herbert
838fcca9c4
Merge branch 'master' into mania-hit-explosions
2017-09-11 15:14:35 +09:00
smoogipooo
f3c6f6f959
Merge branch 'blending-equations' into mania-holdnote-niceness
2017-09-11 15:09:01 +09:00
smoogipooo
58c875bdca
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 15:02:12 +09:00
DrabWeb
4be8899fb2
Move Length to BeatmapOnlineInfo.
2017-09-11 02:55:32 -03:00
DrabWeb
43fa314fe0
Details and more data displaying.
2017-09-11 02:48:48 -03:00
smoogipooo
4683319156
Merge remote-tracking branch 'origin/master' into mania-hit-explosions
2017-09-11 14:48:40 +09:00
Dean Herbert
5ce76d8023
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-11 14:36:51 +09:00
Dean Herbert
512232c1c8
Fix regression causing autoplay to fail
2017-09-11 14:25:01 +09:00
smoogipooo
0cadee998c
Set default AccentColour for hit objects
2017-09-11 13:44:05 +09:00
DrabWeb
e61ab72c0d
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-11 01:24:52 -03:00
DrabWeb
54172ac6ad
Move header button and details components to own files.
2017-09-11 01:21:53 -03:00
Dean Herbert
7170fbd087
Target .NET 4.6.1
2017-09-11 12:39:00 +09:00
Dean Herbert
adba5b5ba6
Merge branch 'master' into beatmap-details-rewrite
2017-09-11 12:30:32 +09:00
Dan Balasescu
24f7b6823e
Merge branch 'master' into nullref-fix
2017-09-11 12:13:43 +09:00
Dean Herbert
eedfbdc0e8
Add nullref check in KeyCounterCollection's Add method
2017-09-11 11:41:09 +09:00
Dean Herbert
8d919e42c9
Fix nullref when loading MusicController VisualTest after Player VisualTest
2017-09-11 11:18:53 +09:00
Dean Herbert
cb24b5c436
Merge branch 'master' into beatmap-details-rewrite
2017-09-11 10:18:34 +09:00
Dean Herbert
f33bd700c5
Fix individual volume controls not being adjustable via wheel
...
They were blocking each others' input unnecessarily.
2017-09-11 08:27:29 +09:00
smoogipooo
2086ed209d
Fix hold note tick input.
2017-09-11 04:51:44 +09:00
Damnae
59d9dc5ee7
Ignore storyboard sprites with invalid positions.
2017-09-10 20:08:56 +02:00
smoogipooo
cde22865b9
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
ea35b69f2f
Merge branch 'master' into fix-mono-crash
2017-09-10 11:49:20 +09:00
Dean Herbert
6d33e39c5e
Merge branch 'master' into beatmap-details-rewrite
2017-09-10 11:26:00 +09:00
DrabWeb
aa9dfcc082
BeatmapPicker logic.
2017-09-09 19:05:22 -03:00