RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,474 Commits 3 Branches 658 Tags 353 MiB
Commit Graph

13474 Commits

Author SHA1 Message Date
Dean Herbert e550b3f52b Turn cache back on for chocolatey packages 2018-07-11 18:25:55 +09:00
Dean Herbert a03db2e5fd
Merge pull request #2948 from ekrctb/fix-disable-mouse 
Fix "disable mouse buttons" not working
 2018-07-11 18:04:44 +09:00
Dean Herbert 24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dean Herbert 96ef526474 Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse 2018-07-11 17:02:01 +09:00
Dean Herbert a36dbc3b93
Merge pull request #2988 from peppy/update-framework 
Update framework and other packages
 2018-07-10 21:02:33 +09:00
Dean Herbert 2150cb1028 Update framework and other packages 2018-07-10 20:31:04 +09:00
Dan Balasescu b0d839c5d8
Merge pull request #2986 from peppy/fix-hitsound-fallback 
Fix lack of fallback logic for custom bank samples
 2018-07-10 17:37:01 +09:00
Dan Balasescu f5504914cc
Merge branch 'master' into fix-hitsound-fallback 2018-07-10 17:19:16 +09:00
Dan Balasescu e7f3a3d9cb
Merge pull request #2945 from peppy/improve-button-system 
Improve code quality of main menu button system
 2018-07-10 17:18:53 +09:00
Dan Balasescu 40ec486152
Merge branch 'master' into improve-button-system 2018-07-10 16:44:55 +09:00
Dan Balasescu 2719657976
Merge pull request #2961 from peppy/fix-spelling 
Fix some typos and add common custom terms to R# dictionary
 2018-07-10 16:43:58 +09:00
Dan Balasescu 282a99fb88
Merge branch 'master' into fix-spelling 2018-07-10 16:32:14 +09:00
Dan Balasescu 25813ddf22
Merge pull request #2963 from peppy/fix-beatmap-links 
Fix links from profile top scores to beatmaps not working correctly
 2018-07-10 16:32:01 +09:00
smoogipoo 65d351c31a Fix failing test cases 2018-07-10 16:26:04 +09:00
Dan Balasescu ce219cda53
Merge branch 'master' into fix-beatmap-links 2018-07-10 16:20:59 +09:00
Dan Balasescu 314cb580f7
Merge pull request #2968 from peppy/generic-update-notifier 
Add notification based update path
 2018-07-10 16:20:23 +09:00
Dan Balasescu ab155e511f
Remove commented disable-once 2018-07-10 16:09:18 +09:00
Dan Balasescu 36552478e8
Merge branch 'master' into generic-update-notifier 2018-07-10 16:02:51 +09:00
Dan Balasescu b3ae460f1b
Merge pull request #2973 from peppy/fix-beatmap-id-conflicts 
Fix import failures if single set has multiple conflicting OnlineBeatmapIDs
 2018-07-10 16:02:35 +09:00
smoogipoo bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
smoogipoo 0f649cd231 Merge remote-tracking branch 'origin/master' into fix-beatmap-links 2018-07-10 16:01:56 +09:00
Dan Balasescu 8cc042bd5a
Merge branch 'master' into fix-beatmap-id-conflicts 2018-07-10 15:49:30 +09:00
Dan Balasescu b3c9af3553
Merge pull request #2976 from peppy/fix-right-mouse-absolute 
Fix right mouse activated absolute scroll not working
 2018-07-10 15:49:24 +09:00
Dean Herbert 6dffb1147c
Merge branch 'master' into fix-right-mouse-absolute 2018-07-10 15:34:03 +09:00
Dan Balasescu ede95b6954
Merge branch 'master' into fix-hitsound-fallback 2018-07-10 15:31:15 +09:00
Dan Balasescu 5ad45b2d42
Merge pull request #2984 from peppy/fix-toolbar-ruleset-selector 
Fix toolbar ruleset selector breaking at main menu
 2018-07-10 15:31:03 +09:00
Dean Herbert 14c3cc70b1
Prefer namespace lookups first 2018-07-10 15:23:47 +09:00
Dean Herbert ba258b8a05 Fix lack of fallback logic for custom bank samples 
Closes #2966.

---

Was causing some beatmaps to not play all of their hitsounds
 2018-07-10 02:56:22 +09:00
Dean Herbert 9e59b4a8e2 Fix SongSelect binding to ruleset too early 
Causes music to stop playing while at main menu.
 2018-07-10 01:29:24 +09:00
Dean Herbert 974c4f5185 ToolbarMode* -> ToolbarRuleset* 2018-07-10 01:20:21 +09:00
Dean Herbert abfebbddd9 Update framework 2018-07-09 23:50:45 +09:00
Dean Herbert 472aed8c91
Merge pull request #2979 from peppy/fix-osd-fade-in 
Fix OSD fade-in not correctly debouncing
 2018-07-09 19:19:09 +09:00
Dean Herbert 1670f4fe31
Merge branch 'master' into fix-osd-fade-in 2018-07-09 19:10:57 +09:00
Dean Herbert 37f0095ae5
Merge pull request #2980 from peppy/fix-exit-race-condition 
Fix pressing escape too fast causing multiple exit attempts at song select
 2018-07-09 19:10:41 +09:00
Dan Balasescu ee4607c86e
Merge branch 'master' into fix-exit-race-condition 2018-07-09 19:02:37 +09:00
Dan Balasescu 34db414672
Merge pull request #2981 from peppy/fix-early-player-entry 
Fix being able to trigger player before carousel is ready
 2018-07-09 19:02:09 +09:00
Dean Herbert 49e94850b6 Fix being able to trigger player before carousel is ready 
Causes an eventual crash.
 2018-07-09 18:43:20 +09:00
Dean Herbert ce0a7d7760
Merge pull request #2978 from HoutarouOreki/removeAge 
Remove unused age display code
 2018-07-09 18:17:12 +09:00
Dean Herbert 09b3375a9d Fix pressing escape too fast causing multiple exit attempts at song select 2018-07-09 18:12:23 +09:00
Dean Herbert df67c0498d Fix OSD fade-in not correctly debouncing 
It could potentially never fade in on quick presses.
 2018-07-09 17:53:39 +09:00
Dean Herbert 6ced51bb67
Merge branch 'master' into removeAge 2018-07-09 17:43:23 +09:00
Dean Herbert 10cc95427d
Merge pull request #2977 from smoogipoo/fix-nullrefs 
Fix some possible null reference exceptions
 2018-07-09 17:43:01 +09:00
HoutarouOreki 10aae3b0ee Remove age from User class 2018-07-09 10:33:46 +02:00
HoutarouOreki 930667d0f9 Remove unused age display code 2018-07-09 10:12:10 +02:00
smoogipoo 0a67e5a274 Fix some possible null reference exceptions 2018-07-09 17:09:17 +09:00
Jarosław Zgierski 1444715641
Merge pull request #1 from ppy/master 
Sync to upstream repo
 2018-07-09 09:07:59 +02:00
Dean Herbert b20afb915d Fix right mouse activated absolute scroll not working 2018-07-09 15:26:22 +09:00
Dean Herbert e223074876 Fix import failures if single set has multiple conflicting OnlineBeatmapIDs 
Resolves #2970.
 2018-07-09 00:24:55 +09:00
Dean Herbert 27311ce1fc
Update nuget restore instructions 2018-07-08 11:21:18 +09:00