|
|
ed8c9bc88a
|
Merge remote-tracking branch 'upstream/master' into gameplay-clock-container
|
2019-03-08 15:07:55 +09:00 |
|
|
|
42efea1e06
|
Apply review
|
2019-03-08 15:05:45 +09:00 |
|
|
|
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 |
|
|
|
969d5bcbd0
|
Merge branch 'master' into fix-roomstate-on-cancel
|
2019-03-08 14:10:24 +09:00 |
|
|
|
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 |
|
|
|
d1c18c52ab
|
Merge branch 'master' into fix-cursor-in-scale-container
|
2019-03-08 12:43:57 +09:00 |
|
|
|
c4cc72cad9
|
Merge pull request #4437 from peppy/fix-resharper-inspection
Fix stuck r# inspection
|
2019-03-08 12:43:17 +09:00 |
|
|
|
08fc42f8e9
|
Merge branch 'master' into fix-roomstate-on-cancel
|
2019-03-08 12:39:29 +09:00 |
|
|
|
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 |
|
|
|
75e94eba35
|
Merge branch 'master' into gameplay-clock-container
|
2019-03-08 12:32:48 +09:00 |
|
|
|
5ade51f030
|
Merge branch 'master' into fix-resharper-inspection
|
2019-03-08 12:29:56 +09:00 |
|
|
|
30a0bb4a25
|
Merge branch 'master' into fix-duplicate-bg-sprites
|
2019-03-08 12:25:23 +09:00 |
|
|
|
196ebab10f
|
Merge pull request #4434 from peppy/fix-autoplay-tests
Fix replay tests not working
|
2019-03-08 12:21:33 +09:00 |
|
|
|
d01b026ebd
|
Fix stuck r# inspection
|
2019-03-08 12:16:12 +09:00 |
|
|
|
101009c92e
|
Merge branch 'master' into fix-autoplay-tests
|
2019-03-08 12:14:40 +09:00 |
|
|
|
272ebeb23d
|
Merge pull request #4435 from peppy/update-framework-and-prs
Update framework
|
2019-03-08 10:59:28 +09:00 |
|
|
|
cfac47413c
|
Disable failing tests temporarily
|
2019-03-08 10:42:25 +09:00 |
|
|
|
340997f505
|
Rename remaining usage of PathWidth naming convention
|
2019-03-07 20:21:59 +09:00 |
|
|
|
27edc41c11
|
Update framework
|
2019-03-07 20:14:43 +09:00 |
|
|
|
5ab9f45a8f
|
Merge branch 'drawnode-changes'
|
2019-03-07 20:10:42 +09:00 |
|
|
|
7fa84335ce
|
Merge branch 'line-graph-fix'
|
2019-03-07 20:10:11 +09:00 |
|
|
|
1f44dde96b
|
Fix autoplay tests not working
|
2019-03-07 18:34:56 +09:00 |
|
|
|
04d756524d
|
Adjust with shader changes
|
2019-03-07 18:30:18 +09:00 |
|
|
|
e430b8a640
|
Merge remote-tracking branch 'nekodex/master' into drawnode-changes
|
2019-03-07 18:15:12 +09:00 |
|
|
|
b3e046c4d1
|
Rename PathWidth to PathRadius
|
2019-03-07 17:39:19 +09:00 |
|
|
|
b2f4850275
|
Apply twice the line radius in order to properly account for diameter
|
2019-03-07 17:25:51 +09:00 |
|
|
|
c34e110a2c
|
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
|
2019-03-07 17:01:24 +09:00 |
|
|
|
50c1b3a576
|
Move room resetting logic from MatchSubScreen to LoungeSubScreen
|
2019-03-07 16:49:48 +09:00 |
|
|
|
c9ca5098d9
|
Merge pull request #4430 from peppy/jit-abbreviation
Add JIT as abbreviation
|
2019-03-07 16:17:37 +09:00 |
|
|
|
ae4ca2cb66
|
Merge branch 'master' into fix-duplicate-bg-sprites
|
2019-03-07 16:11:33 +09:00 |
|
|
|
235865ef8f
|
Merge pull request #4427 from nekodex/fix-mp-chat-in-own-room
Fix inability to send messages to a newly created room
|
2019-03-07 16:11:10 +09:00 |
|
|
|
64b6eaa844
|
Simplify inward bindings
|
2019-03-07 16:04:11 +09:00 |
|
|
|
57204b4361
|
Add JIT as abbreviation
|
2019-03-07 16:03:24 +09:00 |
|
|
|
58ef397f4f
|
Move all clock related gameplay logic inside GameplayClockContainer
|
2019-03-07 16:02:24 +09:00 |
|
|
|
7783c33398
|
Merge branch 'master' into fix-mp-chat-in-own-room
|
2019-03-07 15:59:53 +09:00 |
|
|
|
0b4f10950f
|
Merge pull request #4424 from nekodex/fix-mp-songselect-regression
Fix crash on cancelling multiplayer song select when no existing song is selected
|
2019-03-07 15:40:20 +09:00 |
|
|
|
ee076bbbe3
|
Fix chat channel ids not being updated on room creation
|
2019-03-07 15:35:57 +09:00 |
|
|
|
e13516c2ba
|
Only attempt to restore CurrentItem state if present
|
2019-03-07 14:09:28 +09:00 |
|
|
|
d97c070ef1
|
Account for path width correctly in LineGraph
|
2019-03-07 13:45:55 +09:00 |
|
|
|
6e5ea78ca2
|
Fix some nullref crashes when escaping out of new room creation
|
2019-03-06 20:03:37 +09:00 |
|
|
|
5de6e29294
|
Reset currentRoom state when cancelling room creation
|
2019-03-06 20:03:37 +09:00 |
|
|
|
8a69fc5534
|
Use AddUntilStep instead of AddWaitStep
|
2019-03-06 19:57:09 +09:00 |
|
|
|
b5e89e2f3b
|
Add additional testing to check for extra children in the future
|
2019-03-06 19:13:25 +09:00 |
|
|
|
ab0ac7a82a
|
Pass through timeBeforeLoad instead of hardcoding
|
2019-03-06 19:12:37 +09:00 |
|
|
|
06b65e00c4
|
Prevent null beatmap from creating an extra drawable
|
2019-03-06 19:12:28 +09:00 |
|
|
|
eb80549782
|
Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites
|
2019-03-06 19:12:22 +09:00 |
|
|
|
00cdb3a44a
|
Merge pull request #4400 from nyquillerium/LobbyList
Use correct background display type for multiplayer lobby listing
|
2019-03-06 13:34:15 +09:00 |
|
|
|
9441f88033
|
Use actual reference to default beatmap for fallback
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
|
2019-03-06 13:01:37 +09:00 |
|
|
|
b94d080b1c
|
Merge branch 'master' into LobbyList
|
2019-03-06 12:34:36 +09:00 |
|
|
|
6b042eae94
|
Merge branch 'master' into fix-cursor-in-scale-container
|
2019-03-05 22:22:56 +09:00 |
|
