|
|
e36ad3eb6b
|
Add initial alpha in case
|
2019-03-19 16:11:22 +09:00 |
|
|
|
d2007cfb38
|
Fix weird transition
|
2019-03-19 16:10:28 +09:00 |
|
|
|
83f3d3abde
|
Merge remote-tracking branch 'upstream/master' into disclaimer-support-text
|
2019-03-19 16:02:34 +09:00 |
|
|
|
392a0a1d74
|
Merge branch 'master' into update-framework
|
2019-03-18 11:34:59 +09:00 |
|
|
|
e0b3149e32
|
Merge branch 'master' into api-testability
|
2019-03-18 10:59:06 +09:00 |
|
|
|
c496f6e56b
|
Fix usages of OnLoadComplete
|
2019-03-17 13:44:20 +09:00 |
|
|
|
36e5c09710
|
Merge pull request #4433 from nekodex/prevent-null-lookup
Don't perform lookup of beatmap stats unless an online id is present
|
2019-03-15 10:39:39 +09:00 |
|
|
|
69eb4ef983
|
Change updateMetrics parameter to be optional
|
2019-03-14 13:35:49 +09:00 |
|
|
|
0042cc5337
|
Merge branch 'master' into mod-ramp-hotfix
|
2019-03-14 13:02:29 +09:00 |
|
|
|
dd6fbccb56
|
Slight refactoring of order for readability
|
2019-03-13 19:57:45 +09:00 |
|
|
|
7a2af5634c
|
Merge remote-tracking branch 'upstream/master' into prevent-null-lookup
|
2019-03-13 14:13:50 +09:00 |
|
|
|
e6449db8e3
|
Null metrics on null beatmap for transition animation
|
2019-03-13 14:13:42 +09:00 |
|
|
|
b1f18481e0
|
Show text to supporters telling them they're cool
Also adds better tests for disclaimer screen.
|
2019-03-13 12:58:42 +09:00 |
|
|
|
f0114d776d
|
Use interface to access API
Allows for better testability.
|
2019-03-13 12:58:18 +09:00 |
|
|
|
c1a356161f
|
Allow use rate adjust to fallback to clock rate adjust
|
2019-03-12 18:14:01 +09:00 |
|
|
|
cdeaa80fea
|
Call ResetSpeedAdjustments before adjusting clock
|
2019-03-12 11:35:25 +09:00 |
|
|
|
13b3036ec6
|
Fix "wind" mods adjusting rate twice
This is a hotfix for incorrect framework behaviour.
Closes #4442
|
2019-03-12 02:45:45 +09:00 |
|
|
|
1be4c7b813
|
Fix excess newline
|
2019-03-12 02:23:23 +09:00 |
|
|
|
38e75421ab
|
Fix HoldForMenuButton getting stuck in a confirming state
Closes #4446.
|
2019-03-12 02:21:34 +09:00 |
|
|
|
0fc6fa7245
|
Fix file naming on ParticipantCountDisplay
|
2019-03-09 20:29:56 -08:00 |
|
|
|
9df27f3a5f
|
Merge branch 'master' into prevent-null-lookup
|
2019-03-09 11:14:54 +09:00 |
|
|
|
8e5816805c
|
Fix showing outdated data for non-online beatmaps
|
2019-03-08 18:44:35 +09:00 |
|
|
|
d055b248ac
|
Remove blank line
|
2019-03-08 15:56:36 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3ccc76e18f
|
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
|
2019-03-08 14:50:46 +09:00 |
|
|
|
969d5bcbd0
|
Merge branch 'master' into fix-roomstate-on-cancel
|
2019-03-08 14:10:24 +09:00 |
|
|
|
d1c18c52ab
|
Merge branch 'master' into fix-cursor-in-scale-container
|
2019-03-08 12:43:57 +09:00 |
|
|
|
08fc42f8e9
|
Merge branch 'master' into fix-roomstate-on-cancel
|
2019-03-08 12:39:29 +09:00 |
|
|
|
75e94eba35
|
Merge branch 'master' into gameplay-clock-container
|
2019-03-08 12:32:48 +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 |
|
|
|
c34e110a2c
|
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
|
2019-03-07 17:01:24 +09:00 |
|
|
|
054db48089
|
Move online id null check to only bypass metrics lookup
|
2019-03-07 16:59:43 +09:00 |
|
|
|
50c1b3a576
|
Move room resetting logic from MatchSubScreen to LoungeSubScreen
|
2019-03-07 16:49:48 +09:00 |
|
|
|
e5e454ddcd
|
Don't perform lookup of beatmap stats unless an online id is present
|
2019-03-07 16:17:12 +09:00 |
|
|
|
64b6eaa844
|
Simplify inward bindings
|
2019-03-07 16:04:11 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ffe53411f6
|
Add back cursor proxying
|
2019-03-06 17:44:58 +09:00 |
|
|
|
acf518c208
|
Move cursor inside playfield
|
2019-03-06 17:41:54 +09:00 |
|
|
|
5411c63093
|
Fix menu cursor not displaying outside of gameplay scaling area
|
2019-03-06 17:14:08 +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 |
|
|
|
8a6fa0915e
|
Merge branch 'master' into simplify-gameplay-clock
|
2019-03-05 20:22:46 +09:00 |
|
