h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 11:07:32 +08:00
Code Issues Releases Wiki Activity
3,693 Commits 3 Branches 653 Tags 368 MiB
9927f9aca5
Commit Graph

3693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
09b59b5003 Merge pull request #529 from EVAST9919/spinner_fix 
Spinner fix
 2017-03-22 22:18:42 +09:00
Andrey Zavadskiy
086191a12a Spinner fix 2017-03-22 16:13:39 +03:00
Dan Balasescu
e5602c0938 Merge pull request #526 from peppy/general-fixes 
Fix usages of CircularContainer in line with framework changes.
 2017-03-22 21:48:16 +09:00
DrabWeb
e4af30bd15 Line endings 2017-03-22 09:38:40 -03:00
Dean Herbert
1c83442b0b Update framework. 2017-03-22 21:36:03 +09:00
DrabWeb
8703e5a962 More formatting 2017-03-22 09:35:08 -03:00
DrabWeb
5ebbc2c0ba Formatting 2017-03-22 09:33:01 -03:00
DrabWeb
818bdd8e88 SongProgress in HudOverlay 2017-03-22 09:27:04 -03:00
DrabWeb
333008e26d Formatting 2017-03-22 08:59:44 -03:00
DrabWeb
340ddb59cd License headers 2017-03-22 08:54:21 -03:00
DrabWeb
29c54d4d8b Merge https://github.com/ppy/osu into song-progress-graph 2017-03-22 08:50:17 -03:00
Drew DeVault
2e1f596b2a Move DatabaseWorkingBeatmap out of partial class 2017-03-22 06:50:48 -04:00
Dean Herbert
fbe08436d2
Fix usages of CircularContainer in line with framework changes. 2017-03-22 19:35:03 +09:00
Drew DeVault
2b1d31e69c Address linting issues 2017-03-22 06:25:49 -04:00
Drew DeVault
267238dc27 Simplify derived classes of WorkingBeatmap 2017-03-22 06:15:32 -04: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
Dean Herbert
7fba0c4bce
Update framework. 2017-03-22 15:44:23 +09:00
Dan Balasescu
b349c7d7fd Merge pull request #524 from peppy/update-state-safety 
Make DrawableHitObject's UpdateState safer
 2017-03-22 15:38:26 +09:00
smoogipooo
aa8780797e Abstract class + move AccentColour to base. 2017-03-22 15:22:02 +09:00
Huo Yaoyuan
e217c67bcf Merge branch 'master' into controls 2017-03-22 08:54:03 +08:00
Dean Herbert
4f3ab879de
Make DrawableHitObject's UpdateState safer by blocking calls at a higher level with not yet loaded. 
UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.
 2017-03-22 09:43:44 +09:00
Dean Herbert
de5779ae8e Merge branch 'master' into taiko_drumroll_base 2017-03-22 09:38:14 +09:00
Dean Herbert
83d3e37fd4 Merge pull request #523 from adrian17/fix_slider_test 
Fix auto-sliders in TestCaseHitObject
 2017-03-22 09:37:47 +09:00
Dean Herbert
1f5c7d5be1 Merge pull request #483 from DrabWeb/leaderboards 
Leaderboards
 2017-03-22 09:28:03 +09:00
Dean Herbert
bee7b43a37
Make avatar fallback work on failed load. 2017-03-22 09:20:37 +09:00
Huo Yaoyuan
b06eb0122c Fix for colours and members rename. 2017-03-22 08:15:31 +08:00
Dean Herbert
f3486b7288
Add correct lifetime expiry for leaderboard content 2017-03-22 09:07:02 +09:00
Dean Herbert
7387dbd9fc
Tidy up LeaderboardScore 2017-03-22 09:04:33 +09:00
Huo Yaoyuan
b46ded7794 Use Bindable for DropDown. 2017-03-22 07:49:21 +08:00
Dean Herbert
1699daaf7f
Make DrawableRank safer. 2017-03-22 08:32:28 +09:00
Dean Herbert
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
Dean Herbert
91f088e67e Merge pull request #507 from Jorolf/seperateCursorSize 
Separated menu and gameplay cursor size
 2017-03-22 08:19:12 +09:00
Huo Yaoyuan
f0edf5d3d3 Update to DropDown and Menu. 2017-03-22 07:18:53 +08:00
Dean Herbert
b00f86d809 Merge branch 'master' into seperateCursorSize 2017-03-22 08:11:45 +09:00
Adrian Wielgosik
3270fdcfde Fix auto-sliders in TestCaseHitObject 2017-03-21 22:48:33 +01:00
smoogipooo
a72ae319a1 Override UpdateScrollPosition instead of Update. 2017-03-22 01:55:41 +09:00
smoogipooo
1532ae78a4 Fix post-merge errors. 2017-03-22 01:55:31 +09:00
smoogipooo
7cf935cef2 Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:53:44 +09:00
smoogipooo
a75a2e1794 Fix more post-merge errors. 2017-03-22 01:52:55 +09:00
smoogipooo
90c441f614 Override UpdateScrollPosition instead of Update. 2017-03-22 01:51:53 +09:00
smoogipooo
b3e8a2257c Fix post-merge errors. 2017-03-22 01:51:44 +09:00
smoogipooo
b9f1b44ca4 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:49:45 +09:00
smoogipooo
e4926d54ab Fix post-merge errors. 2017-03-22 01:48:51 +09:00
smoogipooo
1bfc4d484d Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:47:25 +09:00
smoogipooo
24e78d015e Make UpdateScrollPosition virtual. 2017-03-22 01:46:06 +09:00
smoogipooo
62dcd4fa59 Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:45:02 +09:00
smoogipooo
8f6cee2544 Override is unnecessary. 2017-03-22 01:43:20 +09:00
smoogipooo
e7a93073a4 Fix post-merge errors. 2017-03-22 01:42:40 +09:00
smoogipooo
b769c43660 Update framework. 2017-03-22 01:39:39 +09:00
smoogipooo
afcd42b06d Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-22 01:38:53 +09:00