EVAST9919
|
ae2186970c
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-08 18:16:16 +03:00 |
|
Dean Herbert
|
df4a737c9b
|
Merge remote-tracking branch 'ppy/master' into hud-mod-display
|
2017-05-08 10:56:34 +09:00 |
|
EVAST9919
|
d06b5783cb
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-06 17:33:51 +03:00 |
|
Dean Herbert
|
c9ba1ac4f6
|
Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
|
2017-05-05 13:00:05 +09:00 |
|
Dean Herbert
|
6298b3effd
|
Refactor ModSection and ModIcon to avoid null mods.
|
2017-05-05 12:16:41 +09:00 |
|
Dean Herbert
|
153951d3dd
|
Add OptionItem class
Allow for centalised logic for all option UI controls.
|
2017-05-04 23:07:48 +09:00 |
|
EVAST9919
|
26985dbc62
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
|
2017-05-03 16:22:40 +03:00 |
|
Dean Herbert
|
19f6d58723
|
Merge remote-tracking branch 'upstream/master' into options-implementation
|
2017-05-03 21:54:27 +09:00 |
|
EVAST9919
|
f49cc124ed
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
|
2017-05-03 08:26:54 +03:00 |
|
EVAST9919
|
a897dcbfbe
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-03 08:26:01 +03:00 |
|
EVAST9919
|
7e1efcc20b
|
Added ModsContainer
|
2017-05-02 22:34:07 +03:00 |
|
Dean Herbert
|
691742b828
|
Remove most options which have not yet been implemented.
|
2017-05-02 19:40:30 +09:00 |
|
smoogipooo
|
8e88d86639
|
Fix naming confusion.
|
2017-05-02 18:00:37 +09:00 |
|
Dean Herbert
|
1b0f353af3
|
Add support for framework-level mouse confining.
|
2017-05-02 17:45:42 +09:00 |
|
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 |
|