jorolf
|
9a29c53c5e
|
Merge branch 'master' of git://github.com/ppy/osu into volume-control
|
2018-03-03 19:09:08 +01:00 |
|
jorolf
|
3a420ba826
|
add the volume overlay
|
2018-03-03 19:08:35 +01:00 |
|
Dean Herbert
|
66493d200b
|
Merge branch 'master' into user-profile-recent
|
2018-03-04 02:45:12 +09:00 |
|
Dean Herbert
|
8273288048
|
Add xmldoc
|
2018-03-04 02:12:45 +09:00 |
|
Dean Herbert
|
0e928429d4
|
Merge branch 'master' into ruleset-replayframes
|
2018-03-04 01:57:43 +09:00 |
|
Dean Herbert
|
659578e8fa
|
Add rewind support for storyboards
|
2018-03-04 01:48:31 +09:00 |
|
Dean Herbert
|
26e50043b7
|
Fix parallax container during rewinds
|
2018-03-04 00:52:00 +09:00 |
|
Dean Herbert
|
c6c55c40ed
|
Rewrite BreakOverlay
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
|
2018-03-04 00:51:24 +09:00 |
|
naoey
|
a57dc154f9
|
More specific tests.
|
2018-03-03 20:34:29 +05:30 |
|
jorolf
|
bd75422d88
|
Merge branch 'master' of git://github.com/ppy/osu into volume-control
|
2018-03-03 14:10:50 +01:00 |
|
naoey
|
307147a8a3
|
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps
|
2018-03-03 16:10:22 +05:30 |
|
naoey
|
fb724ca8a7
|
Make song select ensure current beatmap is always playable in the active ruleset.
- Add a to TestCasePlaySongSelect testing this scenario
|
2018-03-03 16:09:24 +05:30 |
|
Dean Herbert
|
0b2cbf88bb
|
Merge branch 'master' into clock-fixes
|
2018-03-02 22:18:32 +09:00 |
|
Dean Herbert
|
06cf9cbd63
|
Merge branch 'master' into fix-perfectcurve
|
2018-03-02 21:49:33 +09:00 |
|
Dean Herbert
|
bd510e5356
|
Merge remote-tracking branch 'upstream/master' into clock-fixes
|
2018-03-02 21:01:53 +09:00 |
|
smoogipoo
|
a2c239d5e3
|
Rename to IBeatmapConverter, move to separate file
|
2018-03-02 20:19:47 +09:00 |
|
smoogipoo
|
8a15d4e677
|
Fix linear perfect-curves not being cased to CurveType.Linear
Fixes #2151.
|
2018-03-02 18:21:40 +09:00 |
|
smoogipoo
|
cdca7371a3
|
Replace testcases with a basic test suite
|
2018-03-02 18:20:33 +09:00 |
|
Dan Balasescu
|
4aff659272
|
Merge branch 'master' into beatmap-conversion-testcases
|
2018-03-02 16:04:32 +09:00 |
|
smoogipoo
|
1f834825dc
|
Add testcase to osu.Game in-case nunit tries to discover tests in it
|
2018-03-02 15:43:55 +09:00 |
|
smoogipoo
|
2e3ee00c19
|
Remove unnecessary changes
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
573d6d1b5f
|
Allow multiple mappings to be generated for a single hitobject
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
4e363664fd
|
Add beatmap parameter to beatmapconverter creation
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
070c5a95ee
|
Improve output
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
797d03a65f
|
Implement basic structure for beatmap conversion testing
|
2018-03-02 13:13:00 +09:00 |
|
Dean Herbert
|
c54c1699bf
|
Merge branch 'master' into ruleset-replayframes
|
2018-03-01 22:26:16 +09:00 |
|
Dean Herbert
|
603a98f6cc
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-03-01 21:33:27 +09:00 |
|
Dean Herbert
|
6dc9411a90
|
Don't use BufferedContainer for OsuLogo
Minor performance improvement. Not sure why this was done but it's not required any more.
|
2018-03-01 16:01:42 +09:00 |
|
smoogipoo
|
d5d4bcb558
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-03-01 14:04:38 +09:00 |
|
smoogipoo
|
e869f7d05b
|
Fix converted frames not getting time values
|
2018-03-01 02:28:15 +09:00 |
|
smoogipoo
|
fb16c3db87
|
Privatise CurrentTime's setter
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
19911193cf
|
Minify LegacyReplayFrame
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
cf42d5bbd5
|
Remove mostly-unused Score parameter
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
c9c65cab53
|
CreateReplayFrame -> CreateConvertibleReplayFrame
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
ab4d7fa46e
|
Remove IScoreParser interface
It's too early for this.
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
a3c7755ade
|
Implement a conversion process for ReplayFrames
|
2018-03-01 02:28:14 +09:00 |
|
Dean Herbert
|
b8ea4b11ab
|
Adjust range further
This is not a great idea.
|
2018-03-01 00:39:59 +09:00 |
|
Dean Herbert
|
e2f57ae346
|
Merge branch 'master' into parser-sanity-checks
|
2018-03-01 00:38:44 +09:00 |
|
jorolf
|
46dfb761c5
|
basic volume meter and testcase
|
2018-02-28 16:14:52 +01:00 |
|
Dean Herbert
|
eacb9ba743
|
Merge branch 'master' into user-profile-recent
|
2018-02-28 23:49:33 +09:00 |
|
Dean Herbert
|
36beaffa7a
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-28 23:48:54 +09:00 |
|
Dean Herbert
|
bda673e6fe
|
Merge branch 'master' into player-reduced-parallax
|
2018-02-28 23:15:25 +09:00 |
|
Dean Herbert
|
572d3b1316
|
Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm
In line with stable editor restrictions
|
2018-02-28 22:53:28 +09:00 |
|
Dan Balasescu
|
33a64cb497
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 22:53:02 +09:00 |
|
Dan Balasescu
|
25c748ed45
|
Merge branch 'master' into fix-player-exit
|
2018-02-28 22:05:44 +09:00 |
|
Dean Herbert
|
f9faf8e3d8
|
Localise offset clock usage out of Player as much as possible
|
2018-02-28 22:01:52 +09:00 |
|
Dean Herbert
|
01fcf9c813
|
Update in line with framework changes
|
2018-02-28 22:01:48 +09:00 |
|
Dan Balasescu
|
b898226a91
|
Merge branch 'master' into fix-mod-select
|
2018-02-28 21:52:07 +09:00 |
|
Dan Balasescu
|
a3d26d7d55
|
Merge branch 'master' into fix-song-select-iteration
|
2018-02-28 21:40:25 +09:00 |
|
naoey
|
2e535afb84
|
Remove redundant subsection title.
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
|
2018-02-28 15:25:29 +05:30 |
|
Dean Herbert
|
5b4fef0180
|
Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
|
2018-02-28 18:12:24 +09:00 |
|
Dean Herbert
|
968291c61e
|
Sort hitobjects imported from legacy beatmps
Apaprently some ranked maps contain unordered hitobjects. We probably never want to allow for this.
|
2018-02-28 18:11:28 +09:00 |
|
Dean Herbert
|
6f44db6de0
|
Clamp at DifficultyControlPoint
This is what stable did.
|
2018-02-28 18:10:38 +09:00 |
|
Dean Herbert
|
08497427fd
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 15:32:16 +09:00 |
|
Dean Herbert
|
bc0bbd2e3b
|
Merge branch 'master' into reduce-transforms
|
2018-02-28 14:39:31 +09:00 |
|
Dean Herbert
|
4a52db14d1
|
Fix depth of already-visible panels not being updates after a sorting change
|
2018-02-28 14:18:25 +09:00 |
|
Dean Herbert
|
dd6cf1379e
|
Reduce parallax effect during gameplay
This also cleans up some shared code in OsuScreen.
|
2018-02-28 11:42:47 +09:00 |
|
Dean Herbert
|
0cd049c6b0
|
Rely less on zero-duration transform helpers
They have huge overheads.
See ppy/osu-framework#1411.
|
2018-02-28 11:00:54 +09:00 |
|
naoey
|
62913163e0
|
Fix long recent activity text overlapping timestamp.
- Also remove unnecessary fallback from absolute URL helper
|
2018-02-27 21:21:53 +05:30 |
|
Dean Herbert
|
510ecd7c87
|
Ensure selection is finalised before exiting song select
Resolves #2080.
|
2018-02-28 00:07:28 +09:00 |
|
Dean Herbert
|
f64afc738d
|
Fix incorrect exit block conditional
Resolves #2130.
|
2018-02-27 23:59:34 +09:00 |
|
Dean Herbert
|
84a8fbe0b3
|
Fix null ref
|
2018-02-27 21:26:06 +09:00 |
|
Dean Herbert
|
034875be47
|
Fix bindings not being unbound on ModSelect
Resolves #2018.
Closes #2079.
|
2018-02-27 20:45:32 +09:00 |
|
Dean Herbert
|
9b44f447ca
|
Fix song select iteration when all panels are filtered
Resolves #2069.
|
2018-02-27 17:52:12 +09:00 |
|
Dean Herbert
|
cff17f1864
|
Update in line with inverse ShoudProcessClock default
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
8e78a7b114
|
Fix HUD using incorrect clock for time display
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
37d2a2c3cc
|
Rename clock types to match across classes
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
3d52ead213
|
Rename sourceClock
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
fee258f2f2
|
Rework PauseContainer to better pause
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
d4f1723ae6
|
Remove unnecessary secondary argument from HUDOverlay
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
0635ae2293
|
Include missing offset
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
9c0dfb7c8c
|
Avoid creating an extra framed clock in SkipButton
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
73fb185132
|
Change the way ShouldProcessClock is specified in line with framework changes
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
d2f98642a1
|
Merge branch 'master' into confine-mode-reset
|
2018-02-26 20:59:53 +09:00 |
|
Dean Herbert
|
bdd88303b3
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-26 17:53:50 +09:00 |
|
naoey
|
a77d1eedae
|
Fix achievements parsing and add badges to recent activity.
|
2018-02-26 13:08:12 +05:30 |
|
naoey
|
a20e4bc2c3
|
Fix typos and missing fields in JSON mappings.
|
2018-02-26 11:46:16 +05:30 |
|
Dean Herbert
|
9cbed461c4
|
Merge branch 'master' into sliderbody-rework
|
2018-02-26 15:00:18 +09:00 |
|
naoey
|
5724618b2a
|
Add license headers and sanitise open profile argument.
|
2018-02-26 09:58:11 +05:30 |
|
naoey
|
1ad45b0941
|
R# fixes.
|
2018-02-26 01:21:31 +05:30 |
|
naoey
|
75fdca928e
|
Handle links correctly and don't re-open profile if the user is same.
|
2018-02-26 01:21:29 +05:30 |
|
naoey
|
bb40919f9c
|
Add link handling to recent activities.
- Add a show user action to link handling
|
2018-02-26 01:21:27 +05:30 |
|
naoey
|
7e4bd36391
|
Create drawable and add response to profile.
- Add missing JSON fields to response model
- Add missing enum value
|
2018-02-26 01:21:24 +05:30 |
|
naoey
|
e3a1b07172
|
Create API request and reponse model.
|
2018-02-26 01:21:16 +05:30 |
|
Dean Herbert
|
ab9aed351f
|
Remove null channels from SkinnableSound playable channels
|
2018-02-25 17:14:35 +09:00 |
|
Dean Herbert
|
4a52df2dd4
|
Apply review
|
2018-02-24 23:07:02 +09:00 |
|
Dean Herbert
|
768e0a4e2a
|
Add SkinnableSound class
Tidy things up, move logic out of SampleInfo.
|
2018-02-24 22:47:14 +09:00 |
|
Dean Herbert
|
a312fb365a
|
Merge remote-tracking branch 'ppy/master' into skinning-basics
|
2018-02-24 22:41:17 +09:00 |
|
V.Kalyuzhny
|
ef6b207c7e
|
Fix file case
|
2018-02-24 14:18:53 +02:00 |
|
smoogipoo
|
066abfbdbc
|
Rename PositionAt -> CurvePositionAt to represent its new meaning
|
2018-02-24 02:43:36 +09:00 |
|
smoogipoo
|
8c90abe0dc
|
Make slider control points relative to start position
|
2018-02-23 20:59:27 +09:00 |
|
smoogipoo
|
278b25bcbd
|
Fix border being the wrong size
|
2018-02-23 15:29:56 +09:00 |
|
smoogipoo
|
d72290ee24
|
Make ScaledContainer private
|
2018-02-23 15:06:08 +09:00 |
|
Dean Herbert
|
a36986ef5a
|
Make ComponentName readonly
|
2018-02-23 14:28:57 +09:00 |
|
Dean Herbert
|
0e20c4e6bb
|
Fix typo
|
2018-02-23 14:27:53 +09:00 |
|
Dean Herbert
|
ff75cf6b75
|
Remove unnecessary braces
|
2018-02-23 14:27:39 +09:00 |
|
Dean Herbert
|
f81eb2de65
|
Remove unnecessary local store
|
2018-02-23 14:24:32 +09:00 |
|
Dean Herbert
|
c0d983bbdf
|
Merge branch 'master' into PlayerBase
|
2018-02-23 13:51:11 +09:00 |
|
Dean Herbert
|
92d20eea8c
|
Add missing licence header
|
2018-02-23 13:38:12 +09:00 |
|
Dean Herbert
|
6ceabfe19e
|
Add basic hitsound skinning
|
2018-02-23 13:38:12 +09:00 |
|
Dean Herbert
|
84b707f4f8
|
Add basic hitcircle skinning
|
2018-02-23 13:38:12 +09:00 |
|
Dean Herbert
|
3726db53b5
|
Allow instantiation of skins
|
2018-02-23 13:38:12 +09:00 |
|
Dean Herbert
|
e9c5834387
|
Add query method for now
|
2018-02-23 13:26:01 +09:00 |
|
Dean Herbert
|
72fcbfe12b
|
Merge remote-tracking branch 'upstream/master' into editor-hitobject-overlays
|
2018-02-23 12:37:30 +09:00 |
|
Dean Herbert
|
402d71a8d9
|
Add user skin setting storage
|
2018-02-22 16:29:05 +09:00 |
|
Dean Herbert
|
659cf629b6
|
Add skin seleciton dropdown to settings
|
2018-02-22 15:46:11 +09:00 |
|
Dean Herbert
|
2351b6ab26
|
Add migration
|
2018-02-22 15:46:11 +09:00 |
|
Dean Herbert
|
4c14b32783
|
Add basic skin database model layout and importing
|
2018-02-22 15:46:11 +09:00 |
|
Dean Herbert
|
c070c69522
|
Update framework
|
2018-02-22 15:01:53 +09:00 |
|
smoogipoo
|
0cdf6fa7e2
|
Make HitObjectOverlay into an OverlayContainer
|
2018-02-22 14:36:58 +09:00 |
|
Dean Herbert
|
871bcb4142
|
Merge branch 'master' into sign-in-edits
|
2018-02-22 14:35:29 +09:00 |
|
smoogipoo
|
45c579630d
|
Make selectionLayer handle input below object overlays
|
2018-02-22 14:34:37 +09:00 |
|
Dan Balasescu
|
6cc54a464c
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:25:27 +09:00 |
|
smoogipoo
|
07252254eb
|
Fix post-merge issues
|
2018-02-22 14:22:04 +09:00 |
|
Dean Herbert
|
ee9a45cc45
|
Merge branch 'master' into sign-in-edits
|
2018-02-22 14:18:49 +09:00 |
|
Dean Herbert
|
f2b3d9a0e8
|
Change some missed instances
|
2018-02-22 14:17:35 +09:00 |
|
smoogipoo
|
99e9eb81f2
|
Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays
|
2018-02-22 14:16:01 +09:00 |
|
Dean Herbert
|
a3336f2577
|
Merge branch 'master' into fix-editor-osu-scale
|
2018-02-22 14:14:41 +09:00 |
|
smoogipoo
|
ded2644df8
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:08:36 +09:00 |
|
Joseph Madamba
|
3d4bed462b
|
Reword sign in text
|
2018-02-21 20:54:47 -08:00 |
|
Dean Herbert
|
7c942eb592
|
Tidy up layer container logic
|
2018-02-22 13:42:36 +09:00 |
|
Dean Herbert
|
b74cfffc6f
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-22 13:19:39 +09:00 |
|
Dean Herbert
|
c84ded258f
|
Reset mouse confine mode on input setting reset hotkey
|
2018-02-22 10:08:56 +09:00 |
|
smoogipoo
|
5faec5c2f1
|
Add a separate property to control playfield area
|
2018-02-21 20:54:33 +09:00 |
|
smoogipoo
|
6757be2007
|
Fix incorrect RelativeChildSize in Catch
|
2018-02-21 20:15:51 +09:00 |
|
smoogipoo
|
f012cce668
|
Rewrite some xmldocs to make methods easier to understand
|
2018-02-21 17:33:22 +09:00 |
|
smoogipoo
|
4934ef7429
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-21 11:07:42 +09:00 |
|
smoogipoo
|
7fd7dc1538
|
Extract playfield scaling into a separate class
And make it more general.
|
2018-02-21 11:07:42 +09:00 |
|
Dean Herbert
|
ba10eb5e50
|
Merge branch 'master' into osu-rulesetcontainer-aspect
|
2018-02-21 10:13:44 +09:00 |
|
smoogipoo
|
7fe0989427
|
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
|
2018-02-20 23:51:47 +09:00 |
|
smoogipoo
|
ad2f556133
|
Add hitobject overlays to selected hitobjects
|
2018-02-20 18:01:45 +09:00 |
|
Dean Herbert
|
cce7855bf9
|
Merge branch 'master' into fix-selection-border-radius
|
2018-02-20 15:28:51 +09:00 |
|
smoogipoo
|
2a5bfdb4b8
|
Deselect hitobjects that are now not in the selection quad
|
2018-02-20 15:06:51 +09:00 |
|
smoogipoo
|
2f4925d031
|
Add some xmldocs
|
2018-02-20 15:06:14 +09:00 |
|
smoogipoo
|
285df52f43
|
Encapsulate logic for selecting/deselecting further
|
2018-02-20 14:54:45 +09:00 |
|
smoogipoo
|
995ecb7d94
|
Make selectedHitObjects into a HashSet for quick Contains checks
|
2018-02-20 14:48:35 +09:00 |
|
smoogipoo
|
87065a0b13
|
Rename + publicise DeselectAll
|
2018-02-20 14:38:57 +09:00 |
|
smoogipoo
|
423fe4eba8
|
Combine border radiuses of selection and capture boxes
|
2018-02-20 14:25:42 +09:00 |
|
Dan Balasescu
|
3d7f998c9b
|
Merge branch 'master' into osu-rulesetcontainer-aspect
|
2018-02-20 14:07:04 +09:00 |
|
smoogipoo
|
4da93e8f1d
|
Merge remote-tracking branch 'origin/master' into editor-hitobject-movement
|
2018-02-20 14:03:47 +09:00 |
|
smoogipoo
|
8f25a5da66
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-20 14:01:33 +09:00 |
|
smoogipoo
|
4a5cd6520c
|
Extract playfield scaling into a separate class
And make it more general.
|
2018-02-20 13:50:31 +09:00 |
|
Dean Herbert
|
835136aecb
|
Merge branch 'master' into api-interface
|
2018-02-20 09:33:53 +09:00 |
|
Dean Herbert
|
f41a40be15
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-19 17:59:50 +09:00 |
|
Dean Herbert
|
fae6ea1ee2
|
Merge branch 'master' into storyboard-improvements
|
2018-02-19 17:28:53 +09:00 |
|
smoogipoo
|
4898c321f8
|
Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement
|
2018-02-19 17:07:03 +09:00 |
|
smoogipoo
|
b7be162f28
|
Remove AspectAdjust property (override GetAspectAdjustedSize instead)
|
2018-02-19 17:05:10 +09:00 |
|
smoogipoo
|
cd2c9a9de6
|
Adjust xmldoc and rename to GetAspectAdjustedSize
|
2018-02-19 17:04:18 +09:00 |
|
Dean Herbert
|
d70d40e3b8
|
Add back forgotten score store to valid importers
|
2018-02-19 15:52:14 +09:00 |
|
Dan Balasescu
|
34f76a4136
|
Merge branch 'master' into storyboard-improvements
|
2018-02-19 15:40:09 +09:00 |
|