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

8973 Commits

Author SHA1 Message Date
smoogipoo 2f1063c5c0 Refactor into separate files + add xmldocs + rename some methods 2017-12-11 21:56:58 +09:00
smoogipoo c12c241633 Implement hover colours 2017-12-11 21:27:19 +09:00
smoogipoo 25d80a36be Finish up logical implementation of markers 2017-12-11 21:03:34 +09:00
smoogipoo 5147b342dc More refactorings + add markers 
Move
 2017-12-11 19:07:40 +09:00
smoogipoo b28306d3c0 Fix incorrect SelectionPoint 2017-12-11 18:08:16 +09:00
smoogipoo 4573cc3322 Refactor into a new DragBox class, representing a single drag 2017-12-11 17:45:03 +09:00
smoogipoo 7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
Dan Balasescu 8769f93929
Merge pull request #1684 from peppy/add-ruleset-shortname 
Add ShortName to RulesetInfo
 2017-12-11 16:02:11 +09:00
Dean Herbert 08727266e7
Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
Dean Herbert 597e87b91d
Merge pull request #1683 from UselessToucan/HandleInput 
Populate HandleInput
 2017-12-11 15:40:33 +09:00
Dean Herbert 04715f9a51
Merge branch 'master' into HandleInput 2017-12-11 15:24:29 +09:00
Dean Herbert 4fffe32d69
Merge pull request #1657 from Aergwyn/fix-crash-hidden-sets#2 
Fix crash if any amount of maps were restored from main menu
 2017-12-11 15:23:22 +09:00
smoogipoo 738d27fd1c Update framework 2017-12-11 15:21:12 +09:00
smoogipoo ed81ed7c54 Add back HandleInput disable overrides 2017-12-11 15:19:00 +09:00
Dean Herbert 5a6ac73fff
Fix broken tools making broken changes 2017-12-11 15:05:19 +09:00
Dean Herbert 77592ed15f
Fix comment formatting 2017-12-11 14:52:15 +09:00
Dean Herbert 74d261ea11 Update framework 2017-12-11 13:54:27 +09:00
Dean Herbert de1f51269d Merge branch 'master' into HandleInput 2017-12-11 13:53:33 +09:00
Dean Herbert c880386fde
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-11 13:16:30 +09:00
Dean Herbert 3407645a9f
Merge pull request #1532 from jorolf/most-played-beatmaps-section 
Add "most played" section to profile overlay
 2017-12-11 13:15:44 +09:00
Dean Herbert 7d8fb12332 DrawableScore -> DrawableProfileScore 
Discern between the other class of the same name
 2017-12-11 12:51:02 +09:00
Dean Herbert 0c2158ccbd Improve display of beatmap thumbnails 2017-12-11 12:47:31 +09:00
Dean Herbert 98ce856de1 Use more sensible names for classes and methods 
Adds xmldoc in places too.
 2017-12-11 12:33:34 +09:00
Dean Herbert 507d0e3252 Use more sensible names for classes 2017-12-11 12:26:48 +09:00
Dean Herbert 91335a83ec Remove unnecessary whitespace 2017-12-11 12:24:47 +09:00
Dean Herbert 9069f1ccba
Merge branch 'master' into most-played-beatmaps-section 2017-12-11 12:12:23 +09:00
Dean Herbert b1eb2e6dcb
Merge pull request #1685 from Aergwyn/fix-mc-ignoring-loop 
Fix MusicController ignoring Looping property of Track
 2017-12-11 00:00:40 +09:00
Aergwyn e629cebe31 fix MusicController ignoring Looping property of a Track 
my fix to prevent the MusicController from constantly trying to restart a track before accidentally removed this
 2017-12-10 13:22:46 +01:00
Aergwyn e4628427cb moved query into schedule 2017-12-10 08:15:29 +01:00
Dean Herbert 1417dfd67a
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-10 13:28:46 +09:00
Dean Herbert ba29e99b54
Merge pull request #1673 from FreezyLemon/add-testing-tag 
Added the "Service Include" tag that is used by Visual Studio's test explorer.
 2017-12-10 13:28:40 +09:00
Dean Herbert 6b63452a23
Merge branch 'master' into add-testing-tag 2017-12-10 13:09:09 +09:00
Dean Herbert e29b70f70c
Merge pull request #1674 from FreezyLemon/fix-userprofile-unranked 
Fix UserProfile crash if displayed User has rank 0 (unranked) in their 30-day history.
 2017-12-10 13:09:05 +09:00
Dean Herbert 668299ef84
Merge branch 'master' into fix-userprofile-unranked 2017-12-10 13:02:32 +09:00
Dean Herbert d02e1ae896 Update RulesetInfo and add migration 2017-12-10 12:15:55 +09:00
TocoToucan 219bdbc4e1 Populate HandleInput automatically 2017-12-09 22:21:17 +03:00
Aergwyn 821154d3bb reverted Beatmaps-setter back to its former glory 2017-12-09 08:42:59 +01:00
Dean Herbert 2fdf39586a
Merge pull request #1678 from ColdVolcano/fix-direct-preview 
Fix playing a preview in direct crashing the game
 2017-12-09 13:12:30 +09:00
Dean Herbert 16b8c9bd11
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-09 11:51:47 +09:00
ColdVolcano 1f762dc6d8 Fix PreviewBar receiving a NaN Width value 2017-12-08 15:46:09 -06:00
Dan Balasescu 9a395882a7
Merge pull request #1672 from peppy/direct-relevance-sorting 
Add support for relevance based search results in osu!direct
 2017-12-08 22:24:29 +09:00
Dean Herbert 0081c95b0a Update framework 2017-12-08 22:16:15 +09:00
Dean Herbert c1989dbafe Merge branch 'master' into direct-relevance-sorting 2017-12-08 22:15:57 +09:00
Dan Balasescu cd9c8d6d52
Merge pull request #1670 from peppy/fix-importing-some-beatmaps 
Fix checks disallowing import of older beatmaps with no embedded online IDs
 2017-12-08 21:56:54 +09:00
Dean Herbert 4160c10921
Merge branch 'master' into direct-relevance-sorting 2017-12-08 21:18:18 +09:00
Dean Herbert 40652d2e74
Merge branch 'master' into fix-importing-some-beatmaps 2017-12-08 21:18:01 +09:00
Dan Balasescu 7584c7df53
Merge pull request #1675 from FreezyLemon/fix-interests-typo 
Fixed small typo. (User.Intrerests -> Interests)
 2017-12-08 21:13:49 +09:00
Aergwyn dde7678095 select beatmap on import/download 2017-12-08 13:09:30 +01:00
FreezyLemon 856b56d79c Fixed small typo. 2017-12-08 12:54:36 +01:00
Aergwyn 3e417d8e30 removed specific AddBeatmap method 
the way UpdateBeatmapSet was extended it can handle all of this and better
 2017-12-08 12:47:28 +01:00