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

110 Commits

Author SHA1 Message Date
Dean Herbert 4ca27a5395
Merge branch 'master' into tooltips 2017-04-20 15:08:26 +09:00
Jorolf af9a45fd6c Merge branch 'master' into tooltips 2017-04-19 13:51:39 +02:00
Dean Herbert d51b37cb44
Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
Dean Herbert fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Jorolf dd26f9fcac Merge branch 'master' of git://github.com/ppy/osu into tooltips 2017-04-17 14:45:46 +02:00
Adrian Kaz Scherzinger 60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +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
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
Jorolf fb5952186c changes and fixes 2017-04-11 14:02:56 +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
Andrey Zavadskiy c6f4cff2e7 Fix Pause/Fail testcase 2017-04-06 12:27:45 +03:00
Jorolf b2731bb0a1 some formatting 2017-04-04 17:27:08 +02: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 072a77b4d9 Merge branch 'master' of git://github.com/ppy/osu into details 2017-04-01 14:12:20 +02:00
Dean Herbert 2b847aa2f4
Bring VisualTests up-to-date. 2017-03-31 18:00:14 +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
Dean Herbert ab97967237
Update references and framework. 2017-03-29 09:54:00 +09:00
Jorolf 909fdb647c Added ratings and different bar rotations 2017-03-28 17:12:54 +02:00
Andrey Zavadskiy 1c166bdf32 Edited pause visual test 2017-03-28 15:03:12 +03:00
Jorolf d8724e5e3e Add metadata details 2017-03-24 23:02:24 +01:00
smoogipooo 20e80a758a Merge branch 'master' into taiko_drawable_drawing 
Conflicts:
	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-24 15:11:56 +09: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
DrabWeb 67421cdf1c Even though it was 5 minutes ago what was I thinking 2017-03-23 01:34:06 -03:00
DrabWeb 8c99a8b103 Remove visual test(pretty useless) 2017-03-23 01:25:30 -03:00
DrabWeb c173c4b7ee Tab control 2017-03-23 00:22:31 -03:00
Dan Balasescu 2c580f43e9 Merge branch 'master' into taiko_playfield_2 2017-03-23 11:10:23 +09:00
Dan Balasescu e3bc837b61 Merge branch 'master' into taiko_drawable_drawing 2017-03-23 10:44:00 +09:00
smoogipooo 790997db90 Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-23 08:49:20 +09: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
smoogipooo 27a21cd23d Add taiko playfield. 2017-03-21 14:58:34 +09:00
Seth 4aea06be22 Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -03:00
smoogipooo b629766892 Add initial taiko note circles. 2017-03-17 22:01:06 +09:00
Kelvin 40bcc63a90 Added and styled FilterTabControls 2017-03-14 19:49:40 -07:00
Seth 21a9996225 Merge branch 'master' into leaderboards 2017-03-14 10:07:33 -03:00
Huo Yaoyuan db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
DrabWeb dbc8d513f9 Merge https://github.com/ppy/osu into leaderboards 2017-03-13 09:36:16 -03:00
DrabWeb a112b354f0 Basic implementation of score UI 2017-03-04 03:37:34 -04: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
Seth fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
Dan Balasescu 09a2d39e3e Merge branch 'master' into tournament_drawings 2017-03-03 13:06:18 +09:00
DrabWeb b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -04:00