RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,805 Commits 3 Branches 651 Tags 358 MiB
Commit Graph

157 Commits

Author SHA1 Message Date
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
Dean Herbert f9f31ca092
Add statefulness to MenuCursor. 2017-03-17 20:45:27 +09:00
Dean Herbert 7110ab8e17
Stop cursor moving when paused. 2017-03-17 20:45:27 +09:00
smoogipooo 9a4af8f194 GetScore -> CreateScore. 2017-03-17 02:03:12 +09:00
smoogipooo 2394e7ff78 Make CheckFailed not actually trigger internal things, and make private. 2017-03-17 01:36:30 +09:00
Dean Herbert ea642e5ef4 Merge branch 'master' into scoreprocessor_failing_improvements 2017-03-17 00:52:30 +09:00
smoogipooo b13340c3c8 Move CheckFailed outside of Schedule(). 2017-03-17 00:30:23 +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
Dean Herbert ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
smoogipooo 2a2caeba32 Add better failing support to ScoreProcessor. 2017-03-16 13:39:57 +09:00
smoogipooo c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +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
Dan Balasescu 879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
Dean Herbert 0da950beac
Fix KeyCounter M1 M2 display. 2017-03-14 12:31:09 +09:00
Dean Herbert 4fa037c0b2
Update framework. 2017-03-14 12:01:58 +09:00
smoogipooo c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
smoogipooo 64aab090d5 Instantiate HitRenderer with WorkingBeatmap. 2017-03-12 18:03:13 +09:00
smoogipooo 529cabb001 Make HudOverlay not dependent on Ruleset. 2017-03-10 16:16:07 +09:00
smoogipooo 4015b87965 General fixes. 2017-03-10 13:09:50 +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 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 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 5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +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 57cbecba83
Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554). 2017-03-06 22:08:02 +09:00
Dean Herbert 76ef8c1a6c
Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
Dean Herbert faf07ab51a
Use generics everywhere. 2017-03-06 13:59:11 +09:00
Dean Herbert 7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +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 00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
Dean Herbert 7a6a614358
Don't show pause menu when watching replays. 2017-03-04 21:35:26 +09:00
Thomas Müller a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01: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
Seth 1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
Dean Herbert 3a8246f56d
Move PauseOverlay to correct namespace. 2017-03-03 10:17:39 +09: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 c4ca18eeba
Remove references to PassThrough. 2017-03-02 16:28:51 +09:00
DrabWeb 367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04: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 b6e7e054c3
wankoz 2017-03-01 22:56:20 +09:00
Dean Herbert 58ae9e888d
Basic partial replay support. 2017-03-01 22:04:20 +09:00