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

17226 Commits

Author SHA1 Message Date
jorolf f3ab5070b9 apply suggestions 2019-03-11 18:37:36 +01:00
jorolf af1c54d995 add ScreenTitle class 2019-03-08 23:44:01 +01:00
Dean Herbert 312efbdc34
Merge pull request #4440 from peppy/update-framework 
Update framework
 2019-03-08 22:46:43 +09:00
Dean Herbert 10734b774c Update framework 2019-03-08 20:48:50 +09:00
Dean Herbert 843a37721d
Merge pull request #4157 from LeNitrous/mod-wind 
Add "Wind Up" and "Wind Down" mods
 2019-03-08 20:32:43 +09:00
Dean Herbert 48e54c84c1
Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
Dan Balasescu a40a0f10bd
Merge pull request #4431 from peppy/gameplay-clock-container 
Simplify gameplay clock logic with a dedicated container
 2019-03-08 16:05:48 +09:00
smoogipoo d055b248ac Remove blank line 2019-03-08 15:56:36 +09:00
smoogipoo 7c5ca67691 Merge remote-tracking branch 'origin/master' into gameplay-clock-container 
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
 2019-03-08 15:54:15 +09:00
Dan Balasescu 253a37c8a7
Merge pull request #4436 from peppy/fix-non-async-load 
Fix some non-async load scenarios
 2019-03-08 15:49:02 +09:00
Dan Balasescu c967875ff6
Merge branch 'master' into fix-non-async-load 2019-03-08 15:14:37 +09:00
smoogipoo e00702f4e4 Merge remote-tracking branch 'origin/master' into fix-non-async-load 2019-03-08 15:14:14 +09:00
smoogipoo 09b5cf4891 Move sizing to ctor 2019-03-08 15:14:07 +09:00
Dan Balasescu 7bf60934a5
Merge pull request #4418 from peppy/cursor-in-playfield 
Fix gameplay cursor discrepancies
 2019-03-08 15:12:26 +09:00
Dean Herbert ed8c9bc88a Merge remote-tracking branch 'upstream/master' into gameplay-clock-container 2019-03-08 15:07:55 +09:00
Dean Herbert 42efea1e06 Apply review 2019-03-08 15:05:45 +09:00
Dean Herbert a73e3d9700 Move cursor construction to BDL 2019-03-08 15:01:45 +09:00
Dean Herbert 2c98ba1c0c Split out consumption and creation into two separate code paths 2019-03-08 14:59:45 +09:00
Dean Herbert 3ccc76e18f Merge remote-tracking branch 'upstream/master' into cursor-in-playfield 2019-03-08 14:50:46 +09:00
Dan Balasescu 398c330934
Merge pull request #4420 from nekodex/fix-roomstate-on-cancel 
Fix RoomInspector image inadvertently changing when cancelling MP room creation
 2019-03-08 14:30:17 +09:00
Dan Balasescu 969d5bcbd0
Merge branch 'master' into fix-roomstate-on-cancel 2019-03-08 14:10:24 +09:00
Dan Balasescu 93ae058681
Merge pull request #4410 from peppy/fix-cursor-in-scale-container 
Fix menu cursor not displaying outside of gameplay scaling area
 2019-03-08 14:06:58 +09:00
Dean Herbert 400514630d
Fix incomplete comment 2019-03-08 12:44:33 +09:00
Dan Balasescu d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-08 12:43:57 +09:00
Dean Herbert c4cc72cad9
Merge pull request #4437 from peppy/fix-resharper-inspection 
Fix stuck r# inspection
 2019-03-08 12:43:17 +09:00
Jamie Taylor 08fc42f8e9
Merge branch 'master' into fix-roomstate-on-cancel 2019-03-08 12:39:29 +09:00
Dean Herbert 3a634b7d72
Merge pull request #4419 from nekodex/fix-duplicate-bg-sprites 
Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites
 2019-03-08 12:34:56 +09:00
Dean Herbert 75e94eba35
Merge branch 'master' into gameplay-clock-container 2019-03-08 12:32:48 +09:00
Dean Herbert 345c7f4fa8 Fix test regression 2019-03-08 12:30:52 +09:00
Dean Herbert 5ade51f030
Merge branch 'master' into fix-resharper-inspection 2019-03-08 12:29:56 +09:00
Dean Herbert 30a0bb4a25
Merge branch 'master' into fix-duplicate-bg-sprites 2019-03-08 12:25:23 +09:00
Dean Herbert 196ebab10f
Merge pull request #4434 from peppy/fix-autoplay-tests 
Fix replay tests not working
 2019-03-08 12:21:33 +09:00
Dean Herbert d01b026ebd Fix stuck r# inspection 2019-03-08 12:16:12 +09:00
Dean Herbert 075ea70124 Move more toolbar to async load 2019-03-08 12:15:27 +09:00
Dean Herbert 11e5c6a2a0 Fire initial APIStateChanged on local thread 2019-03-08 12:15:27 +09:00
Dan Balasescu 101009c92e
Merge branch 'master' into fix-autoplay-tests 2019-03-08 12:14:40 +09:00
Dan Balasescu 272ebeb23d
Merge pull request #4435 from peppy/update-framework-and-prs 
Update framework
 2019-03-08 10:59:28 +09:00
Dean Herbert cfac47413c Disable failing tests temporarily 2019-03-08 10:42:25 +09:00
Dean Herbert 340997f505 Rename remaining usage of PathWidth naming convention 2019-03-07 20:21:59 +09:00
Dean Herbert 27edc41c11 Update framework 2019-03-07 20:14:43 +09:00
Dean Herbert 5ab9f45a8f Merge branch 'drawnode-changes' 2019-03-07 20:10:42 +09:00
Dean Herbert 7fa84335ce Merge branch 'line-graph-fix' 2019-03-07 20:10:11 +09:00
Dean Herbert 1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
smoogipoo 04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00
smoogipoo e430b8a640 Merge remote-tracking branch 'nekodex/master' into drawnode-changes 2019-03-07 18:15:12 +09:00
David Zhao b3e046c4d1 Rename PathWidth to PathRadius 2019-03-07 17:39:19 +09:00
David Zhao b2f4850275 Apply twice the line radius in order to properly account for diameter 2019-03-07 17:25:51 +09:00
Jamie Taylor c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel 2019-03-07 17:01:24 +09:00
Jamie Taylor 50c1b3a576
Move room resetting logic from MatchSubScreen to LoungeSubScreen 2019-03-07 16:49:48 +09:00
Dean Herbert c9ca5098d9
Merge pull request #4430 from peppy/jit-abbreviation 
Add JIT as abbreviation
 2019-03-07 16:17:37 +09:00