smoogipoo
|
4c571acd67
|
Reinstantiate mods for every player
|
2019-04-09 13:33:16 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
David Zhao
|
a690302d00
|
Apply reviews
|
2019-04-08 15:24:09 +09:00 |
|
DrabWeb
|
e76897d6a7
|
Fix ResumeContainers appearing when resuming during breaks.
|
2019-04-07 16:32:55 -03:00 |
|
Dean Herbert
|
46ecaf3d6c
|
Merge branch 'master' into facade-container
|
2019-04-05 21:14:21 +09:00 |
|
David Zhao
|
7047f305a1
|
Apply reviews, add safety for multiple facades
|
2019-04-05 12:02:47 +09:00 |
|
David Zhao
|
b2857384b8
|
Remove unnecessary logo assignment
|
2019-04-04 12:08:05 +09:00 |
|
David Zhao
|
15b2b6af7d
|
Clean up remaining assignments of logo relativePositionAxes
|
2019-04-04 11:28:36 +09:00 |
|
David Zhao
|
8a40b27e8f
|
Remove need for logo relativePositionAxes none
|
2019-04-03 20:32:53 +09:00 |
|
David Zhao
|
2ed945605e
|
Fix Axes.None requirement for FacadeContainer
|
2019-04-03 19:57:22 +09:00 |
|
Dean Herbert
|
efd7bea771
|
Add further xmldoc
|
2019-04-03 17:01:11 +09:00 |
|
Dean Herbert
|
50f8ab3dfb
|
Fix gameplay offset handling on seeks
|
2019-04-03 16:58:20 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
David Zhao
|
020be50f03
|
Merge remote-tracking branch 'upstream/master' into facade-container
|
2019-04-02 11:28:44 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
David Zhao
|
952a12bb19
|
Return logo relativepositionaxes on content out
|
2019-03-29 16:54:34 +09:00 |
|
Dean Herbert
|
6949c233bf
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 15:02:12 +09:00 |
|
Dean Herbert
|
202a0086cc
|
Merge branch 'master' into better-player-flags
|
2019-03-29 13:45:45 +09:00 |
|
Dean Herbert
|
fed58fba3a
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 12:14:28 +09:00 |
|
Dan Balasescu
|
d410054ec8
|
Merge branch 'master' into key-counter-display
|
2019-03-29 11:22:59 +09:00 |
|
Dean Herbert
|
7715606188
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-29 11:15:34 +09:00 |
|
David Zhao
|
9d66a5e4b2
|
Ensure logo stops tracking before suspend animation
|
2019-03-28 16:29:35 +09:00 |
|
David Zhao
|
039e451ab1
|
ensure logo is where it already needs to be on resume
|
2019-03-28 16:14:28 +09:00 |
|
David Zhao
|
bfe44eb33d
|
Remove SizeForFlow magic number
|
2019-03-28 15:40:58 +09:00 |
|
David Zhao
|
061527a260
|
Add new automated tests for logofacade, reset interpolation
|
2019-03-27 20:04:01 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
David Zhao
|
2e3791be1c
|
Fix incorrect usage of LogoFacade
|
2019-03-27 18:11:12 +09:00 |
|
David Zhao
|
ca7a20585d
|
Apply reviews, delete playerloader test
|
2019-03-27 17:28:53 +09:00 |
|
David Zhao
|
384eee3395
|
Remove DI requirement for the Facade in PlayerLoader
|
2019-03-27 11:32:26 +09:00 |
|
David Zhao
|
3fe52be77f
|
Better tests, add documentation
|
2019-03-26 17:22:36 +09:00 |
|
Dean Herbert
|
a88f23e555
|
Convert remaining two flags to ctor parameters
|
2019-03-26 16:53:44 +09:00 |
|
Dean Herbert
|
83863d35c3
|
Remove AllowLeadIn flag
|
2019-03-26 16:35:00 +09:00 |
|
Dean Herbert
|
8658de5108
|
Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
|
2019-03-26 13:52:48 +09:00 |
|
Dean Herbert
|
b4d785c76c
|
Don't update gameplay loop while paused
|
2019-03-26 13:36:17 +09:00 |
|
Dean Herbert
|
256a579de0
|
Allow player to not pause on focus loss
|
2019-03-26 13:17:00 +09:00 |
|
Dean Herbert
|
b75ea295db
|
Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
|
2019-03-26 11:28:43 +09:00 |
|
David Zhao
|
35bf262d19
|
Merge remote-tracking branch 'upstream/master' into facade-container
|
2019-03-26 11:11:13 +09:00 |
|
David Zhao
|
a0f6718145
|
Better tests and implementation
|
2019-03-26 10:48:29 +09:00 |
|
Dean Herbert
|
245f463e3f
|
Don't update gameplay loop while paused
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
8ad4009c33
|
osu! resume overlay
|
2019-03-25 20:31:55 +09:00 |
|
David Zhao
|
d37968d88d
|
Add better test for facade containers
|
2019-03-24 15:18:38 +09:00 |
|
Dean Herbert
|
11b474e194
|
Handle released for safety
|
2019-03-24 12:19:09 +09:00 |
|
Dean Herbert
|
0d72104235
|
Refactor for formatting sanity
|
2019-03-24 12:03:06 +09:00 |
|
Dean Herbert
|
8ad19fc2d4
|
Merge branch 'master' into menu-globalaction-select
|
2019-03-24 11:58:52 +09:00 |
|
David Zhao
|
6e98a8dd7c
|
Initial implementation
|
2019-03-22 20:01:58 +09:00 |
|
David Zhao
|
e93311fdc9
|
DI facade
|
2019-03-22 19:01:32 +09:00 |
|
Dean Herbert
|
9e6cdd7bd5
|
Combine conditionals and clarify comment
|
2019-03-22 14:42:51 +09:00 |
|
Dean Herbert
|
5b8fd6822e
|
Move storyboard logic region down
|
2019-03-22 14:39:20 +09:00 |
|
Dean Herbert
|
15f9a6b9df
|
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
|
2019-03-21 16:04:18 +09:00 |
|
Dean Herbert
|
67a65b80fc
|
Merge branch 'master' into visual-settings-container
|
2019-03-20 20:48:30 +09:00 |
|
Dean Herbert
|
ba89bfee0c
|
Define explicit method to add background
Also cleans up some redundant/misplaced comments.
|
2019-03-20 20:16:45 +09:00 |
|
Dean Herbert
|
8865d53992
|
Reword comment
|
2019-03-20 20:04:07 +09:00 |
|
David Zhao
|
2e9d823af4
|
Add comment regarding HandlePositionalInput
|
2019-03-20 19:59:54 +09:00 |
|
David Zhao
|
2ff7aa6c2e
|
Remove handle positional input
|
2019-03-20 19:49:37 +09:00 |
|
David Zhao
|
bc6e8ce7b4
|
Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
|
2019-03-20 19:48:57 +09:00 |
|
Dean Herbert
|
01f795b046
|
Make restart public rather than reimplementing
|
2019-03-20 19:45:04 +09:00 |
|
David Zhao
|
8543e8c36f
|
Put loadcomplete next to other protected overrides
|
2019-03-20 19:42:39 +09:00 |
|
Dean Herbert
|
cda5bc28c8
|
Add proper comment
|
2019-03-20 19:41:20 +09:00 |
|
David Zhao
|
9013afe412
|
Query for input manager once
|
2019-03-20 19:35:40 +09:00 |
|
David Zhao
|
fbfef844de
|
Add test case for resuming PlayerLoader
|
2019-03-20 17:18:42 +09:00 |
|
David Zhao
|
a5916f995e
|
Use the previous conditional instead
|
2019-03-20 16:54:42 +09:00 |
|
David Zhao
|
e9034c8a30
|
Move blurring logic into Update instead
|
2019-03-20 16:50:47 +09:00 |
|
Dean Herbert
|
f43e7a880c
|
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
|
2019-03-20 15:27:06 +09:00 |
|
Dean Herbert
|
6f1610be79
|
Merge branch 'master' into ruleset-container-refactor
|
2019-03-20 14:55:58 +09:00 |
|
Dean Herbert
|
5f288650bf
|
Fix misses/typos
|
2019-03-20 14:49:33 +09:00 |
|
David Zhao
|
15637f9c4a
|
Rework instant blur logic such that updateVisuals doesn't need to be public
|
2019-03-20 14:17:35 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
68f28326a2
|
Refactor RulesetContainer for readability
|
2019-03-19 20:21:31 +09:00 |
|
David Zhao
|
a8e2072286
|
Make blurtarget private, improve documentation
|
2019-03-19 20:15:28 +09:00 |
|
David Zhao
|
dc26e90a8d
|
Remove unused usings
|
2019-03-19 13:16:06 +09:00 |
|
David Zhao
|
df37973e84
|
Move showstoryboard into player
|
2019-03-19 13:13:19 +09:00 |
|
David Zhao
|
27a92e017c
|
rename back to UserDimContainer
|
2019-03-19 13:06:14 +09:00 |
|
David Zhao
|
f1b2073bf6
|
Merge remote-tracking branch 'upstream/master' into visual-settings-container
|
2019-03-19 13:01:05 +09:00 |
|
Dean Herbert
|
4f075f4740
|
Add more comprehensive testing
|
2019-03-18 20:33:43 +09:00 |
|
Dean Herbert
|
9433a97747
|
Add resume requesting support and fix exit scenarios
|
2019-03-18 20:33:43 +09:00 |
|
Dean Herbert
|
536b5e0dab
|
Remove PausableGameplayContainer
|
2019-03-18 20:33:43 +09:00 |
|
Dean Herbert
|
f13003c53b
|
Simplify and localise storyboard logic in Player.cs
|
2019-03-18 20:33:43 +09:00 |
|
Dean Herbert
|
bcaff9f7b4
|
Add basic pause tests
|
2019-03-18 20:33:43 +09:00 |
|
Dean Herbert
|
465c95e952
|
Refactor pause logic so GameplayClockContainer is in control
|
2019-03-18 20:33:43 +09:00 |
|
Dean Herbert
|
14df9f94e2
|
Merge branch 'master' into fix-background-loading
|
2019-03-18 14:59:35 +09:00 |
|
Dan Balasescu
|
e0b3149e32
|
Merge branch 'master' into api-testability
|
2019-03-18 10:59:06 +09:00 |
|
David Zhao
|
8fc90bb9a0
|
Remove unused usings
|
2019-03-14 16:26:34 +09:00 |
|
David Zhao
|
8cdfb1fd61
|
Remove BlurrableBackgroundScreen, rework tests
|
2019-03-14 16:09:17 +09:00 |
|
David Zhao
|
8714902349
|
Handle all blurring directly from background
|
2019-03-14 14:02:46 +09:00 |
|
Dean Herbert
|
0042cc5337
|
Merge branch 'master' into mod-ramp-hotfix
|
2019-03-14 13:02:29 +09:00 |
|
David Zhao
|
de6d8fc637
|
Move user blurring into VIsualSettingsContainer
|
2019-03-13 18:25:22 +09:00 |
|
Dean Herbert
|
f0114d776d
|
Use interface to access API
Allows for better testability.
|
2019-03-13 12:58:18 +09:00 |
|
Dean Herbert
|
c1a356161f
|
Allow use rate adjust to fallback to clock rate adjust
|
2019-03-12 18:14:01 +09:00 |
|
Dean Herbert
|
3c2d8cad0a
|
Add better async logic for ScreenWithBeatmapBackground
|
2019-03-12 17:32:40 +09:00 |
|
Dean Herbert
|
cdeaa80fea
|
Call ResetSpeedAdjustments before adjusting clock
|
2019-03-12 11:35:25 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
1be4c7b813
|
Fix excess newline
|
2019-03-12 02:23:23 +09:00 |
|
Dean Herbert
|
38e75421ab
|
Fix HoldForMenuButton getting stuck in a confirming state
Closes #4446.
|
2019-03-12 02:21:34 +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 |
|
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 |
|