h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 17:37:46 +08:00
Code Issues Releases Wiki Activity
6,186 Commits 3 Branches 653 Tags 357 MiB
b64fe68233
Commit Graph

1262 Commits

Author SHA1 Message Date
Dean Herbert
6f4efbeda6 Merge remote-tracking branch 'upstream/master' into database-tidy 2017-07-27 17:41:29 +09:00
Dean Herbert
5f53426a9a *Database -> *Store 
Welcome back BeatmapManager
 2017-07-27 16:56:41 +09:00
Dan Balasescu
d375459fa9 Merge branch 'master' into chat-line-word-wrap 2017-07-27 16:54:15 +09:30
Dean Herbert
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore 
Hide database functionality at a lower level in preparation from eventually making it private.
 2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
3c7546e2c1 Merge remote-tracking branch 'upstream/master' into no-more-colourinfo 2017-07-25 10:14:48 +09:00
Dean Herbert
ed7bb329de Add word wrap support to chat 2017-07-24 18:11:25 +09:00
Dean Herbert
038e47ceda Merge branch 'master' into drawableflag-ctor 2017-07-24 16:46:20 +09:00
Nabile Rahmani
c80f5c708a Less verbose DrawableFlag constructor. 2017-07-24 09:25:49 +02:00
Dean Herbert
750d96be8f Merge branch 'master' into playlist-beatmaplist-sync 2017-07-24 14:12:04 +09:00
Ben Pig Chu
950c55d6d0 No need to dispose/unbind the delegates 2017-07-24 13:10:51 +08:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Ben Pig Chu
76edcb4a67 Update playlist when adding or removing beatmap set 2017-07-23 14:21:10 +08:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
e36b65bfe0 Merge branch 'master' into better-transforms 2017-07-22 10:50:58 +02:00
Dean Herbert
7549d3a2c4 Allow ChatLines to exist without UserProfileOverlay 
Fixes testcases failing when logged in.
 2017-07-22 17:18:20 +09:00
Thomas Müller
0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-21 11:15:26 +02:00
Dean Herbert
cb3402098a Merge remote-tracking branch 'upstream/master' into user-profile-fixes 2017-07-20 19:32:00 +09:00
Dean Herbert
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4 Remove usage of SetExclusive 
Also immediately disposes WorkingBeatmaps on ValueChanged.
 2017-07-20 16:45:44 +09:00
Jorolf
bac8693c81 Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes 2017-07-20 01:08:42 +02:00
Jorolf
e0fb2563b5 remove using 2017-07-20 01:08:26 +02:00
jorolf
c2a2f77210 Merge branch 'master' into user-profile-fixes 2017-07-20 01:06:36 +02:00
Jorolf
b016103894 add link to user page 2017-07-20 01:03:00 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-19 19:15:51 +02:00
Dean Herbert
2c5019ff7c Forward action in saner way 2017-07-19 18:22:46 +09:00
Dean Herbert
b6b7ae47db Merge branch 'master' into user-profile-fixes 2017-07-19 18:15:38 +09:00
Dean Herbert
2eccb3822a Make link text not suck 2017-07-19 17:54:04 +09:00
Dean Herbert
59416584c1 Don't show theme song in playlist 2017-07-19 15:16:35 +09:00
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
 2017-07-18 15:16:02 +03:00
Thomas Müller
a225b542d5 Sender is always non-null 2017-07-18 12:35:36 +03:00
Thomas Müller
fce5a191f1 Migrate padding into the scroll content to not cut off effects 2017-07-18 12:26:27 +03:00
Thomas Müller
e58ea97604 Improve design as requested 2017-07-18 12:26:05 +03:00
Thomas Müller
c8eeea64c3 Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours 2017-07-18 10:54:15 +03:00
Thomas Müller
e72c009dd7 Highlight custom-named users 2017-07-18 10:53:41 +03:00
Dean Herbert
4b4b03756a Don't use dodgy OnLoaded "event" 2017-07-18 15:37:58 +09:00
Dean Herbert
82217be988 Fix dodgy event clearing 
Also use local ariables where possible.
 2017-07-18 15:24:52 +09:00
Dean Herbert
c5d23daa6b Merge remote-tracking branch 'upstream/master' into remove-dragbar 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-07-18 13:44:23 +09:00
Dean Herbert
4229f933fe Rename link class, add hover colour 2017-07-18 10:51:11 +09:00
Jorolf
9c70d03a33 replace SpriteText with OsuSpriteText 2017-07-17 21:12:50 +02:00
Jorolf
80dc888769 address CI concerns 2017-07-17 21:11:54 +02:00
Jorolf
edd4e622cf add hyper links to twitter, website and skype 2017-07-17 20:31:10 +02:00
Jorolf
b9eb7a8445 make chat message users open UserProfileOverlay 2017-07-17 20:26:55 +02:00
Jorolf
689866f5dd minor improvements 2017-07-17 20:25:57 +02:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Dean Herbert
93290ef966 Rename populate method 2017-07-17 13:56:50 +09:00