1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 23:02:56 +08:00
Commit Graph

96 Commits

Author SHA1 Message Date
smoogipooo
069a7a24ce Fix defaults not being set (keep in mind this will be changed in a later pullrequest). 2017-03-14 19:04:40 +09:00
smoogipooo
e52d5181f7 Fix a few visual tests failing. 2017-03-14 17:01:46 +09:00
smoogipooo
7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
smoogipooo
bbd81dbc47 Add license headers. 2017-03-14 13:02:42 +09:00
smoogipooo
f50e0bbf3c Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +09:00
smoogipooo
592e05a2c8 Better beatmap conversion model. 2017-03-12 00:34:21 +09:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
fc6bd386ea
Fix remaining usage of hit window constants. 2017-03-06 23:26:57 +09:00
Dean Herbert
c24a4f57d9
Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +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
56922b66be
Refactor sliders to have more central position/progress calculations. 2017-03-06 11:11:29 +09:00
Dean Herbert
1c5b918f9e Add osu! autoplay generation.
Doesn't work on complex sliders yet.
2017-03-05 17:46:00 +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
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09: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
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
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09: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
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
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