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

5442 Commits

Author SHA1 Message Date
Huo Yaoyuan 283b6b2b5e Merge branch 'master' into profile 2017-06-09 13:45:32 +08:00
Huo Yaoyuan 5033526070 Fix depth in SectiondContainer. 2017-06-09 13:37:55 +08:00
Dean Herbert 6047bfc3ec Merge pull request #917 from johnneijzen/master 
More Clean Up
 2017-06-08 20:39:53 +09:00
Dean Herbert a454ca606f Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
Dean Herbert b2b1c08432 Merge pull request #918 from peppy/update-framework 
Update framework
 2017-06-08 20:24:40 +09:00
Dan Balasescu ad3d6f8fb4 Merge branch 'master' into update-framework 2017-06-08 19:55:21 +09:00
Dean Herbert e3403c619c Merge branch 'better-invalidations' into update-framework 2017-06-08 19:46:19 +09:00
Thomas Müller 067a5a2401 Merge pull request #907 from Drezi126/osu-difficulty-refactor 
Refactor ppv2 to allow integration of pp+ features.
 2017-06-08 10:27:06 +02:00
Thomas Müller 0438fd2058 Merge branch 'master' into osu-difficulty-refactor 2017-06-08 10:16:11 +02:00
Dean Herbert 64682a741c Update framework 2017-06-08 17:05:25 +09:00
Tom94 5f7270ee4b Use new invalidation rules 2017-06-08 09:53:45 +02:00
John Neijzen 2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
John Neijzen d9a9616125 EOF remove blank spaces 2017-06-08 14:56:03 +08:00
John Neijzen 4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
John Neijzen 431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
Dean Herbert 8f909354bf Merge pull request #912 from johnneijzen/master 
Clean up
 2017-06-08 14:26:03 +09:00
Dean Herbert bf45155ed5 Merge branch 'master' into master 2017-06-08 12:55:25 +09:00
Dean Herbert bafd56b196 Merge pull request #915 from tacchinotacchi/unix-fix 
Fix build error on unix
 2017-06-08 12:12:30 +09:00
Drezi126 9d915a691d Fix comment placement. 2017-06-08 00:17:58 +02:00
Thomas Müller 286097d8bd Merge branch 'master' into osu-difficulty-refactor 2017-06-07 20:43:48 +02:00
Péter Nemes a0bdab9f0d Aaand docs again. 2017-06-07 20:29:03 +02:00
Alex Amadori 59e539f166 Fix build error on unix 2017-06-07 18:03:27 +02:00
Huo Yaoyuan e3cdb9f6fe Create section classes. 2017-06-07 22:53:31 +08:00
Huo Yaoyuan e94d98fa84 Expose header background for SectionsContainer. 2017-06-07 22:11:38 +08:00
John Neijzen aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00
Dean Herbert 2124ffab5a Merge pull request #914 from DrabWeb/searchable-list-padding 
Add padding to the bottom of SearchableListOverlay's ScrollFlow
 2017-06-07 22:36:15 +09:00
Huo Yaoyuan 9f9107b847 Add gray background. 2017-06-07 21:15:43 +08:00
DrabWeb 0b204bd157 Add padding to the bottom of SearchableListOverlay's ScrollFlow 2017-06-07 10:11:10 -03:00
Dan Balasescu eb6a27e420 Merge pull request #913 from peppy/update-resources 
Fix resources getting rolled back
 2017-06-07 21:28:25 +09:00
Dean Herbert e51b4bc4ee Fix resources getting rolled back 2017-06-07 21:16:41 +09:00
John Neijzen f9c466eee9 bit more readable 2017-06-07 20:12:16 +08:00
John Neijzen 23a7045eef More Clean UP 2017-06-07 20:07:18 +08:00
Dean Herbert 0198e16678 Merge pull request #859 from DrabWeb/social-browser 
Social browser
 2017-06-07 21:06:05 +09:00
John Neijzen 9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
Dean Herbert 59bed2b16e Add missing spaces 2017-06-07 20:44:54 +09:00
Dean Herbert 8d434e88ee Fix VisualTest not using placeholder data 2017-06-07 20:20:22 +09:00
Dean Herbert 94c961ddb8 CI Fixes 2017-06-07 20:16:34 +09:00
Dean Herbert 97db4856fc Add toolbar toggle button 
Also ensure chat is hidden when social is displayed and vice-versa.
 2017-06-07 20:15:58 +09:00
Dean Herbert fc2d9816df Make SearchableListHeader icon customisable 2017-06-07 20:06:02 +09:00
Dean Herbert 6a12173175 Add very temporary data source for social browser 2017-06-07 20:05:43 +09:00
Dean Herbert 1de296747f Merge remote-tracking branch 'upstream/master' into social-browser 2017-06-07 17:38:06 +09:00
Dan Balasescu f52f8326dd Merge pull request #911 from peppy/update-framework 
Bring framework up-to-date
 2017-06-07 15:42:42 +09:00
Dean Herbert 5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
Péter Nemes 1f311cca06 Fix cref in comment. 2017-06-06 19:09:26 +02:00
Péter Nemes 93f654a539 More docs, better docs. 2017-06-06 18:59:46 +02:00
Péter Nemes ce0d70d651 Whitespace fix. 2017-06-06 15:52:33 +02:00
Dan Balasescu a010e6b8db Merge pull request #910 from peppy/warnings-as-errors 
Treat inspectcode warnings as errors (CI)
 2017-06-06 22:40:38 +09:00
Péter Nemes 01585027b1 OsuDifficultyBeatmap enumeration logic made clearer, more documentation added. 2017-06-06 15:39:37 +02:00
Dean Herbert e727195187 Treat inspectcode warnings as errors (CI) 
There are many instances we accidentally merge pull requests with outstanding warnings, as the fact warnings exists is not made obvious. This forces all `inspectcode` warnings to an error level.
 2017-06-06 22:06:43 +09:00
Dean Herbert fc43445063 Merge pull request #906 from Tom94/chat-focus 
Do not release focus of the chat text box when sending a message
 2017-06-06 19:24:47 +09:00