Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
smoogipooo
0739a76497
Make the playfield work in TestCaseGamefield.
2017-05-11 20:04:45 +09:00
Dean Herbert
70ef503403
Merge branch 'master' into metadata
2017-05-11 12:23:00 +09:00
Huo Yaoyuan
01616cc27c
Avoid extra MemoryStream in ArchiveReader.
2017-05-08 19:41:22 +08:00
Huo Yaoyuan
dff05bec79
Use readonly fields.
2017-05-08 18:56:04 +08:00
Huo Yaoyuan
4c26a02e99
Remove unnecessary arguments in WorkingBeatmap's constructor.
2017-05-08 16:42:53 +08:00
Huo Yaoyuan
146d57953d
Use metadata field of WorkingBeatmap.
2017-05-06 14:57:11 +08:00
Huo Yaoyuan
4f49151984
Make metadata a member of WorkingBeatmap.
2017-05-06 14:52:28 +08:00
Dean Herbert
003cf53441
Streamline panel selection event logic.
...
Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.
2017-04-28 20:43:42 +09:00
Dean Herbert
28375ed1fc
Allow transfer of previously loaded background between WorkingBeatmaps
2017-04-28 15:03:07 +09:00
smoogipooo
c95a6fbd09
Use single line for GetUnicodePreference.
2017-04-28 14:14:14 +09:00
Huo Yaoyuan
4cb18361c1
Use localisation engine for unicode text.
2017-04-26 19:50:38 +08:00
smoogipooo
d9dec9d444
Implement Taiko difficulty calculation.
2017-04-26 15:50:08 +09:00
Dean Herbert
43d09a9734
CI fixes
2017-04-24 20:31:25 +09:00
Dean Herbert
c7b789424b
Update BeatmapInfoWedge design
...
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
2017-04-24 20:19:44 +09:00
Dean Herbert
ba2db75890
Merge branch 'master' into nodal-hit-sounds
2017-04-24 14:14:33 +09:00
ColdVolcano
4b69477531
Trim whitespace
2017-04-23 00:41:15 -05:00
ColdVolcano
1d254f4a56
Take MusicController back to life
2017-04-23 00:13:58 -05:00
Dan Balasescu
6fb8676215
Merge branch 'master' into nodal-hit-sounds
2017-04-22 22:11:19 +09:00
smoogipooo
2af9bf1423
Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects.
2017-04-22 21:33:11 +09:00
Dean Herbert
3345ba180f
Update with framework rename.
2017-04-21 19:26:32 +09:00
Dean Herbert
3f832731c9
Add DoubleTime, HalfTime and Nightcore support.
2017-04-21 17:33:37 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
smoogipooo
27ddf4b475
Refactor beatmap converters.
2017-04-18 14:31:06 +09:00
smoogipooo
efc050a95a
Make IBeatmapConverter an abstract class instead of an interface.
2017-04-18 09:38:52 +09:00
smoogipooo
456aee63ca
Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace.
2017-04-18 09:36:08 +09:00
smoogipooo
c61e3265bb
A few xmldoc additions/fixes.
2017-04-18 09:20:38 +09:00
smoogipooo
786446354e
Fix post-rebase errors.
2017-04-18 09:00:53 +09:00
smoogipooo
04973ae65e
Fix conversion types for Catch and Mania.
2017-04-18 08:58:21 +09:00
smoogipooo
09208adf81
Re-implement legacy hit object conversion.
2017-04-18 08:58:21 +09:00
smoogipooo
2767fbd81a
Implement Beatmap conversion testing.
2017-04-18 08:57:09 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases.
2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
Dean Herbert
83b083ce64
Move SQLite connections out of database classes; make abstract Database.
2017-04-17 14:37:52 +09:00
smoogipooo
ddce3c157f
Clean up a few remaining stragglers.
2017-04-15 06:15:55 +09:00
smoogipooo
0333e1a050
Remove unused usings.
2017-04-15 05:57:18 +09:00
smoogipooo
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
smoogipooo
a89af273be
Make BeatmapInfo expose Ruleset instead of PlayMode.
2017-04-15 05:01:36 +09:00
smoogipooo
59bfc7abad
Move statics to RulesetCollection to avoid conflicts later on.
2017-04-15 04:53:37 +09:00
Huo Yaoyuan
411988f038
Remove all trailing whitespaces in this repo.
2017-04-06 16:21:18 +08:00
Huo Yaoyuan
9b1e010dcc
Fix filename mismatch.
2017-04-06 16:05:41 +08:00
Dean Herbert
1942ef9e8f
Fix merge fail.
2017-04-06 16:06:02 +09:00
Dean Herbert
4783d17d94
Merge branch 'master' into better-hitsounds
2017-04-06 16:00:56 +09:00
Dean Herbert
c50960af63
Add better defaults for ControlPoint.
2017-04-06 13:15:12 +09:00
smoogipooo
982dbb5bba
Cleanup + bow down to resharper.
2017-04-06 12:27:35 +09:00
smoogipooo
c65ab5b6f1
General cleanup.
2017-04-06 11:56:19 +09:00
smoogipooo
eb82a4c090
Back to using SampleInfo + fix taiko beatmap conversion.
2017-04-06 11:41:16 +09:00
smoogipooo
e903241c7b
Implement sample + addition sample reading from hit objects.
2017-04-06 09:43:47 +09:00
smoogipooo
1ef465716d
Proper legacy timing point parsing.
2017-04-05 21:59:40 +09:00
smoogipooo
d607207b69
Ability to contain multiple sample banks. Get default bank name from control point.
2017-04-05 21:59:07 +09:00
smoogipooo
2d8239a3f7
Re-implement the SampleBank/Sample structure. No parsing support yet.
2017-04-05 21:34:28 +09:00
Dean Herbert
6a922da87e
Move legacy_velocity_multiplier application to LegacyTimingInfo.
2017-04-05 12:05:48 +09:00
smoogipooo
1d4a371ded
A few general fixes.
2017-04-04 14:38:50 +09:00
smoogipooo
5e67bcb581
Remove a few unused classes.
2017-04-04 13:14:45 +09:00
smoogipooo
4b424263ce
Fully parse control points.
2017-04-04 13:13:27 +09:00
Dean Herbert
7c74951454
Update bindables.
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseResults.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
smoogipooo
2e80ecfda8
Don't need explicit null value.
2017-04-03 20:33:10 +09:00
smoogipooo
19b5555ef2
Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.
2017-04-03 20:26:46 +09:00
smoogipooo
74bd427997
Remove SliderVelocityAt, compute it manually inside hit objects.
2017-04-03 14:12:15 +09:00
smoogipooo
ffe4d0ae4a
Remove BeatDistanceAt (does not express distance) and BeatVelocityAt.
2017-04-03 11:48:42 +09:00
smoogipooo
f1b0a12ee3
Rename BPMMultiplierAt -> SpeedMultiplierAt.
2017-04-03 11:48:15 +09:00
Dean Herbert
bfa2e68bfb
Container->Wrapper.
2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Dean Herbert
a6c8be3637
Increase load delay on panel backgrounds; add back missing fade.
2017-03-29 19:52:16 +09:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places.
2017-03-28 15:28:58 +09:00
Dean Herbert
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
Drew DeVault
267238dc27
Simplify derived classes of WorkingBeatmap
2017-03-22 06:15:32 -04:00
Drew DeVault
cc2b4c5c5b
Refactor WorkingBeatmap
...
Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
2017-03-22 05:57:08 -04:00
smoogipooo
a272675705
Parse time signature from legacy beatmap control points.
2017-03-21 21:18:08 +09:00
Dean Herbert
6c12da54f1
Merge pull request #499 from smoogipooo/legacy_beatmap_flag
...
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
Dean Herbert
7337cb5f62
Merge branch 'master' into taiko_hitobject_base
2017-03-19 11:37:39 +09:00
smoogipooo
b68b017a49
What even was this lol.
2017-03-18 18:38:51 +09:00
smoogipooo
26b0bb02d8
Remove IIsLegacy, expose LegacyBeatmap without a public constructor.
2017-03-18 18:32:54 +09:00
Dan Balasescu
cd30958086
Merge branch 'master' into song-select-loading-reoptimisation
2017-03-18 01:25:22 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.
2017-03-17 19:54:51 +09:00
Dean Herbert
ba73968303
Load whole panel background in async.
2017-03-17 18:28:21 +09:00
smoogipooo
74a1837a05
Fix nullref.
2017-03-17 14:56:50 +09:00
Dean Herbert
2abcdbf4df
Fix potentially incorrect states being applied to panels on first display.
2017-03-17 14:56:12 +09:00
smoogipooo
67c9bb37fd
Add license headers.
2017-03-17 14:51:09 +09:00
smoogipooo
862c4c408f
Add legacy beatmap flag.
2017-03-17 14:24:46 +09:00
smoogipooo
8479880d44
Move SliderVelocityAt into TimingInfo, fix xmldoc.
2017-03-17 13:33:39 +09:00
smoogipooo
a06c195e1f
Add reading of KiaiMode/OmitFirstBarLine from legacy control points.
2017-03-17 13:23:39 +09:00
Dean Herbert
cd98af29c4
Only calculate difficulties on import for now.
2017-03-17 11:53:13 +09:00
smoogipooo
0c47638820
Better hit object defaults setting.
2017-03-17 00:36:09 +09:00
smoogipooo
e0a8c3b1e5
Rename BaseDifficulty -> Difficulty / BeatmapDifficulty.
2017-03-16 23:18:02 +09:00
smoogipooo
5137338c7c
Replace List<ControlPoint> with TimingInfo in Beatmap.
2017-03-16 17:11:24 +09:00
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
d6ccc66b23
Attempt to fix nullref warning.
2017-03-14 17:46:35 +09:00
smoogipooo
2b3b3b7255
Fix license headers (sorry I have to do this as post-processing for now cos VS 2017...).
2017-03-14 17:07:38 +09:00
smoogipooo
7141bc86d3
Rework beatmap post-processing into HitRenderer.
2017-03-14 17:01:21 +09:00
smoogipooo
e42c790df2
Refactorings.
2017-03-14 15:45:27 +09:00
smoogipooo
072eea82ea
Fix up combo colours + a few nullrefs.
2017-03-14 14:50:12 +09:00
smoogipooo
854212a7aa
Merge branch 'master' into beatmap_parsing
...
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
smoogipooo
99c23d8715
I don't like this renaming.
2017-03-14 12:54:09 +09:00
Dan Balasescu
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
Dean Herbert
ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
...
This reverts commit 6f20473e65c76a495d3d
2017-03-14 11:46:34 +09:00
Dean Herbert
b2981fb729
Merge branch 'master' into mod_application
2017-03-13 22:15:26 +09:00
Alex Amadori
c84a9d56f5
Fix namespace, comply with naming rules
2017-03-13 11:36:21 +01:00
Alex Amadori
caa6e9c82b
General improvements
2017-03-13 11:29:24 +01: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
Alex Amadori
971d8eb7c5
Merge remote-tracking branch 'upstream/master' into archive-reader
2017-03-13 10:56:31 +01:00
smoogipooo
c0e29652a6
Initial attempt at making mods apply better.
2017-03-12 22:13:43 +09:00
smoogipooo
3480dca0ad
Remove PlayMode enum requirement. Clean things up a lot.
2017-03-12 14:32:50 +09:00
smoogipooo
b0ea282a06
Fix map would always be converted to itself when actually converting to a different game mode.
2017-03-12 02:26:10 +09:00
smoogipooo
1c7a9e3a07
General fixups.
2017-03-12 01:26:07 +09:00
smoogipooo
77a4a896c9
Cleanups.
2017-03-12 01:08:34 +09:00
smoogipooo
592e05a2c8
Better beatmap conversion model.
2017-03-12 00:34:21 +09:00
Alex Amadori
faecaa297a
Fix warnings
2017-03-09 21:07:21 +01:00
Alex Amadori
9f40a888ec
Update BeatmapArchiveReader's test
2017-03-08 21:55:38 +01:00
Alex Amadori
2c7a9d2f77
Remove unnecessary using
2017-03-07 08:47:50 +01:00
Alex Amadori
309019aab3
Merge remote tracking branch 'upstream/master' into archive-reader
2017-03-07 08:41:44 +01: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
Dan Balasescu
bc74f453aa
Merge branch 'master' into replay
2017-03-07 11:41:16 +09:00
Alex Amadori
aee7b05bae
ArchiveManager decoupling
2017-03-07 00:10:33 +01:00
Alex Amadori
fd53d10264
Refactor ArchiveReader for extensibility
2017-03-06 23:56:08 +01:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome.
2017-03-06 17:06:48 +09:00
Dean Herbert
2de25c23b4
Make Mods IEnumerable.
2017-03-06 15:20:55 +09:00
Dean Herbert
76ef8c1a6c
Add bindable mods and autoplay support.
2017-03-06 14:52:37 +09:00
Dean Herbert
1ea21daa91
Fix PlayMode regression.
2017-03-06 14:25:38 +09:00
Dean Herbert
3b0445a244
Improve comment for PreferredPlayMode and allow null.
2017-03-06 14:08:58 +09:00
Dean Herbert
7afcac3660
Move PreferredPlayMode to WorkingBeatmap.
2017-03-05 17:45:40 +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
Dean Herbert
00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers).
2017-03-04 23:24:13 +09:00
Thomas Müller
a2317e5a1e
Update usage of FillDirection
2017-03-04 11:00:17 +01:00
Thomas Müller
a97a7f1024
No more custom lifetimelist in CarouselContainer
2017-03-04 08:54:14 +01:00
Thomas Müller
c732890664
Remove usages of negative Margin / Padding
...
Replaces such usage with more sensible settings, like changing the
position or size.
2017-03-02 19:16:31 +01: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
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes
2017-02-28 13:49:19 +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
Andrey Zavadskiy
3487dfe236
Removed unused variables and parameters
2017-02-27 17:32:32 +03:00
Dean Herbert
afdb95f4d5
Fix even more test regressions.
2017-02-27 20:39:04 +09:00
Dean Herbert
777f673a46
Fix more test regressions.
2017-02-27 19:48:48 +09:00
Dean Herbert
47997c20ad
Weld -> BindWith.
2017-02-27 12:24:53 +09:00
default0
0d1dec665a
Set StarDifficulty to -1 for invalid beatmaps
...
The StarDifficulty calculation in a BeatmapGroup would not properly deal
with Beatmaps that cannot be loaded and thus cause a
NullReferenceException when trying to work with them, instead of
assigning a StarDifficulty of -1 to signify that the map is invalid.
2017-02-26 21:57:19 +01: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
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
12db33ad4b
Visual and readability improvements to StarCounter.
2017-02-24 19:30:56 +09:00
Dean Herbert
3a89348413
Centralise access to WorkingBeatmaps.
...
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
2017-02-24 13:43:21 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings
2017-02-24 11:29:34 +09:00
Thomas Müller
9e8fb698c6
Remove incorrectly shadowed variable
2017-02-23 22:33:07 +01:00
Thomas Müller
2689de0c0c
Update framework and add "Async" suffix to asynchronous methods
2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Dean Herbert
6701cd9016
Merge branch 'master' into general-fixes
2017-02-23 17:04:53 +09:00
Dean Herbert
f812641696
Merge pull request #383 from peppy/player-loading-screen
...
Add loading screen.
2017-02-23 17:04:44 +09:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
Dean Herbert
d19a7813f3
Fix TestCasePlayer regression.
2017-02-22 23:27:29 +09:00
Dean Herbert
c83d2bbe6e
Make panels fade in again.
2017-02-22 21:54:49 +09: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
Thomas Müller
ef775458dd
Fix compilation error introduced in merge conflict resolution.
2017-02-17 21:27:17 +01:00
Thomas Müller
1198705a6f
Merge branch 'master' of github.com:ppy/osu into general-fixes
...
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
2017-02-17 21:22:34 +01:00
Shadoxfix
7a45ea58b2
Add comment explaining why the branch is necessary
2017-02-17 18:17:18 +01:00
Shadoxfix
72306e8757
Fix beatmap import crash when the first timingPoint starts later than a slider
2017-02-17 17:36:00 +01:00
Dean Herbert
0b922365bb
Fix nullref due to missing controlPoints.
2017-02-17 15:27:48 +09:00
Damnae
b7fca88b4f
Clearer slider Velocity and TickDistance calculations.
2017-02-15 18:55:49 +01:00
Dean Herbert
11643d2e09
Remove unnecessary methods and local variables.
2017-02-13 18:30:51 +09:00
Dean Herbert
1aeb48b920
Merge remote-tracking branch 'upstream/master' into osb_loading
2017-02-13 18:22:29 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Thomas Müller
e3f35cd66e
Merge branch 'master' into osb_loading
2017-02-12 12:26:25 +01:00
Dean Herbert
37e75e9a54
Add null check when loading beatmap background.
2017-02-12 16:13:44 +09:00
Damnae
a504c73f33
Load beatmap data from an optional osb file.
2017-02-09 15:19:09 +01:00
Andrey Zavadskiy
e06aa44c4c
Warning Fixes
2017-02-09 16:18:08 +03: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
756fd78a88
Fix incorrect line endings.
2017-02-07 13:52:19 +09:00
Dean Herbert
57d97ba2e9
Make triangles look better in many cases.
2017-02-04 22:09:44 +09:00
Dean Herbert
16a01abc4d
Merge remote-tracking branch 'upstream/master' into options-refactor
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
Dean Herbert
aec84ae725
Fix laggy animations, incorrect hiding logic.
2017-02-02 19:24:14 +09:00
Drew DeVault
9f9245cee3
Fix use of previous value in Alpha check
...
Frustratingly, this does not fix the problem of ghost groups
2017-02-01 19:28:08 -05:00
Drew DeVault
3143e9d35e
Fix poorly written BeatmapGroup logic
2017-01-31 20:04:17 -05:00
Drew DeVault
0861eb79e4
Minor cleanups
2017-01-31 19:55:36 -05:00
Drew DeVault
637a99e8d0
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-31 19:00:50 -05:00
Dean Herbert
6b66ecc131
Global shadows and more sane font size setting.
2017-01-31 18:53:52 +09:00
Drew DeVault
5852657205
Refactor out Hidden
...
Also fixes a bug I didn't think about before
2017-01-30 22:35:09 -05:00
Drew DeVault
42a2285ef3
Make BeatmapGroup.Hidden more intelligent
2017-01-30 09:47:04 -05:00
Drew DeVault
c00a558cb7
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-30 09:35:14 -05:00
Dean Herbert
bdbe8501d3
Merge branch 'master' into add-flash-effects
...
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
Dean Herbert
f0d30cc873
Make triangles opaque.
2017-01-30 16:53:12 +09:00
Dean Herbert
9f90b57543
Move BPM calculations to Beatmap.
2017-01-30 16:03:45 +09:00
Dean Herbert
0272c4b559
Add StarDifficulty property and correct colouring of difficulty icons.
2017-01-30 15:26:28 +09:00
Dean Herbert
2ed5cf7c91
Hook up icons better.
2017-01-30 13:35:40 +09:00
Dean Herbert
3125fa89ee
Fix method which should be class.
2017-01-29 15:06:44 +09:00
Dean Herbert
77558abf58
Merge branch 'master' into more-beatmap-info
...
# Conflicts:
# osu.Game/Screens/Select/BeatmapInfoWedge.cs
2017-01-29 14:47:42 +09:00
Drew DeVault
10897486ba
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-27 15:41:46 -05:00
Drew DeVault
f3c5c1f0b8
Fixes following recent updates upstream
2017-01-26 21:31:28 -05:00
Dean Herbert
162e183b36
Fix some nullrefs when running visualtests with no maps loaded.
2017-01-27 00:16:02 +09:00
Drew DeVault
678f0aaa16
Implement filtering with strings
2017-01-17 19:18:15 -05:00
Dean Herbert
ee0b6be84b
Merge pull request #266 from kizayoi/master
...
Add support for old beatmaps
2017-01-16 16:02:22 +08:00
Drew DeVault
fa007e632d
Refactor colors to palette based design
2017-01-12 16:38:27 -05:00
Drew DeVault
70ecf48ca7
Add central color class
...
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.
Closes #126
2017-01-09 17:20:31 -05:00
柯十六夜
acfbf2e32e
Add prefix Online to BeatmapID and BeatmapSetID
2017-01-09 21:05:01 +08:00
柯十六夜
e578e50721
Add support for old beatmaps
2016-12-21 16:29:57 +08:00
Dean Herbert
1d5dc77c4d
Keep reference to reader to avoid early disposal.
2016-12-18 20:47:00 +09:00
Dean Herbert
f14a9e7d6b
Remove unused beatmap reference in BeatmapGroup.
2016-12-18 17:06:56 +09:00
Dean Herbert
5ac9402d5f
Adjust fade out transform of difficulty panels to avoid overlap.
2016-12-18 17:06:03 +09:00
Dean Herbert
6e10a9bb29
Allow starting maps by clicking an active panel a second time.
2016-12-18 16:59:13 +09:00
n4b3l
73532b9172
small code improvements
2016-12-17 19:57:58 +01:00
Dean Herbert
8ce18e8986
Improve song select startup time via better database querying. Also fix difficulty displays.
2016-12-15 22:58:32 +09:00
Dean Herbert
f356640cb7
Add missing licence headers.
2016-12-06 19:07:15 +09:00
Thomas Müller
a0131b8b25
Fix slider velocity not being applied.
2016-12-03 14:52:51 +01:00
Dean Herbert
11f958030f
Make Triangles more flexible and more random.
2016-12-01 18:53:13 +09:00
Thomas Müller
b12b82fdd3
Fix depth values.
2016-11-29 20:50:12 +01:00
Dean Herbert
a506e91b7c
Fix compile issues.
2016-11-28 23:05:05 +09:00
Dean Herbert
49470318f2
Remove silly static using statement.
2016-11-28 22:48:28 +09:00
Dean Herbert
187a8bbfa7
Don't store beatmap reference in hitobjects.
2016-11-28 18:45:50 +09:00
Dean Herbert
bf63be0602
Add better slider duration calculation using bpm and difficulty information.
2016-11-28 15:31:54 +09:00
Dean Herbert
a5651427f6
Add basic ControlPoint parsing.
2016-11-28 15:12:11 +09:00
Thomas Müller
724f849543
Fix incorrect BeatmapPanel border caused by triangles.
2016-11-27 11:49:51 +01:00
Dean Herbert
5764bf8093
Improve IsAlive logic.
2016-11-26 17:22:58 +09:00
Dean Herbert
a1c3d15e6c
Add triangles to difficulty panels.
2016-11-26 17:10:13 +09:00
Dean Herbert
e36a51acf0
Custom LifetimeList (experimental).
2016-11-25 18:30:13 +09:00
Dean Herbert
f540bf3765
Ensure set headers are above difficulties.
2016-11-25 12:48:59 +09:00
Dean Herbert
35a02aa972
Fade in headers but not difficulties by default.
2016-11-25 12:48:41 +09:00
Dean Herbert
12c74b1b0b
Don't set hidden; make it based on alpha value.
2016-11-25 12:47:58 +09:00
Dean Herbert
ece3bc0e01
Refactor BeatmapInfoWedge to be async.
2016-11-24 13:48:48 +09:00
Dean Herbert
611619fd9c
Fix some namespaces.
2016-11-23 12:00:17 +09:00
Thomas Müller
030a20a3f2
Fix minor issues with alpha fading at edges.
2016-11-22 21:58:46 +01:00
Thomas Müller
9bf23bc4ad
Only handle beatmap panels that are visible in song select.
2016-11-22 21:41:48 +01:00
Thomas Müller
2596e71494
Improve smooth movement in beatmap carousel.
2016-11-22 20:10:04 +01:00
Dean Herbert
4cf2dd90d6
Standardise and simplify the amount of beatmap information passed around song select.
2016-11-22 22:07:15 +09:00
Dean Herbert
b73cdba08c
Change the structure of BeatmapSetHeader to allow for bufferedcontainer invalidation.
2016-11-22 21:38:46 +09:00
Dean Herbert
3bc38268a0
Make MusicController more async.
2016-11-22 20:47:28 +09:00
Dean Herbert
f576b4bf82
Don't use texture atlases for beatmap backgrounds.
2016-11-22 20:14:58 +09:00
Dean Herbert
0109c79cae
Async load of panel backgrounds (failing for on-screen panels).
2016-11-22 19:48:51 +09:00
Dean Herbert
7df8324957
Explicit disposal via using() to WorkingBeatmap.
2016-11-22 14:57:53 +09:00
Dean Herbert
41a84ba00c
Add finalizer logic for WorkingBeatmap for now.
2016-11-21 21:35:10 +09:00
Thomas Müller
c6d688898f
Initial implementation of a beatmap carousell and various minor improvements to song select.
...
No big optimizations yet, but groundwork is laid out.
2016-11-20 20:34:16 +01:00
Dean Herbert
d3f810f72f
Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading).
2016-11-14 22:03:39 +09:00
Dean Herbert
06f4f93918
Move play modes to Modes namespace.
2016-11-14 18:03:20 +09:00
Dean Herbert
0f4538f69f
Rename GameModes namespace to Screens.
2016-11-14 17:23:33 +09:00
Huo Yaoyuan
7c8ef2a82b
Select and unselect BeatmapPanel when selecting BeatmapGroup.
2016-11-14 04:22:06 +08:00
Dean Herbert
cc0f61f545
Merge branch 'refs/heads/master' into dependency-injection
...
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Dean Herbert
18c0e431c1
Fix some nullrefs.
2016-11-12 18:25:58 +09:00
Drew DeVault
d49b418449
Implement ShowUnicode option behavior
2016-11-10 21:35:58 -05:00
Drew DeVault
fe9034323b
Get the game running, though not perfectly
2016-11-10 16:42:29 -05:00
Drew DeVault
ee24cd310c
Convert everything to DI pattern
2016-11-10 16:41:18 -05:00
Huo Yaoyuan
c59cad2478
AudioEquals method for BeatmapInfo.
2016-11-07 21:52:23 +08:00
Dean Herbert
f14a35d480
Update FontAwesome definitions.
2016-11-07 17:59:00 +09:00
Thomas Müller
103176826f
Ensure transformations are never used prior to being added to the Drawable tree.
2016-11-06 11:13:52 +01:00
Thomas Müller
32ee20b843
Merge branch 'master' of github.com:ppy/osu into better-clocks
...
# Conflicts:
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-06 10:08:24 +01:00
Thomas Müller
5f2bf165a2
Remove now obsolete clock usages.
2016-11-06 10:06:09 +01:00
Thomas Müller
a6c0fd29f2
Make use of new timing system in Drawables and Transforms.
2016-11-06 08:25:21 +01:00
Maciej
bcc1d7c669
Background scaling different approach
2016-11-06 04:37:41 +01:00
Maciej
c4132339a6
Working beatmap background scaling fix
...
Add a check for the working beatmap background width and assign a proper
scaling value to cover the whole box
2016-11-06 04:12:35 +01:00
Dean Herbert
3c8f94dd0f
Merge pull request #136 from Tom94/general-fixes
...
Fix wrong initial state of beatmap panels.
2016-11-05 23:04:37 +09:00
Thomas Müller
7c7e2160ec
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
2016-11-05 14:05:42 +01:00
Thomas Müller
619d97c642
Fix indentation and typo.
2016-11-05 13:51:52 +01:00
Thomas Müller
07e74068e7
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-05 13:35:15 +01:00
Huo Yaoyuan
e69dac7745
Fix lock object.
2016-11-05 20:21:08 +08:00
Huo Yaoyuan
f2b37e1fe7
Add lock on each property of WorkingBeatmap.
2016-11-05 20:01:46 +08:00
Thomas Müller
ba39a9df8e
Fix wrong initial state of beatmap panels.
2016-11-05 12:24:15 +01:00
Dean Herbert
a11d534067
Add beatmap backgrounds.
2016-11-05 20:00:14 +09:00
Dean Herbert
7cc19d74c6
Add full Exo font set and bring song select panels closer to final design.
2016-11-05 18:22:09 +09:00
Dean Herbert
8fe63689a4
Fix thread safety issue when accessing files in beatmap (zip) files.
2016-11-05 18:19:01 +09:00
Dean Herbert
2ee5e2efb7
Bring framework up-to-date.
...
# Conflicts:
# osu-framework
2016-11-05 18:18:52 +09:00
Dean Herbert
10f2ed4387
Add explicit privates.
2016-11-04 16:12:35 +09:00
Dean Herbert
b17d219ace
Share Triangles logic.
2016-11-04 16:11:22 +09:00
Dean Herbert
108b7092c9
Fix regression in hitcircle appearance.
2016-11-04 16:08:04 +09:00
Dean Herbert
9df43c6d33
Fix draw order of hitobjects.
2016-11-04 15:43:53 +09:00
Dean Herbert
da18e2d4f6
Fix off-by-one colour retrieval.
2016-11-04 15:43:53 +09:00
Dean Herbert
b72e9221fd
Only add valid hitobjects.
2016-11-04 15:43:53 +09:00
Dean Herbert
74c655ebfc
Fix input not working.
2016-11-04 15:43:53 +09:00
Dean Herbert
b40ccccbe4
Add HitObject colours back in the mix.
2016-11-04 15:43:53 +09:00
Dean Herbert
92b85b251e
Fix scale more.
2016-11-04 15:43:53 +09:00
Dean Herbert
e939746159
Fix scale ratio of gamefield.
2016-11-04 15:43:53 +09:00
Dean Herbert
f5f5aa9eac
Fix some incorrect default values.
2016-11-04 15:43:53 +09:00
Dean Herbert
a4e2f25065
Flush recursively, more transform tidying.
2016-11-04 15:43:53 +09:00
Dean Herbert
1854160321
Add hit time and the ability for an external operator to block hits.
2016-11-04 15:43:53 +09:00
Dean Herbert
fbaae94ba4
Limit state changes to apply only once.
2016-11-04 15:43:53 +09:00
Dean Herbert
8d4e7038b3
Part -> Layer.
2016-11-04 15:43:53 +09:00
Dean Herbert
bc53642cab
Fix some warnings.
2016-11-04 15:40:05 +09:00
Dean Herbert
439204b4fa
Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow
2016-11-03 16:44:49 +09:00
Dean Herbert
54dbb0a355
Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow
...
# Conflicts:
# osu.Game/Beatmaps/Drawable/Panel.cs
2016-11-02 16:43:35 +09:00
Dean Herbert
617a3f5c4f
Adjust glow colour slightly.
2016-11-02 10:22:46 +09:00
Thomas Müller
50de8528a5
Use better glow in beatmap selection.
2016-11-01 22:57:11 +01:00
Thomas Müller
128ec8f767
Fix beatmap panel border alpha being way too large.
2016-11-01 22:21:09 +01:00
Dean Herbert
b86f308af6
Add async workflow.
2016-11-01 23:24:14 +09:00
Dean Herbert
d47924ff7b
Fix selection not collapsing when clicking set headers exclusively.
2016-10-29 03:43:52 +09:00
Dean Herbert
eb30882b09
More comments.
2016-10-28 23:40:12 +09:00
Dean Herbert
42ad96778e
Tidy shit up; reduce number of unnecssesary events being fired.
2016-10-28 23:29:21 +09:00
Dean Herbert
5dc495e41d
Avoid accessing the beatmap too early.
2016-10-28 21:08:32 +09:00
Dean Herbert
10ef34b805
Lazy parse beatmap; Don't reload audio track if it hasn't changed.
2016-10-28 20:24:14 +09:00
Dean Herbert
74f1a9622f
Add initial game-wide beatmap flow.
2016-10-28 19:55:48 +09:00
Dean Herbert
209f09df91
Don't exception on inability to read audio track.
2016-10-28 18:03:26 +09:00
Dean Herbert
13b5fb0578
Update transforms to not accept clock.
2016-10-28 17:42:00 +09:00
Dean Herbert
856e056515
Remove unnecessary finaliser.
2016-10-28 14:18:00 +09:00
Dean Herbert
feccb7286c
Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.
2016-10-28 14:14:45 +09:00
Dean Herbert
2cdda98b47
Add the ability to retrieve (fallback) metadata from a beatmap.
2016-10-28 14:13:52 +09:00
Dean Herbert
d9dfc324c1
Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible.
2016-10-27 19:52:48 +09:00
Dean Herbert
456169f182
Move BeatmapGroupState to outside class definition.
2016-10-27 13:42:37 +09:00
Dean Herbert
abfad501b6
beatmapSet can be private.
2016-10-27 13:41:30 +09:00
Dean Herbert
ce73ae792f
Change panel selection logic to avoid looping.
2016-10-27 13:36:04 +09:00
Dean Herbert
ba5b2f2d73
Remove difficulty width offsets and tidy up flow of information.
2016-10-27 12:31:45 +09:00
Dean Herbert
f846505a92
Tidy namespaces.
2016-10-27 12:01:13 +09:00
Drew DeVault
55e5ec6fae
General cleanup per PR feedback
2016-10-26 10:52:40 -04:00
Drew DeVault
bc959f74a5
Add background textures to beatmap sets
...
Needs osu-framework#189
2016-10-24 11:39:18 -04:00
Drew DeVault
8d4a211419
Fix initialization of BeatmapInfo
2016-10-24 11:39:18 -04:00
Drew DeVault
641855c790
Fix issues with beatmap import file contention
2016-10-24 11:39:18 -04:00
Drew DeVault
d21b7f0050
Fix up song select based on upstream changes
2016-10-24 11:39:18 -04:00
Drew DeVault
674f624bfc
Improve song selection layout, database loading
...
Also adds event that notifes the song select when a beatmap is added.
2016-10-24 11:39:11 -04:00
Drew DeVault
a14edc06c8
Pull beatmap list from db and render simple list
2016-10-24 11:39:11 -04:00
Dean Herbert
808d5c75fb
Fix unused field warning.
2016-10-22 19:08:40 +09:00
Dean Herbert
43f0409893
Start to structure flow of information in Player.
...
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
Dean Herbert
94968a8b7c
Add initial implementation of osu! HitCircle.
2016-10-19 16:19:01 +09:00
Drew DeVault
7bdf1fe1bf
Drop BeatmapSet, only BeatmapSetInfo is necessary
2016-10-18 15:48:24 -04:00
Drew DeVault
105bba6178
Rework duplicate detection in AddBeatmap
2016-10-18 15:41:46 -04:00
Drew DeVault
449f04c07b
Refactor the database code
2016-10-18 13:38:27 -04:00
Dean Herbert
123d92f5b9
Merge pull request #71 from huoyaoyuan/tidy-up
...
Strongly type specifications
2016-10-14 18:57:42 +09:00
John Leuenhagen
fedfb8a22a
Converted all .cs files to use CRLF line endings.
2016-10-13 23:33:58 -04:00
Drew DeVault
25d08c8e2c
Improve beatmap loading and hydration
2016-10-13 10:29:30 -04:00
Drew DeVault
fd10e6e582
Copy imported beatmaps into beatmap storage
2016-10-13 10:15:08 -04:00
Huo Yaoyuan
80d5fa7243
Specify HitObjectConvertException.
2016-10-13 20:53:42 +08:00
Dean Herbert
fde3ab420a
Merge branch 'master'
...
Conflicts:
osu.Game/osu.Game.csproj
2016-10-13 12:23:36 +09:00
Dean Herbert
edd8f3871e
Add TODO regarding parsing.
2016-10-13 12:19:20 +09:00
Drew DeVault
deff5ad61e
Use @strings where appropriate
2016-10-13 12:19:10 +09:00
Drew DeVault
dd86e75ea7
Minor fixes
2016-10-13 12:19:06 +09:00
Drew DeVault
45c0bc5428
Import beatmaps into the database via IPC
2016-10-13 12:18:17 +09:00
Drew DeVault
c7d12bc072
Remove unnecessary setters
2016-10-13 12:17:58 +09:00
Drew DeVault
880399f5a5
Fix casing on private properties
2016-10-13 12:17:52 +09:00
Drew DeVault
dc4bd48f29
Fix casing issues
...
Cheers @RemieRichards
2016-10-13 12:17:46 +09:00
Drew DeVault
c39179d299
Add test for hit objects
2016-10-13 12:17:40 +09:00
Drew DeVault
7a4501323b
Decode beatmap colours
2016-10-13 12:17:35 +09:00
Drew DeVault
c0022f3515
Add more tests for legacy decoder
2016-10-13 12:17:31 +09:00
Drew DeVault
30f2eeda7c
Implement IDisposable in ArchiveReaders
2016-10-13 12:17:18 +09:00
Drew DeVault
0267eb7649
Fixup
2016-10-13 12:17:13 +09:00
Drew DeVault
4851f49ad5
Add basic osu! hit object parsing
2016-10-13 12:17:08 +09:00
Drew DeVault
9b4bc3e36d
Implement most of the legacy beatmap decoder
...
Missing timing points, events, and hit object decoders remain to be
written
2016-10-13 12:17:03 +09:00
Drew DeVault
32ab8f97bb
Add more decoding (including full BeatmapMetadata)
2016-10-13 12:16:58 +09:00
Drew DeVault
2a3f047895
Start implementing legacy decoder
2016-10-13 12:16:48 +09:00
Dean Herbert
2566d6bfe0
Fix regressions with HitRenderers, while also cleaning them up.
2016-10-13 10:10:15 +09:00
Drew DeVault
e9a45de51f
Refactor database to reuse existing types
2016-10-12 11:32:40 -04:00
Drew DeVault
23bc26ddac
Implement OszArchiveReader
2016-10-12 11:32:40 -04:00
Drew DeVault
bc69aa1455
Initial support code for beatmap loading
2016-10-12 11:32:40 -04:00
Drew DeVault
005dc9e8cb
Drop GameMode
2016-10-12 11:32:40 -04:00
Drew DeVault
2d810f72fa
Add initial DB schema and support code
2016-10-12 11:32:07 -04:00
Dean Herbert
f0284ce57c
Use the old naming style for now.
2016-09-26 15:07:29 +09:00
Dean Herbert
e0c06a4f19
Merge branch 'refs/heads/general-fixes' into beatmap_framework
...
# Conflicts:
# osu-framework
# osu.Game/GameModes/FieldTest.cs
# osu.Game/GameModes/FontTest.cs
# osu.Game/GameModes/Menu/ButtonSystem.cs
# osu.Game/Graphics/UserInterface/TextBox.cs
# osu.Game/OsuGame.cs
# osu.Game/osu.Game.csproj
2016-09-20 16:36:42 +09:00
Dean Herbert
ec25a50249
Add basic structure for catch mode objects.
2016-09-06 21:41:16 +09:00
Dean Herbert
49110cf8d8
Add mania Note and HoldNote.
2016-09-06 21:41:16 +09:00
Dean Herbert
0a0c8e2014
Fix some base classes not being abstract.
2016-09-06 21:41:16 +09:00
Dean Herbert
c75d74c84c
Taiko notes should have scale, not bool Big.
2016-09-06 21:41:16 +09:00
Dean Herbert
cf12f4764f
Add basic structure for osu! mode objects.
2016-09-06 21:41:16 +09:00
Dean Herbert
9d6b19a2ee
Add duration to BaseHit.
2016-09-06 21:41:16 +09:00
Dean Herbert
7cee44ab1d
HitObject -> HitBase. Also add BaseHits for each game mode.
2016-09-06 21:41:16 +09:00
Dean Herbert
ef98e4ee3c
Move beatmap metadata to separate class.
2016-09-06 21:41:16 +09:00
Dean Herbert
abe8ff21f6
Add more timing and sample related classes.
2016-09-06 21:41:16 +09:00
Dean Herbert
3098204dda
Add basic class structure for Beatmap/HitObject/SampleInfo/User.
2016-09-06 21:41:16 +09:00
