Aergwyn
|
f86cb30e47
|
prevent negative width on progress bar
|
2018-01-17 20:35:28 +01:00 |
|
ANDY840119-PC\andy840119
|
6c67f96fdb
|
fix ci error
|
2018-01-18 02:01:01 +09:00 |
|
Dean Herbert
|
95a1556376
|
Merge pull request #1923 from smoogipoo/fix-replays
A lot of fixes to replay playback
|
2018-01-18 01:36:58 +09:00 |
|
Dean Herbert
|
864d106635
|
Merge branch 'master' into fix-replays
|
2018-01-18 00:49:02 +09:00 |
|
Dan Balasescu
|
afb55b5c43
|
Merge pull request #1924 from peppy/mute-global-track-when-preview
Mute global track volume when a beatmap preview is playing
|
2018-01-18 00:48:46 +09:00 |
|
smoogipoo
|
a05032779f
|
Remove unneeded event binding
|
2018-01-18 00:04:33 +09:00 |
|
ANDY840119-PC\andy840119
|
3b291abf60
|
Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game/Rulesets/UI/Playfield.cs
|
2018-01-17 22:27:32 +09:00 |
|
smoogipoo
|
c79603290d
|
Move TriggerChange to LoadComplete()
|
2018-01-17 21:52:57 +09:00 |
|
Dean Herbert
|
e7524445ee
|
Use Restart()
|
2018-01-17 21:33:19 +09:00 |
|
Dean Herbert
|
54ed608ddb
|
Mute global track volume when a beatmap preview is playing
|
2018-01-17 21:26:12 +09:00 |
|
smoogipoo
|
db27faa471
|
Add a ScrollTime config setting to osu!mania
|
2018-01-17 21:13:14 +09:00 |
|
smoogipoo
|
d96234bf40
|
Enforce that there's only one configmanager per ruleset
|
2018-01-17 21:08:23 +09:00 |
|
smoogipoo
|
92da02db87
|
Add extension to filename
|
2018-01-17 21:07:37 +09:00 |
|
smoogipoo
|
9f4ebad6e3
|
Add mania config manager
|
2018-01-17 20:21:25 +09:00 |
|
smoogipoo
|
379688e2f2
|
Add todo
|
2018-01-17 20:15:17 +09:00 |
|
smoogipoo
|
da22b3ec49
|
No more sorting
|
2018-01-17 20:12:39 +09:00 |
|
smoogipoo
|
0b7e1ce667
|
Add a way to have ruleset-specific configs
|
2018-01-17 19:45:18 +09:00 |
|
Dan Balasescu
|
be225eff90
|
Merge branch 'master' into fix-replays
|
2018-01-17 18:01:41 +09:00 |
|
smoogipoo
|
a01e46bb68
|
Fix ScoreStore replays not getting users
|
2018-01-17 17:55:55 +09:00 |
|
smoogipoo
|
2ebb3d6e0e
|
Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
|
2018-01-17 17:37:14 +09:00 |
|
smoogipoo
|
da793d91ea
|
Make a testcase for replay vs autoplay
|
2018-01-17 17:35:27 +09:00 |
|
smoogipoo
|
52b48f2b7e
|
Fix replays not correctly considering negative time diffs
|
2018-01-17 15:23:07 +09:00 |
|
Dean Herbert
|
18cdd1caac
|
Merge pull request #1919 from smoogipoo/fix-cursor-hiding
Fix cursor not showing in visualtests
|
2018-01-17 08:20:13 +09:00 |
|
Dean Herbert
|
87d2cce61d
|
Update framework
|
2018-01-17 00:47:14 +09:00 |
|
Dean Herbert
|
5212194e3f
|
Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding
|
2018-01-17 00:44:42 +09:00 |
|
Dan Balasescu
|
0ee9bcd70c
|
Merge pull request #1920 from peppy/input-queue-code-quality
Simplify some mouse/keyboard handling overrides
|
2018-01-16 20:52:45 +09:00 |
|
smoogipoo
|
06f0f2093c
|
Add a sample way to have local cursors move beyond their bounds
|
2018-01-16 20:35:39 +09:00 |
|
smoogipoo
|
a5415b99ae
|
Visualise the hovered drawabe
|
2018-01-16 20:35:13 +09:00 |
|
Dean Herbert
|
5e1cd8ddc4
|
Apply conditionals directly rather than using an in-between property
|
2018-01-16 20:34:40 +09:00 |
|
Dean Herbert
|
e7a0a02466
|
Don't limit keyboard input based on menu button scale
|
2018-01-16 20:34:40 +09:00 |
|
Dean Herbert
|
39af9321cf
|
Remove unnecessary overrides
|
2018-01-16 20:34:40 +09:00 |
|
smoogipoo
|
1174f34489
|
Update framework post-merge
|
2018-01-16 20:21:09 +09:00 |
|
smoogipoo
|
02564db43f
|
Merge remote-tracking branch 'origin/master' into fix-cursor-hiding
|
2018-01-16 20:20:47 +09:00 |
|
Dan Balasescu
|
12f14bdaa6
|
Merge pull request #1901 from UselessToucan/RefactorInputQueues
Store handleability of input separate for keyboard and mouse
|
2018-01-16 20:20:19 +09:00 |
|
Dean Herbert
|
9b33499fe7
|
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
|
2018-01-16 20:04:34 +09:00 |
|
Dean Herbert
|
4f7ccb8d93
|
Update framework
|
2018-01-16 18:38:47 +09:00 |
|
smoogipoo
|
d8275c4f9b
|
Fix beatmap query not including beatmap files
|
2018-01-16 18:20:46 +09:00 |
|
Dean Herbert
|
5edff5c5fc
|
Merge branch 'master' into fix-cursor-hiding
|
2018-01-16 18:15:22 +09:00 |
|
Dean Herbert
|
ae10aa4042
|
Merge pull request #1913 from smoogipoo/fix-event-bindings
Fix DrawableHitObject not binding nested hitobject events
|
2018-01-16 18:05:22 +09:00 |
|
Dean Herbert
|
56df27fcc2
|
Merge branch 'master' into fix-event-bindings
|
2018-01-16 17:49:01 +09:00 |
|
Dean Herbert
|
03b19961be
|
Merge pull request #1915 from smoogipoo/playfield-judgements
Individually bind OnJudgement from hitobjects in each Playfield
|
2018-01-16 16:33:31 +09:00 |
|
smoogipoo
|
c309cc9454
|
Privatise OnJudgements as much as possible
|
2018-01-16 15:37:32 +09:00 |
|
smoogipoo
|
d230fd486e
|
Add automated cursor testcase
|
2018-01-16 15:28:00 +09:00 |
|
Dean Herbert
|
976f7cec39
|
Merge branch 'master' into playfield-judgements
|
2018-01-16 15:26:13 +09:00 |
|
Dean Herbert
|
af6917d629
|
Merge pull request #1914 from smoogipoo/more-nested-playfields
Move nested playfields to the base Playfield
|
2018-01-16 14:59:00 +09:00 |
|
Dean Herbert
|
807e455a58
|
Merge branch 'master' into more-nested-playfields
|
2018-01-16 14:50:09 +09:00 |
|
smoogipoo
|
0459f0a069
|
Invert CanShowCursor conditional to fix cursor not showing in VisualTests
|
2018-01-16 13:40:02 +09:00 |
|
Dan Balasescu
|
47d964d21e
|
Merge pull request #1916 from aQaTL/hr-crashing-game
Cap ApproachRate in HardRock mod at 10
|
2018-01-16 13:27:17 +09:00 |
|
Dan Balasescu
|
480a75b8d9
|
Merge branch 'master' into hr-crashing-game
|
2018-01-16 13:18:02 +09:00 |
|
Dan Balasescu
|
1ddd6684e3
|
Merge pull request #1917 from UselessToucan/UseLocalFunctions
Use local functions
|
2018-01-16 13:12:50 +09:00 |
|