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

17944 Commits

Author SHA1 Message Date
Dean Herbert efaedafc08 Fix (legacy) AudioLeadIn being used incorrectly. 
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
 2019-04-24 15:28:14 +09:00
Dean Herbert e69963e60e Ensure there is enough time before the first object in osu! (roughly following osu-stable specs) 2019-04-24 15:28:14 +09:00
Dean Herbert a3e7ec0a14 Add tests for FrameStabilityContainer 2019-04-24 15:25:53 +09:00
Dean Herbert 60328cf1fb Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek 2019-04-24 15:25:53 +09:00
Dean Herbert 80e1568e97 Fix FrameStabilityContainer performing frame-stable seeks 2019-04-24 15:25:52 +09:00
Dean Herbert 65f5318298
Shorten multiplayer header to multi (#4669) 
Shorten multiplayer header to multi
 2019-04-24 10:32:21 +09:00
Joehu 0838206ddd Shorten multiplayer header to multi 2019-04-22 22:44:43 -07:00
Dean Herbert 3bfd2a4d2f
Fix gameplay cursor being hidden in tests/replays (#4667) 
Fix gameplay cursor being hidden in tests/replays
 2019-04-23 13:54:44 +09:00
smoogipoo 6c568d228f Add comment 2019-04-23 13:45:51 +09:00
smoogipoo 6add395288 Fix gameplay cursor being hidden in tests/replays 2019-04-23 13:32:44 +09:00
Dean Herbert b8712b36ec
Fix possible exit from non-current screen (#4663) 
Fix possible exit from non-current screen

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-23 09:52:20 +09:00
Dean Herbert c88a11a38f
Merge branch 'master' into fix-multiplayer-crash 2019-04-23 09:28:03 +09:00
smoogipoo 414d555484 Fix possible exit from non-current screen 2019-04-22 19:24:57 +09:00
Dean Herbert ffd8268076
Fix hold for menu button's icon being incorrect (#4662) 
Fix hold for menu button's icon being incorrect

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
 2019-04-22 19:16:29 +09:00
Dean Herbert c1b649b0fb
Standardise health adjustment process across all rulesets (#4660) 
Standardise health adjustment process across all rulesets

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-22 19:16:14 +09:00
Dean Herbert 5313ba2938
Merge branch 'master' into hp-rewind 2019-04-22 19:02:41 +09:00
Dan Balasescu 8fc0bf24c7
Merge branch 'master' into fix-hold-for-menu-icon 2019-04-22 18:57:43 +09:00
Dan Balasescu 63fd3034ca
Merge pull request #4661 from peppy/fix-pause-tests 
Fix pause tests and cursor visibility
 2019-04-22 18:56:41 +09:00
Dean Herbert 48e82d4b1c Fix hold for menu button's icon being incorrect 2019-04-22 18:47:28 +09:00
Dean Herbert 6856571f17 Fix incorrect seek target 2019-04-22 18:45:58 +09:00
Dean Herbert 55c5ef898d Remove delay on entering player 2019-04-22 18:29:58 +09:00
Dean Herbert 908eee9942 Fix pause tests 2019-04-22 18:29:51 +09:00
smoogipoo aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
smoogipoo 910b9df2d5 Fix catch awarding too much hp 2019-04-22 18:02:57 +09:00
smoogipoo 4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
smoogipoo 144e6012dc Implement hp increase for osu! 2019-04-22 17:24:42 +09:00
smoogipoo 78c844e259 Make catch provide some HP at DrainRate=10 2019-04-22 17:24:22 +09:00
smoogipoo b59f23d094 Implement hp increase for taiko 2019-04-22 17:04:46 +09:00
smoogipoo 4c5f41e40f Implement hp increase for mania 2019-04-22 17:04:18 +09:00
smoogipoo d7919544fe Implement approximate hp increase for catch 2019-04-22 16:59:14 +09:00
smoogipoo fbb4e9df04 Implement hp at base ScoreProcessor 2019-04-22 16:51:38 +09:00
Dan Balasescu 9d3d1fd10b
Merge pull request #4658 from peppy/remove-black-box 
Remove black box blocking some visual tests from being visible
 2019-04-22 11:12:14 +09:00
Dean Herbert 8ffb2f4224 Remove black box blocking some visual tests from being visible 2019-04-22 10:55:01 +09:00
Dan Balasescu 4e1a9e4228
Merge pull request #4648 from smoogipoo/appveyor-broken 
Fix appveyor temporarily
 2019-04-19 21:38:01 +09:00
smoogipoo 4cf234295c Fix appveyor temporarily 2019-04-19 21:27:24 +09:00
Dean Herbert f6cbae578b
Merge pull request #4614 from smoogipoo/player-mod-reinstantiation 
Reinstantiate mods for each player instance

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-04-17 16:57:58 +08:00
Dean Herbert 2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation 2019-04-17 16:42:57 +08:00
Dan Balasescu 118f512d98
Merge pull request #4540 from nyquillerium/facade-container 
Implement FacadeContainer for tracking logo positions in other containers
 2019-04-17 17:33:08 +09:00
smoogipoo 12b6bc48bd Use .With() wherever possible 2019-04-17 17:24:09 +09:00
smoogipoo c145ce2d00 Remove usings 2019-04-17 17:19:55 +09:00
smoogipoo 09568be270 Merge remote-tracking branch 'origin/master' into facade-container 
# Conflicts:
#	osu.Game/Screens/Play/PlayerLoader.cs
 2019-04-17 17:17:33 +09:00
smoogipoo 106e77c3d7 Cleanup testcase 2019-04-17 17:15:23 +09:00
smoogipoo 897bfa60db Fix tracking position during 150ms state change delay 2019-04-17 17:05:35 +09:00
smoogipoo 4106da2430 Rename facade + cleanup usage 2019-04-17 17:05:33 +09:00
smoogipoo 3a1587fa53 Throw exception when not relatively positioned 2019-04-17 17:04:11 +09:00
smoogipoo 9f92b3a8ba Add xmldoc 2019-04-17 16:34:53 +09:00
smoogipoo 5a3d6a0258 Fix post-merge errors 2019-04-17 16:11:59 +09:00
smoogipoo ad720cedeb Merge remote-tracking branch 'origin/master' into player-mod-reinstantiation 2019-04-17 12:59:23 +09:00
Dan Balasescu a10d265a90
Merge pull request #4630 from peppy/update-framework 
Update framework
 2019-04-17 10:23:16 +09:00
Dean Herbert b684cd49e6 Update framework 2019-04-16 22:51:57 +08:00