Dean Herbert
fc6bd386ea
Fix remaining usage of hit window constants.
2017-03-06 23:26:57 +09:00
Dean Herbert
b55a579d15
Fix typo.
2017-03-06 23:00:21 +09:00
Dean Herbert
c24a4f57d9
Raise errors on unnecessary using statements.
2017-03-06 19:15:47 +09:00
Dean Herbert
12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum.
2017-03-06 18:29:19 +09:00
Dean Herbert
45f500920c
Don't use Mods enum for handling incompatible mods.
2017-03-06 18:29:17 +09:00
Dean Herbert
610de4a34c
Only show replay cursor when replay input is present.
2017-03-06 15:24:00 +09:00
Dean Herbert
faf07ab51a
Use generics everywhere.
2017-03-06 13:59:11 +09:00
Dean Herbert
20fcb8848b
Move constants to base OsuHitObject representation.
2017-03-06 12:58:14 +09:00
Dean Herbert
910d9ccc00
Add proper slider following support to OsuAutoReplay.
2017-03-06 11:11:42 +09:00
Dean Herbert
56922b66be
Refactor sliders to have more central position/progress calculations.
2017-03-06 11:11:29 +09:00
Dean Herbert
cb002ce7af
General refactoring of OsuAutoReplay.
2017-03-06 10:10:29 +09:00
Dean Herbert
5b4424d4fa
CreateAutoplayReplay -> CreateAutoplayScore.
2017-03-06 10:06:14 +09:00
Dean Herbert
1c5b918f9e
Add osu! autoplay generation.
...
Doesn't work on complex sliders yet.
2017-03-05 17:46:00 +09:00
Dean Herbert
4e4408cd20
Merge branch 'master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
Thomas Müller
73fef85b12
Remove unnecessary usings
2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624
Use Color4Extensions from Framework and remove redundant Name
2017-03-04 19:42:37 +01:00
Dean Herbert
e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow
2017-03-04 23:28:39 +09:00
Thomas Müller
a2317e5a1e
Update usage of FillDirection
2017-03-04 11:00:17 +01:00
TheGui
e3c3806759
Fixed accuracy's counter first value change.
2017-03-04 04:48:32 -03:00
Dean Herbert
adb6f01e39
Create class hierarchy for Score/Replay storage.
2017-03-04 15:32:41 +09:00
Dean Herbert
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
Dean Herbert
4163569e57
Fix some license headers.
2017-03-02 18:45:20 +09:00
DrabWeb
482be9f451
Remove AvailableMods
2017-03-02 02:04:26 -04:00
DrabWeb
367d6d694c
Merge https://github.com/ppy/osu into mod-overlay
2017-03-02 01:44:18 -04:00
DrabWeb
1eee587c18
CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection
2017-03-02 01:07:28 -04:00
DrabWeb
6c680825ed
ModSections in Ruleset, fixed toolbar play mode changed not firing
2017-03-01 22:05:52 -04:00
DrabWeb
bb12463ae4
Working on better way to handle mods
2017-03-01 20:57:33 -04:00
Thomas Müller
4d28696479
FlowDirection -> FillDirection
2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465
Update framewörk
2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
Dean Herbert
58ae9e888d
Basic partial replay support.
2017-03-01 22:04:20 +09:00
Dean Herbert
f0e9ed4636
Fix regression in TrianglesPiece.
2017-03-01 11:56:14 +09:00
default0
03889e6ca6
Update References to FlowStrategies
...
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Dean Herbert
a22216d0b0
Update nuget packages.
2017-02-27 20:38:30 +09:00
Dean Herbert
47997c20ad
Weld -> BindWith.
2017-02-27 12:24:53 +09:00
default0
8d91519d59
Update usage of FlowContainer and its subclasses
2017-02-26 21:32:43 +01:00
Dean Herbert
c227eb1be5
Welded bindables.
2017-02-26 22:08:21 +09:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Thomas Müller
d150eb4450
Merge branch 'master' into better-star-counter
2017-02-24 19:37:04 +01:00
Thomas Müller
f7d985fe18
Fix and refactor star difficulty calculation boilerplate
...
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
Dean Herbert
564608fe52
Fix incorrect slider assert logic (and improve flow).
2017-02-24 18:31:05 +09:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Dean Herbert
735961977b
Improve feel of spinners.
2017-02-22 18:23:06 +09:00
Dean Herbert
00ddcb11b4
Fix sliders playing hitsound twice at end.
2017-02-22 13:51:40 +09:00
Thomas Müller
7a0cea332f
Add support for varying circle size
2017-02-19 18:21:45 +01:00
Thomas Müller
502ad4aa53
Fix incorrect naming scheme
2017-02-19 18:21:15 +01:00
Thomas Müller
417f146386
Add difficulty calculation
...
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Dean Herbert
1a31589abd
Add padding zeroes to score display (and fix not being applied initially).
2017-02-18 17:35:37 +09:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes.
2017-02-18 17:35:04 +09:00
Dean Herbert
94dd268fd2
Move constant for default ControlPoint out of Slider.
2017-02-18 15:54:16 +09:00
Dean Herbert
0b922365bb
Fix nullref due to missing controlPoints.
2017-02-17 15:27:48 +09:00
Dean Herbert
aaed714160
Adjust Explode alpha slightly.
2017-02-16 22:48:47 +09:00
Dean Herbert
53e40804ab
Move other score components to centre alignment (and switch font).
2017-02-16 22:44:41 +09:00
Nabile Rahmani
9c4bb82dd6
Merged upstream/master.
2017-02-16 13:23:11 +01:00
Nabile Rahmani
3068fa1a62
Namespace does not correspond to file location.
2017-02-16 11:30:31 +01:00
Dean Herbert
b55d85a5c5
Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects.
2017-02-16 17:33:13 +09:00
Dean Herbert
8bf3902cbd
Add the concept of nested DrawableHitObjects.
...
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00
Dean Herbert
2640c2ac43
Add tick sample.
2017-02-16 13:39:01 +09:00
Dean Herbert
19eb58e724
Fix namespace.
2017-02-16 13:37:08 +09:00
Dean Herbert
97b782128e
Adjust tick appear/disappear animations.
2017-02-16 13:33:59 +09:00
Dean Herbert
6c9fe544b2
Handle case where TickDistance is zero (don't draw ticks).
2017-02-16 13:20:30 +09:00
Dean Herbert
23677a309f
Merge branch 'master' into slider_ticks
2017-02-16 11:06:23 +09:00
Damnae
f1535363f4
Rename SliderTicksRenderer to SliderTicksLayer.
2017-02-15 19:06:54 +01:00
Damnae
b7fca88b4f
Clearer slider Velocity and TickDistance calculations.
2017-02-15 18:55:49 +01:00
Dean Herbert
31a617363a
Improve the feel of spinners.
2017-02-15 23:24:08 +09:00
Dean Herbert
7fbc5990d1
Add combo numbers.
2017-02-15 23:23:55 +09:00
Dean Herbert
bab219c428
Fix SliderBall weirdness (not correctly staying circular).
...
Also adjusts tracking to only change during sldier active time.
2017-02-15 21:51:16 +09:00
Dean Herbert
67105e6dfd
Replace all usage of SpriteText with OsuSpriteText.
2017-02-15 21:37:43 +09:00
Dean Herbert
ce859196d5
Avoid glow fading out early on spinners.
2017-02-15 21:05:46 +09:00
Dean Herbert
12e265a3e2
Combine triangle system implementations.
2017-02-15 20:39:10 +09:00
Damnae
e2fae24ad5
Merge branch 'master' into slider_ticks
...
Conflicts:
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
osu.Game.Modes.Osu/Objects/Slider.cs
2017-02-15 10:53:42 +01:00
Dean Herbert
f2b0fd4de0
Throw exception on unknown hitobject.
2017-02-15 11:37:23 +09:00
Dean Herbert
10dfe47638
Add spinners and improve TestCaseHitObjects.
2017-02-15 01:23:20 +09:00
Dean Herbert
396c8121d3
Better slider defaults.
2017-02-15 01:23:19 +09:00
Dean Herbert
e88d02d3c4
Ensure SliderCurve is assigned Calculated before used.
2017-02-15 01:23:19 +09:00
Dean Herbert
fc192906ea
Handle proxied approach layer better and add slider's approach circle (previously missing).
2017-02-15 01:23:19 +09:00
Dean Herbert
9a5ac64332
Make HitObjectType more accessible.
...
# Conflicts:
# osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
2017-02-15 01:23:19 +09:00
Damnae
ace7a1d009
Fix slider ticks expiring before scoring happens.
2017-02-14 16:12:35 +01:00
Damnae
9f890139d4
Cache drawable ticks.
2017-02-14 15:16:18 +01:00
Damnae
3e7208c8a4
Add slider ticks.
2017-02-14 11:26:24 +01:00
Dean Herbert
f207da6041
Add/update license headers.
2017-02-14 18:17:35 +09:00
Dean Herbert
343e48c195
Merge branch 'master' into followpoints
2017-02-13 22:23:57 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Damnae
daa14bfec8
Replace AddConnections by a HitObjects property.
2017-02-12 08:47:07 +01:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors
2017-02-12 02:32:11 -05:00
Damnae
de2791e179
Better looking follow points.
2017-02-12 08:22:13 +01:00
Damnae
d7be9539d1
Create connections from HitObjects instead of DrawableHitObjects.
2017-02-12 07:29:36 +01:00
Damnae
4162ef72d4
Remove start/end index.
2017-02-12 06:02:45 +01:00
Damnae
ec64455573
Add xml-doc.
2017-02-10 10:28:21 +01:00
Damnae
6f37c02868
Fix followpoints needing a DelayReset.
2017-02-10 10:07:52 +01:00
Damnae
4e6b6ab794
Abstract follow points into a separate class.
2017-02-10 08:10:24 +01:00
Damnae
77ee161be8
Add follow points.
2017-02-10 06:19:59 +01:00
Andrey Zavadskiy
e06aa44c4c
Warning Fixes
2017-02-09 16:18:08 +03:00
Damnae
07c0057fab
Update GetPathToProgress's xml-doc.
2017-02-09 08:57:28 +01:00
Damnae
a79fde897b
Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset.
2017-02-09 08:29:21 +01:00
Damnae
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing.
2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Dean Herbert
9b9ed32245
Remove all @2x references, updates resource and framework.
2017-02-06 22:19:47 +09:00
Thomas Müller
8271b139e9
Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
2017-02-05 09:40:58 +01:00
Dean Herbert
7ce5fc08ee
Merge branch 'master' into skip-button
...
# Conflicts:
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
Dean Herbert
2ed5cf7c91
Hook up icons better.
2017-01-30 13:35:40 +09:00
Dean Herbert
e93f60396f
Add the ability for individual game modes to report statistics for display at song select.
2017-01-30 13:12:30 +09:00
Dean Herbert
3e7503e860
Make skip button work.
2017-01-27 21:57:22 +09:00
Dean Herbert
1d24ad3db6
osu! mode starts with health being full.
2017-01-27 00:41:34 +09:00
Dean Herbert
3a27178bb1
Merge pull request #289 from UselessToucan/JudgementsCapacity
...
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00
TocoToucan
badc8def9a
hitObjectsNumber -> hitObjectCount
2017-01-18 18:51:38 +03:00
TocoToucan
259c0964fd
Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations
2017-01-16 23:14:35 +03:00
Dean Herbert
1392cdfb9a
Hook up naively.
2017-01-10 18:35:27 +08:00
Dean Herbert
8ba5c1c15d
Fix not being able to hit two stacked circles by pressing both buttons/keys on the same frame.
2017-01-08 20:52:19 +08:00
Thomas Müller
f13303c86c
Do not lengthen slider curves according to the length prescribed in the .osu file for now.
...
This fixes some issues with the map http://osu.ppy.sh/s/484689 . There is still one problem with an almost stationary slider in this map at around the 2/3 mark, but the rest seems to work fine now.
2016-12-17 08:44:58 +01:00
Dean Herbert
ec7bbd231f
Make flash animation last slightly longer.
2016-12-15 22:58:30 +09:00
Dean Herbert
0a9e3ce1b0
Don't handle input in triangle particle effect containers.
2016-12-15 22:58:19 +09:00
Dean Herbert
db5c2efa15
Rename tracking variable and change conditional as per feedback.
2016-12-13 18:12:35 +09:00
Dean Herbert
c420c55291
Merge branch 'master' into hit-samples
...
# Conflicts:
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
2016-12-13 17:57:24 +09:00
Dean Herbert
cc79a183db
Merge pull request #235 from Tom94/circular-sliders
...
Circular sliders
2016-12-11 20:06:27 +09:00
Thomas Müller
eef697d842
Wire up CircleSize to hitobjects.
...
Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.
2016-12-11 10:11:22 +01:00
Thomas Müller
2ced0a48e0
Update framework.
2016-12-10 14:37:00 +01:00
Thomas Müller
38968ad6d2
Add circular arc approximator for "perfect" sliders.
2016-12-09 18:04:02 +01:00
Thomas Müller
359cb5ac6a
Make bezier approximator slightly more correct (without affecting its behaviour).
2016-12-09 18:03:17 +01:00
Dean Herbert
8329022a2e
Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples
2016-12-08 21:41:02 +09:00
Dean Herbert
40ea6e0d72
Fix incorrect folder name.
2016-12-08 21:36:34 +09:00
