Dean Herbert
|
bef15fe637
|
Improve organisation of some options and config code.
|
2017-05-02 17:45:22 +09:00 |
|
EVAST9919
|
108cd28e96
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-02 10:15:56 +03:00 |
|
smoogipooo
|
e856abe59a
|
Let's not use Country for drawings-specific stuff...
|
2017-05-02 13:02:14 +09:00 |
|
Dean Herbert
|
2e0eda6b15
|
Merge branch 'master' into playlist
|
2017-05-01 19:44:57 +09:00 |
|
Dean Herbert
|
580cf93147
|
Refactoring part 4.
|
2017-05-01 15:03:11 +09:00 |
|
Dean Herbert
|
37944bb04e
|
Initial refactoring.
|
2017-05-01 13:01:08 +09:00 |
|
DrabWeb
|
c193a90a16
|
Merge https://github.com/ppy/osu into playlist
|
2017-04-29 05:39:52 -03:00 |
|
Thomas Tan
|
9b8b88601f
|
Create "AutoGenerator" base class and interface.
|
2017-04-29 02:08:48 +08:00 |
|
EVAST9919
|
eacf2045f0
|
Initial commit
|
2017-04-28 04:56:34 +03:00 |
|
smoogipooo
|
28f7e0cdba
|
Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.
|
2017-04-26 14:12:21 +09:00 |
|
Dan Balasescu
|
91b264da1a
|
Merge branch 'master' into info-wedge-design-update
|
2017-04-25 08:14:59 +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
|
e1a2f1bc7a
|
Add beatmap metrics lookup.
|
2017-04-24 19:17:11 +09:00 |
|
Dean Herbert
|
239f19ad02
|
Fix incorrect line endings.
|
2017-04-24 14:10:44 +09: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 |
|
smoogipooo
|
5cdbb226f8
|
Remove CurvedHitObject to make RepeatSamples not tied to curve.
|
2017-04-21 20:40:11 +09:00 |
|
Dean Herbert
|
3f832731c9
|
Add DoubleTime, HalfTime and Nightcore support.
|
2017-04-21 17:33:37 +09:00 |
|
Dean Herbert
|
c87657707f
|
Add tooltip to sliderbars. Move interface.
|
2017-04-20 17:33:07 +09:00 |
|
Dean Herbert
|
4ca27a5395
|
Merge branch 'master' into tooltips
|
2017-04-20 15:08:26 +09:00 |
|
Dean Herbert
|
2a422ca5fa
|
Remove ScoreStatistic.
|
2017-04-20 11:26:02 +09:00 |
|
Dean Herbert
|
6cf026e5c1
|
Remove OsuScore and change the way statistics are stored (dynamic dictionary).
|
2017-04-20 11:03:11 +09:00 |
|
Dan Balasescu
|
66cb604081
|
Merge branch 'master' into score-statistics
|
2017-04-20 10:06:43 +09:00 |
|
Jorolf
|
e8aea3ccd2
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
|
2017-04-19 15:33:35 +02:00 |
|
Jorolf
|
d04893a43a
|
---changing---
|
2017-04-19 15:33:24 +02:00 |
|
Dan Balasescu
|
dd3f9c1cdd
|
Merge branch 'master' into results-screen
|
2017-04-19 21:58:40 +09:00 |
|
Jorolf
|
af9a45fd6c
|
Merge branch 'master' into tooltips
|
2017-04-19 13:51:39 +02:00 |
|
Dean Herbert
|
093abd6872
|
Add chat toggle button.
|
2017-04-19 19:54:03 +09:00 |
|
Dean Herbert
|
3129708ccb
|
Add chat sending support.
|
2017-04-19 18:46:52 +09:00 |
|
Dean Herbert
|
3b95fbab7d
|
Add score statistic tracking (osu!).
|
2017-04-19 16:29:27 +09:00 |
|
Dean Herbert
|
72fcc09a98
|
Add beatmap info and score date.
Also adjusts design metrics.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
d51b37cb44
|
Add a basic implementation of the new design results screen.
|
2017-04-18 22:22:14 +09:00 |
|
Dean Herbert
|
3b21340e1b
|
Split SquareGraph out and make SongProgressGraph also able to take a list of Objects.
|
2017-04-18 18:40:02 +09:00 |
|
Dean Herbert
|
fbd26a1d5e
|
Mode -> Ruleset.
|
2017-04-18 16:05:58 +09:00 |
|
smoogipooo
|
d04353aed0
|
Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter.
|
2017-04-18 11:13:11 +09:00 |
|
smoogipooo
|
0e1ce333e3
|
Make IBeatmapProcessor a class with virtual methods.
|
2017-04-18 09:43:43 +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
|
09208adf81
|
Re-implement legacy hit object conversion.
|
2017-04-18 08:58:21 +09:00 |
|
Jorolf
|
dd26f9fcac
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
|
2017-04-17 14:45:46 +02: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 |
|
Dean Herbert
|
ce12cc20bd
|
Merge remote-tracking branch 'upstream/master' into remove-playmode
|
2017-04-17 13:00:53 +09:00 |
|
Adrian Kaz Scherzinger
|
60f7879875
|
Explicitly set C# 6.0 for now.
|
2017-04-16 06:44:08 +09:00 |
|
smoogipooo
|
0a1376c2db
|
Remove PlayMode game-wide.
|
2017-04-15 05:22:41 +09:00 |
|
smoogipooo
|
59bfc7abad
|
Move statics to RulesetCollection to avoid conflicts later on.
|
2017-04-15 04:53:37 +09:00 |
|
Dan Balasescu
|
3de3b94978
|
Merge branch 'master' into song-progress-graph
|
2017-04-15 01:29:02 +09:00 |
|
Dean Herbert
|
ac3b435f00
|
Merge remote-tracking branch 'upstream/master' into hud-improvements
# Conflicts:
# osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
|
2017-04-14 19:29:59 +09:00 |
|
Dean Herbert
|
09195a03a2
|
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
# osu.Game/Overlays/DragBar.cs
|
2017-04-14 11:25:00 +09:00 |
|
Jorolf
|
f6f75fac74
|
Merge branch 'master' of git://github.com/ppy/osu into tooltips
# Conflicts:
# osu.Game/Graphics/Cursor/MenuCursor.cs
|
2017-04-13 23:12:07 +02:00 |
|
Jorolf
|
c2b2e5ec19
|
changed way the tool tip is found and displayed
|
2017-04-13 23:00:49 +02:00 |
|
Dean Herbert
|
2c3fa30386
|
Metric -> Metrics.
|
2017-04-12 21:09:39 +09:00 |
|
Dean Herbert
|
157ad17606
|
Merge branch 'master' into details
|
2017-04-12 20:25:51 +09:00 |
|
Dean Herbert
|
c0338a82e7
|
Update nuget packages.
Includes fix in OpenTK for focus issues.
|
2017-04-12 19:35:16 +09:00 |
|
Dean Herbert
|
c615762da6
|
wip
|
2017-04-11 18:56:25 +09:00 |
|
Jorolf
|
a597149b7f
|
Merge branch 'details' of github.com:Jorolf/osu into details
|
2017-04-10 16:42:42 +02:00 |
|
Jorolf
|
24b4b3ad7d
|
update to everything
|
2017-04-10 16:42:23 +02:00 |
|
Dean Herbert
|
c6a24bb549
|
Merge branch 'master' into details
|
2017-04-10 20:07:13 +09:00 |
|
Andrey Zavadskiy
|
e73f543c4f
|
Applied suggestions
|
2017-04-10 06:06:10 +03:00 |
|
Andrey Zavadskiy
|
425e96c45c
|
Moved logic to it's own class
|
2017-04-09 17:44:19 +03:00 |
|
DrabWeb
|
963cd09bd0
|
Merge https://github.com/ppy/osu into playlist
|
2017-04-09 04:04:13 -03:00 |
|
Jorolf
|
899e559b5c
|
ratings hide now + remove unnessary stuff
|
2017-04-07 19:58:49 +02:00 |
|
Jorolf
|
eb4b3772e9
|
put Bar into its own file and let it only add a background if BackgroundColour is changed
|
2017-04-07 18:13:55 +02:00 |
|
Dean Herbert
|
12d2102a88
|
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Modes/UI/HudOverlay.cs
# osu.Game/Screens/Play/PauseOverlay.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
|
2017-04-07 09:22:18 +09:00 |
|
Jorolf
|
e59c0a770f
|
Merge branch 'master' into details
|
2017-04-06 15:42:00 +02:00 |
|
Huo Yaoyuan
|
9b1e010dcc
|
Fix filename mismatch.
|
2017-04-06 16:05:41 +08:00 |
|
Dan Balasescu
|
6fc1384927
|
Merge branch 'master' into taiko-fixes
|
2017-04-06 16:23:22 +09:00 |
|
Dean Herbert
|
4783d17d94
|
Merge branch 'master' into better-hitsounds
|
2017-04-06 16:00:56 +09:00 |
|
smoogipooo
|
cec8bca78a
|
Implement IJsonSerializable, BeatmapInfo IJsonSerializable.
|
2017-04-06 15:54:50 +09:00 |
|
Dean Herbert
|
a18367454d
|
InGameOverlay -> MenuOverlay.
|
2017-04-06 15:34:52 +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
|
2d8239a3f7
|
Re-implement the SampleBank/Sample structure. No parsing support yet.
|
2017-04-05 21:34:28 +09:00 |
|
Andrey Zavadskiy
|
62655b70c9
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
|
2017-04-04 18:41:37 +03:00 |
|
smoogipooo
|
5e67bcb581
|
Remove a few unused classes.
|
2017-04-04 13:14:45 +09:00 |
|
Jorolf
|
5a694e0c9d
|
changed location of BarGraph to be more generic
|
2017-04-03 19:29:13 +02:00 |
|
Jorolf
|
f3946bebb4
|
Merge branch 'master' of git://github.com/ppy/osu into details
|
2017-04-03 18:33:47 +02:00 |
|
smoogipooo
|
19b5555ef2
|
Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.
|
2017-04-03 20:26:46 +09:00 |
|
Jorolf
|
e835b19d4a
|
add Tooltips
|
2017-04-02 18:19:59 +02:00 |
|
Andrey Zavadskiy
|
3574dac780
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
|
2017-04-01 21:03:19 +03:00 |
|
Jorolf
|
47698be1f5
|
Merge branch 'master' into details
|
2017-03-31 21:10:45 +02:00 |
|
Dean Herbert
|
14fcc197e9
|
Merge branch 'master' into partial-judgements
|
2017-03-31 16:53:49 +09:00 |
|
Dean Herbert
|
50c328f1b4
|
Merge remote-tracking branch 'upstream/master' into partial-judgements
# Conflicts:
# osu.Game/osu.Game.csproj
|
2017-03-31 16:46:40 +09:00 |
|
Dean Herbert
|
5d25fa3282
|
Merge remote-tracking branch 'upstream/master' into accented-interface
|
2017-03-31 16:38:19 +09:00 |
|
Dean Herbert
|
fa7c72a099
|
Refactor ReplayInputHandler creation for more flexibility.
|
2017-03-31 15:59:53 +09:00 |
|
Dean Herbert
|
0f4b98ce73
|
Move FramedReplayInputHandler to own file and un-nest.
|
2017-03-31 15:32:34 +09:00 |
|
smoogipooo
|
43c306d658
|
IAccented -> IHasAccentColour.
|
2017-03-31 15:06:31 +09:00 |
|
Dean Herbert
|
e7ecc479c9
|
Add FramedReplay and use where legacy is not needed.
|
2017-03-31 12:43:42 +09:00 |
|
smoogipooo
|
d944b8c192
|
Implement IAccented interface + transform.
|
2017-03-31 11:01:42 +09:00 |
|
Jorolf
|
0d4f2c59a5
|
there's probably something in here I overlooked
|
2017-03-30 17:32:18 +02:00 |
|
Jorolf
|
6982529481
|
Merge branch 'master' of git://github.com/ppy/osu into details
|
2017-03-29 15:47:00 +02:00 |
|
smoogipooo
|
3050039972
|
Implement partial judgements + make Result non-nullable.
|
2017-03-29 18:35:28 +09:00 |
|
Jorolf
|
305bc9cff6
|
Merge branch 'master' of git://github.com/ppy/osu into details
|
2017-03-28 17:14:35 +02:00 |
|
Andrey Zavadskiy
|
cf3db49631
|
Inherit Pause/Fail overlay from InGameOverlay
|
2017-03-28 12:09:26 +03:00 |
|
Andrey Zavadskiy
|
62693a6a59
|
Again separate classes
|
2017-03-28 10:49:58 +03:00 |
|
Andrey Zavadskiy
|
9774f826ab
|
Pause and fail overlays -> StopOverlay
|
2017-03-28 06:08:31 +03:00 |
|
Andrey Zavadskiy
|
5461c6516a
|
Refactor PauseOverlay, FailDialog -> FailOverlay
|
2017-03-28 04:53:57 +03:00 |
|
Dean Herbert
|
13272e6995
|
Make Avatar accept a user.
Add UpdateableAvatar to handle the toolbar use-case.
|
2017-03-28 00:08:26 +09:00 |
|
Dean Herbert
|
039f4a65dc
|
Combine user models.
|
2017-03-28 00:08:24 +09:00 |
|
Jorolf
|
775fd63d0f
|
Added difficulty container
|
2017-03-25 23:33:03 +01:00 |
|
ElegantMonkey
|
0678274118
|
Rename OptionDropdown and OptionEnumDropdown files
|
2017-03-25 07:45:04 -03:00 |
|
Jorolf
|
d8724e5e3e
|
Add metadata details
|
2017-03-24 23:02:24 +01:00 |
|
DrabWeb
|
215b016f32
|
Initial implementation
|
2017-03-24 05:59:26 -03:00 |
|
DrabWeb
|
befbc63c35
|
Merge https://github.com/ppy/osu into song-progress-graph
|
2017-03-23 23:42:06 -03:00 |
|
smoogipooo
|
2074812f46
|
Move ScoreProcessor and Score to Scoring/.
|
2017-03-24 09:51:52 +09:00 |
|
Dean Herbert
|
2cb801317d
|
JudgementInfo -> Judgement.
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
|
2017-03-23 19:00:18 +09:00 |
|
DrabWeb
|
0337f18fb9
|
Cleaning
|
2017-03-23 06:37:12 -03:00 |
|
Dean Herbert
|
4d61424abd
|
Merge branch 'master' into song-progress-graph
|
2017-03-23 17:44:22 +09:00 |
|
Dan Balasescu
|
e9a061c709
|
Merge branch 'master' into beatmap-detail-tabs
|
2017-03-23 17:13:02 +09:00 |
|
smoogipooo
|
c9fe9e681d
|
Make judgement text generic to be used between game modes.
|
2017-03-23 12:49:28 +09:00 |
|
DrabWeb
|
c173c4b7ee
|
Tab control
|
2017-03-23 00:22:31 -03:00 |
|
Dean Herbert
|
9601e143d4
|
Merge branch 'master' into working-beatmap
|
2017-03-23 09:37:21 +09:00 |
|
Dean Herbert
|
ba32d50456
|
Consolidate nested classes.
|
2017-03-23 08:44:52 +09:00 |
|
Huo Yaoyuan
|
0dbc232ebf
|
Rename all DropDown -> Dropdown.
|
2017-03-22 22:32:32 +08:00 |
|
DrabWeb
|
29c54d4d8b
|
Merge https://github.com/ppy/osu into song-progress-graph
|
2017-03-22 08:50:17 -03: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 |
|
Huo Yaoyuan
|
e217c67bcf
|
Merge branch 'master' into controls
|
2017-03-22 08:54:03 +08:00 |
|
Dean Herbert
|
8983bbcaad
|
Merge branch 'master' into leaderboards
|
2017-03-22 08:24:49 +09:00 |
|
Huo Yaoyuan
|
f0edf5d3d3
|
Update to DropDown and Menu.
|
2017-03-22 07:18:53 +08:00 |
|
smoogipooo
|
a272675705
|
Parse time signature from legacy beatmap control points.
|
2017-03-21 21:18:08 +09:00 |
|
Dean Herbert
|
5d0adc6454
|
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
|
2017-03-19 18:51:53 +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 |
|
DrabWeb
|
b0e7296e25
|
-IHasDrawableRepresentation, User.Region -> Country
|
2017-03-19 00:09:58 -03:00 |
|
smoogipooo
|
26b0bb02d8
|
Remove IIsLegacy, expose LegacyBeatmap without a public constructor.
|
2017-03-18 18:32:54 +09:00 |
|
Seth
|
4aea06be22
|
Merge branch 'master' into leaderboards
|
2017-03-17 18:23:01 -03:00 |
|
DrabWeb
|
0834b5b794
|
Made requested changes
|
2017-03-17 18:16:59 -03:00 |
|
Dan Balasescu
|
e529f5e439
|
Merge branch 'master' into song-select-loading-reoptimisation
|
2017-03-18 02:12:56 +09:00 |
|
Dean Herbert
|
292de44a0b
|
WIP menu cursor.
|
2017-03-17 20:45:27 +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
|
4b97304603
|
CarouselContainer -> BeatmapCarousel.
|
2017-03-17 19:12:54 +09:00 |
|
smoogipooo
|
862c4c408f
|
Add legacy beatmap flag.
|
2017-03-17 14:24:46 +09:00 |
|
Dean Herbert
|
60fc782e93
|
Merge branch 'master' into beatmap_timinginfo
|
2017-03-16 23:08:24 +09:00 |
|
Dean Herbert
|
271dddc9a7
|
Merge branch 'master' into generic_scoreprocessor
|
2017-03-16 23:04:19 +09:00 |
|
Dean Herbert
|
110bdbd0c1
|
Make everything share DropDown implementations again. Remove unnecessary files.
|
2017-03-16 21:17:14 +09:00 |
|
smoogipooo
|
5137338c7c
|
Replace List<ControlPoint> with TimingInfo in Beatmap.
|
2017-03-16 17:11:24 +09:00 |
|
Dean Herbert
|
334e389518
|
Tidy up OsuTabControl and FilterControl.
|
2017-03-16 16:35:44 +09:00 |
|
smoogipooo
|
7b66faab9e
|
Fix filename.
|
2017-03-16 12:59:09 +09:00 |
|
Dean Herbert
|
a22b34817c
|
Merge branch 'master' into leaderboards
|
2017-03-16 11:12:53 +09:00 |
|
Drew DeVault
|
3aecbf5739
|
Rearrange things somewhat
|
2017-03-15 20:15:40 -04:00 |
|
Drew DeVault
|
cac6c42aac
|
Merge remote-tracking branch 'upstream/master' into tab-control
|
2017-03-15 20:15:28 -04:00 |
|
smoogipooo
|
42da0f1a72
|
Merge remote-tracking branch 'origin/master' into generic_judgements_2
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
osu.Game/Modes/UI/HitRenderer.cs
osu.Game/osu.Game.csproj
|
2017-03-15 21:36:43 +09:00 |
|
DrabWeb
|
7572947214
|
Badge -> Team
|
2017-03-15 08:09:44 -03:00 |
|
smoogipooo
|
0f4df0566b
|
HasSpecial -> HasHold.
|
2017-03-15 19:43:38 +09:00 |
|
smoogipooo
|
c24d98cd11
|
Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing
|
2017-03-15 19:40:12 +09:00 |
|
smoogipooo
|
76c0a4d836
|
HitObjectType -> LegacyHitObjectType, move to Legacy namespace.
|
2017-03-15 19:39:40 +09:00 |
|
Dan Balasescu
|
a3906820ec
|
Merge branch 'master' into beatmap_parsing
|
2017-03-15 19:29:45 +09:00 |
|
smoogipooo
|
bf66b84ff8
|
Move a few classes/enums into separate files.
|
2017-03-15 16:07:40 +09:00 |
|
Dean Herbert
|
e3e19a156c
|
Rename incorrect class file.
|
2017-03-15 14:37:29 +09:00 |
|
Dean Herbert
|
8f5d262f30
|
Add GetScoresRequest API methods.
|
2017-03-15 14:06:05 +09:00 |
|
smoogipooo
|
6a31219781
|
Add further abstraction to Sliders/IHasCurve.
|
2017-03-15 12:52:25 +09:00 |
|
Dean Herbert
|
253bcebf51
|
Merge remote-tracking branch 'upstream/master' into leaderboards
# Conflicts:
# osu.Game/osu.Game.csproj
|
2017-03-15 12:23:34 +09:00 |
|
Kelvin
|
2629f78afc
|
Add FilterControl and FilterTabControl
|
2017-03-14 19:49:40 -07:00 |
|
DrabWeb
|
650fc7563d
|
ScoreRank, Avatar to own files, +DrawableRank
|
2017-03-14 10:58:28 -03:00 |
|
DrabWeb
|
2e8b1ad390
|
Woops
|
2017-03-14 10:09:58 -03:00 |
|
Seth
|
21a9996225
|
Merge branch 'master' into leaderboards
|
2017-03-14 10:07:33 -03:00 |
|
Huo Yaoyuan
|
e1cc74bb40
|
Merge branch 'master' into more-songselect
|
2017-03-14 20:50:53 +08:00 |
|
Huo Yaoyuan
|
3871a350f8
|
Move BeatmapOptions buttons to derived class and simplify.
|
2017-03-14 19:38:21 +08:00 |
|
smoogipooo
|
785b970125
|
Add special interface for LegacyHold.
|
2017-03-14 18:49:22 +09:00 |
|
smoogipooo
|
a1833fd6b0
|
Whoops, naming.
|
2017-03-14 18:49:01 +09:00 |
|
smoogipooo
|
4c7f0fcb73
|
Fix unit tests.
|
2017-03-14 18:46:34 +09:00 |
|
smoogipooo
|
ad9583a179
|
Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing
|
2017-03-14 18:06:50 +09:00 |
|
smoogipooo
|
1f43370886
|
Fix failing unit test, move legacy hitobjects to Objects/Legacy/.
|
2017-03-14 18:06:32 +09:00 |
|
Huo Yaoyuan
|
c3a0549cdd
|
Move player specific stuff to derived PlaySongSelect.
|
2017-03-14 16:58:34 +08:00 |
|
Dean Herbert
|
5c2bf02c9d
|
Merge branch 'master' into beatmap_parsing
|
2017-03-14 17:50:00 +09:00 |
|
Huo Yaoyuan
|
fae6afa9e3
|
Create basic SongSelect class.
|
2017-03-14 16:44:35 +08:00 |
|
smoogipooo
|
7141bc86d3
|
Rework beatmap post-processing into HitRenderer.
|
2017-03-14 17:01:21 +09:00 |
|
Dean Herbert
|
14b22445fa
|
Merge remote-tracking branch 'upstream/master' into general-fixes
# Conflicts:
# osu.Game/Modes/UI/HitRenderer.cs
|
2017-03-14 16:15:26 +09:00 |
|
Dean Herbert
|
1f68731a09
|
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
|
2017-03-14 16:00:35 +09:00 |
|
smoogipooo
|
90ad2e9731
|
Remove unused interface.
|
2017-03-14 15:50:36 +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 |
|
Dan Balasescu
|
879a78156d
|
Merge branch 'master' into mod_application
|
2017-03-14 12:38:55 +09:00 |
|
smoogipooo
|
bc5912eab5
|
Applyable -> Applicable.
|
2017-03-14 12:32:31 +09:00 |
|
Dean Herbert
|
ba10c3a8db
|
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
|
2017-03-14 11:46:34 +09:00 |
|
Huo Yaoyuan
|
db104d04d3
|
Use AutoGenerateBindingRedirects instead of explicit app.config.
|
2017-03-14 03:20:33 +08:00 |
|
Dean Herbert
|
2756d5f09f
|
Merge branch 'master' into mod_application
|
2017-03-13 23:00:11 +09:00 |
|
Dean Herbert
|
c51e97e8cc
|
Merge pull request #471 from smoogipooo/beatmap_conversion
Beatmap conversion
|
2017-03-13 22:17:22 +09:00 |
|
Dean Herbert
|
b2981fb729
|
Merge branch 'master' into mod_application
|
2017-03-13 22:15:26 +09:00 |
|
DrabWeb
|
442a2c97db
|
Merge conflicts
|
2017-03-13 09:44:22 -03:00 |
|
DrabWeb
|
dbc8d513f9
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-13 09:36:16 -03:00 |
|
DrabWeb
|
9912f5f9e1
|
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
|
2017-03-13 09:33:25 -03: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
|
35ddca78f5
|
Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).
|
2017-03-13 14:50:55 +09: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
|
77a4a896c9
|
Cleanups.
|
2017-03-12 01:08:34 +09:00 |
|
smoogipooo
|
592e05a2c8
|
Better beatmap conversion model.
|
2017-03-12 00:34:21 +09:00 |
|
smoogipooo
|
75a5da62d0
|
Fix filenames.
|
2017-03-10 16:11:38 +09:00 |
|
smoogipooo
|
4015b87965
|
General fixes.
|
2017-03-10 13:09:50 +09:00 |
|
smoogipooo
|
617ceb8001
|
Rename to StandardComboCounter, add HealthDisplay abstraction.
|
2017-03-10 12:47:00 +09:00 |
|
smoogipooo
|
31f6cbd8cf
|
Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
|
2017-03-10 12:14:13 +09: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
|
fd53d10264
|
Refactor ArchiveReader for extensibility
|
2017-03-06 23:56:08 +01:00 |
|
Thomas Müller
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01:00 |
|
Dean Herbert
|
dcc7386609
|
Add option toggle for debug cached setting.
|
2017-03-06 22:07:46 +09:00 |
|
Dean Herbert
|
b5aff9df5f
|
Add options footer.
|
2017-03-06 17:30:46 +09:00 |
|
Dean Herbert
|
95e2e2b027
|
Replay loading via drag-drop huzzah!
|
2017-03-04 19:02:43 +09:00 |
|
Dean Herbert
|
aa9d85624d
|
Change IPC to make sense.
|
2017-03-04 18:51:16 +09:00 |
|
DrabWeb
|
a112b354f0
|
Basic implementation of score UI
|
2017-03-04 03:37:34 -04: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
|
6f3b59268a
|
Merge pull request #385 from DrabWeb/mod-overlay
Mod select
|
2017-03-03 21:09:08 +09:00 |
|
Dean Herbert
|
dc6a728cce
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 20:48:07 +09:00 |
|
Dean Herbert
|
38a9e820e6
|
GroupsContainer -> GroupContainer.
|
2017-03-03 20:46:07 +09:00 |
|
Dean Herbert
|
bc01935a89
|
Move around some namespaces.
|
2017-03-03 20:42:22 +09:00 |
|
smoogipooo
|
5a4d07d770
|
Better way to initialize team lists.
|
2017-03-03 18:47:56 +09:00 |
|
Seth
|
fde509ab1d
|
Merge branch 'master' into mod-overlay
|
2017-03-03 04:12:42 -04:00 |
|
smoogipooo
|
777996d884
|
Rewrite VisualiserLine + add VisualiserContainer.
|
2017-03-03 15:43:16 +09:00 |
|
Seth
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
Seth
|
2e74b4be60
|
Merge branch 'master' into beatmap-options
|
2017-03-03 00:52:45 -04:00 |
|
Dan Balasescu
|
09a2d39e3e
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 13:06:18 +09:00 |
|
smoogipooo
|
efb13b29d1
|
General cleanups.
|
2017-03-03 13:01:57 +09:00 |
|
DrabWeb
|
7a4b9c5571
|
osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options
|
2017-03-02 21:20:30 -04:00 |
|
Dean Herbert
|
3a8246f56d
|
Move PauseOverlay to correct namespace.
|
2017-03-03 10:17:39 +09:00 |
|
DrabWeb
|
b856fb5991
|
Implemented beatmap options overlay
|
2017-03-02 08:40:55 -04: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
|
435e845067
|
Merge branch 'master' into DrabWeb/song-progress-graph
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Overlays/Pause/PauseProgressBar.cs
# osu.Game/Overlays/Pause/PauseProgressGraph.cs
# osu.Game/osu.Game.csproj
|
2017-03-02 20:20:27 +09:00 |
|
Dean Herbert
|
58ae9e888d
|
Basic partial replay support.
|
2017-03-01 22:04:20 +09:00 |
|
smoogipooo
|
35d246b59d
|
Merge remote-tracking branch 'origin/master' into tournament_drawings
|
2017-03-01 19:32:33 +09:00 |
|
DrabWeb
|
570c95cb98
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-28 02:22:59 -04:00 |
|
DrabWeb
|
ce1798b8bc
|
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
|
2017-02-28 02:09:36 -04:00 |
|
DrabWeb
|
50d172be39
|
Added DialogManager(not wired up for desktop project yet)
|
2017-02-28 00:59:36 -04:00 |
|
DrabWeb
|
fbd9523596
|
Added beatmap delete dialog
|
2017-02-27 23:19:28 -04:00 |
|
DrabWeb
|
3094c01a40
|
Merge https://github.com/ppy/osu into popup-dialog
|
2017-02-27 16:40:04 -04:00 |
|
smoogipooo
|
fc33bf4761
|
Add drawings config.
|
2017-02-27 23:29:18 +09:00 |
|
smoogipooo
|
5f3e484353
|
Add scrolling teams container.
|
2017-02-27 23:29:06 +09:00 |
|
Dean Herbert
|
a22216d0b0
|
Update nuget packages.
|
2017-02-27 20:38:30 +09:00 |
|
smoogipooo
|
25a1c7a8ad
|
Initial groups implementation.
|
2017-02-27 14:19:07 +09:00 |
|
DrabWeb
|
d78dca3d85
|
New design
|
2017-02-26 23:35:13 -04:00 |
|
Dean Herbert
|
79993a576f
|
Add basic GC options.
|
2017-02-26 18:06:59 +09:00 |
|
DrabWeb
|
c94da4fcf0
|
Added popup dialog
|
2017-02-24 00:05:37 -04:00 |
|
Seth
|
b4b88712ad
|
Merge branch 'master' into mod-overlay
|
2017-02-23 08:00:24 -04:00 |
|
Dean Herbert
|
7e7bf07d03
|
Remove unused whitebox.
|
2017-02-23 11:11:46 +09:00 |
|
DrabWeb
|
99f1f88c75
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-22 12:35:55 -04:00 |
|
Dean Herbert
|
aef0eb49a1
|
Add loading screen.
|
2017-02-22 21:53:59 +09:00 |
|
Dean Herbert
|
afba4fbfad
|
Merge remote-tracking branch 'upstream/master' into chat-improvement
|
2017-02-21 15:46:28 +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
|
520e040396
|
Add FocusedTextBox abstraction.
|
2017-02-19 17:59:22 +09:00 |
|
Dean Herbert
|
0da0ef5a1b
|
Fix padding, fonts and alignment of chat display.
|
2017-02-19 17:06:41 +09:00 |
|
DrabWeb
|
006fb5502d
|
ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select
|
2017-02-18 07:28:22 -04:00 |
|
Dean Herbert
|
fe3a6248ec
|
Add better screen hierarchy and placeholder for dev build disclaimer.
|
2017-02-17 20:07:16 +09:00 |
|
Dean Herbert
|
e6ef9f67aa
|
GameMode -> Screen.
|
2017-02-17 19:23:58 +09:00 |
|
DrabWeb
|
9fc3726925
|
ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly
|
2017-02-16 18:32:27 -04:00 |
|
DrabWeb
|
0a58fc62db
|
Added mod selection overlay
|
2017-02-16 16:05:03 -04:00 |
|
Dean Herbert
|
580584a015
|
Don't use osu! mode parser for other game modes for now (convert still works).
|
2017-02-15 12:36:47 +09:00 |
|