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

136 Commits

Author SHA1 Message Date
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
Jorolf 522034020e Moved Bindable init 2017-02-28 11:44:12 +01:00
DrabWeb 570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
Jorolf 8b3477820f Disable mousewheel while playing 2017-02-28 00:08:34 +01: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
Dean Herbert 68dd3c02aa
Fix failing testcase (nullref). 2017-02-27 17:05:12 +09:00
Dean Herbert 47997c20ad
Weld -> BindWith. 2017-02-27 12:24:53 +09:00
default0 8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert bc231c6bd4
Remove dispose which is no longer necessary. 2017-02-26 22:08:29 +09: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
Dean Herbert 17a28cd3b6 Don't push Player if we aren't still current. 2017-02-25 11:46:19 +09:00
Dean Herbert 7483b69477 Remove unnecessary Dispose logic. 2017-02-25 10:44:19 +09:00
Dean Herbert c4fbfb5a8f
Update comment with new knowledge. 2017-02-24 21:46:34 +09:00
Dean Herbert 5096f6b83d
Fix memory leak from Player's InputManager. 2017-02-24 21:01:05 +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 0264c44a20 Do not shadow Colour in TwoLayerButton 
Renames Colour to BackgroundColour instead.
 2017-02-23 22:33:37 +01:00
Thomas Müller 37bc75a7b6 Remove unused variables 2017-02-23 22:32:49 +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
Seth b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
Dean Herbert 6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00