smoogipooo
|
75ed7406e4
|
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
Conflicts:
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Taiko/TaikoRuleset.cs
|
2017-03-11 14:22:59 +09:00 |
|
smoogipooo
|
02281d8a2a
|
Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
|
2017-03-10 15:19:36 +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 |
|
Dean Herbert
|
02cab41d34
|
Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
|
2017-03-07 19:30:48 +09:00 |
|
Dean Herbert
|
1fb846e61d
|
Make playfield scaling optional.
|
2017-03-07 15:49:04 +09:00 |
|
Dean Herbert
|
533868a608
|
Fix other regression.
|
2017-03-07 15:18:15 +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
|
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
|
4e4408cd20
|
Merge branch 'master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
|
2017-03-05 17:45:03 +09:00 |
|
Thomas Müller
|
a14bdf8624
|
Use Color4Extensions from Framework and remove redundant Name
|
2017-03-04 19:42:37 +01:00 |
|
Dean Herbert
|
58ae9e888d
|
Basic partial replay support.
|
2017-03-01 22:04:20 +09:00 |
|
Thomas Müller
|
a5dfa7ab06
|
Remove unnecessary using statements
|
2017-02-23 21:38:10 +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
|
53e40804ab
|
Move other score components to centre alignment (and switch font).
|
2017-02-16 22:44:41 +09:00 |
|
Dean Herbert
|
10dfe47638
|
Add spinners and improve TestCaseHitObjects.
|
2017-02-15 01:23:20 +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 |
|
Damnae
|
daa14bfec8
|
Replace AddConnections by a HitObjects property.
|
2017-02-12 08:47:07 +01:00 |
|
Damnae
|
d7be9539d1
|
Create connections from HitObjects instead of DrawableHitObjects.
|
2017-02-12 07:29:36 +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 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Dean Herbert
|
3e7503e860
|
Make skip button work.
|
2017-01-27 21:57:22 +09: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 |
|