Commit Graph

43793 Commits

Author SHA1 Message Date
53da137425 Merge branch 'master' into net5.0 2020-12-10 17:14:21 +09:00
7c2f506b79 Port StanR's NF multiplier changes 2020-12-10 17:10:29 +09:00
437c0506ce Refactor to allow for special disposal handling to still work 2020-12-10 16:56:56 +09:00
67dd7be71a Move cancelLoad call to OnResuming
This has no real effect; it just feels more readable to me.
2020-12-10 16:34:59 +09:00
491ab74059 Schedule pushWhenLoaded once ever
Previously it was being scheduled another time each OnResume, resulting
in more and more calls as a user retries the same beatmap multiple
times.

To simplify things I've decided to just schedule once ever. This means
that on resuming there's no 400ms delay any more, but in testing this
isn't really an issue (load time is still high enough that it will never
really be below that anyway). Even if gameplay was to load faster, the
animation should gracefully proceed.
2020-12-10 16:33:30 +09:00
cc996ec7fc Ensure player is consumed at the point of scheduled push running the first time 2020-12-10 16:32:14 +09:00
54abc3bd4d revert aim curve and add new 50s nerf 2020-12-09 20:07:52 -06:00
149651dec1 Merge branch 'lowacc-nerf' of https://github.com/Xexxar/osu into lowacc-nerf 2020-12-09 13:05:11 -06:00
d604c51cbd capped scaling at OD 8 to prevent overscaling 2020-12-09 13:04:14 -06:00
a2bd8ece10 Merge branch 'master' into lowacc-nerf 2020-12-09 12:06:33 -06:00
01a800242b Merge branch 'lowacc-nerf' of https://github.com/Xexxar/osu into lowacc-nerf 2020-12-09 11:58:16 -06:00
05ad9aae8d changed curve to linear OD + acc based curve 2020-12-09 11:57:01 -06:00
051afe5a7a Fix typos in comments 2020-12-09 18:31:51 +01:00
146e6a6193 Fix formatting issues 2020-12-09 18:30:52 +01:00
cfc34a63bd realized i accidently deleted the OD scaling 2020-12-09 11:21:03 -06:00
7e3fcfe437 fixed issue with comment 2020-12-09 10:35:48 -06:00
9835245ea2 Add test 2020-12-10 00:37:19 +09:00
47a93d8614 Adjust osu! hitobject fade-ins to support AR>10 2020-12-10 00:37:19 +09:00
ac91f0e270 Add extended limits to difficulty adjustment mod 2020-12-10 00:37:19 +09:00
6da854e37c Move scheduled import logic to OsuGame. 2020-12-09 13:32:59 +01:00
c8e3c7e77b Add stateful client interface 2020-12-09 17:45:07 +09:00
bb97eae8b1 Update outdated exception references in xmldoc 2020-12-09 16:02:37 +09:00
1e08b298b8 Remove unnecessary exception type 2020-12-09 16:01:09 +09:00
578e5cb92e Also make InvalidStateException serializable 2020-12-09 15:59:13 +09:00
ab00a15555 Add JsonConstructor specs to allow for correct deserialization of readonly fields 2020-12-09 15:05:57 +09:00
bef52af1da Move client state class to server implementation
Never used by client.
2020-12-09 15:05:33 +09:00
e09715d71e Add ToString implementation to MultiplayerRoom for easier debug 2020-12-09 14:47:26 +09:00
c92c2cbfc0 Change exceptions which should be returned to the user to HubException type
See
https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.signalr.hubexception?view=aspnetcore-5.0.
2020-12-09 14:46:44 +09:00
48129c52d6 Change get-only property for now 2020-12-09 12:38:24 +09:00
231c3414d7 Merge pull request #11129 from smoogipoo/stanr-so-dynamic-pp
Port StanR's dynamic SO pp changes
2020-12-09 12:23:20 +09:00
427d41bab5 Add missing licence headers 2020-12-09 12:17:37 +09:00
0eb5b16454 Remove Empty() implementation for RoomSettings until otherwise necessary 2020-12-09 12:12:03 +09:00
1013749a83 Change user id type to int 2020-12-09 12:10:47 +09:00
fd4fa963ac Standardise exception naming 2020-12-09 12:07:19 +09:00
2046cbe2d9 Add missing exceptions to server xmldoc 2020-12-09 12:05:50 +09:00
ff5150a14d Fix typo in IMultiplayerClient xmldoc 2020-12-09 12:03:52 +09:00
a8e2f35b62 Remove unneeded check of caught object removal
The logic was public but now it is private
so the condition is ensured by the caller
2020-12-09 10:50:35 +09:00
775c4bad97 Remove unneeded lifetime assignment 2020-12-09 10:47:04 +09:00
da2f3d4473 Move classes to separate files 2020-12-09 10:40:42 +09:00
b52e279702 Reword exception message 2020-12-09 10:38:11 +09:00
86445e7c23 Remove unnecessary copy 2020-12-09 10:36:54 +09:00
c8b0934573 Rename caughtFruitContainer -> caughtObjectContainer 2020-12-09 10:35:36 +09:00
ccca7e0b25 more specific type droppedObjectContainer 2020-12-09 10:35:01 +09:00
df9de7a8dd Remove null check that is not required anymore 2020-12-09 10:28:42 +09:00
b80204642e Revert rename error 2020-12-09 10:25:35 +09:00
748035e80a changes to acc scaling curve for speed and aim pp 2020-12-08 16:53:52 -06:00
aa7d22460d Override Import() instead. 2020-12-08 19:46:55 +01:00
d8838ddbfb Remove duplicated overload. 2020-12-08 18:48:50 +01:00
0610adca0a Fix merge conflicts. 2020-12-08 18:03:58 +01:00
1212ffd24f Rename to CopyStateFrom, and add comment 2020-12-08 23:35:24 +09:00