1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 09:22:58 +08:00
Commit Graph

34946 Commits

Author SHA1 Message Date
Jessica Meng
76f3bc027c
Merge pull request #5 from angelaz1/jmeng1/keyboard_shortcuts
Added tests for ctrl + w and ctrl + t
2020-12-14 18:18:40 -08:00
Jess Meng
7fe7c24ce1 Style fixes for whitespaces 2020-12-14 15:44:40 -08:00
Jess Meng
017e00eb26 More style fixes 2020-12-14 15:27:57 -08:00
Angela Zhang
1af0f79ddf
Adding newline style fixes 2020-12-14 16:58:43 -06:00
Jess Meng
9cb0ed3b8f Fixed formatting for tests 2020-12-14 12:38:59 -08:00
Jess Meng
ccbf6db810 Fixed some formatting and style 2020-12-13 22:11:52 -08:00
Jess Meng
57500666d6 Merge branch 'jmeng1/keyboard_shortcuts' of https://github.com/angelaz1/osu into jmeng1/keyboard_shortcuts 2020-12-13 22:06:08 -08:00
Jess Meng
35f403dacd Added tests for ctrl + w and ctrl + t 2020-12-13 22:05:54 -08:00
Angela Zhang
aaca703483
Merge pull request #3 from angelaz1/jmeng1/keyboard_shortcuts
Added ctrl + w and ctrl + t keyboard shortcuts
2020-12-12 21:22:12 -06:00
Angela Zhang
084e4ce50b
Removing whitespace 2020-12-12 20:11:57 -06:00
Angela Zhang
b9f687d7f9
Adding in extra blank line 2020-12-12 18:55:17 -06:00
Angela Zhang
4c1e75f101
Small whitespace fix 2020-12-12 18:02:08 -06:00
Jess Meng
3dd6589d6e Fixed style changes and cleaned up ctrl + t implementation 2020-12-12 15:53:08 -08:00
Dean Herbert
bf2594baa9
Merge pull request #11150 from peppy/update-framework
Update framework
2020-12-12 21:35:53 +09:00
Bartłomiej Dach
51840121b9
Merge branch 'master' into update-framework 2020-12-12 13:02:34 +01:00
Dean Herbert
f20c5a2bda Update framework (again) 2020-12-12 15:29:26 +09:00
Jess Meng
92cab12eb7 Added ctrl + w and ctrl + t keyboard shortcuts 2020-12-11 21:52:36 -08:00
Bartłomiej Dach
df198d9006
Merge pull request #11137 from peppy/fix-player-load-stuck-at-empty-screen 2020-12-11 21:22:12 +01:00
Bartłomiej Dach
d457926523
Merge branch 'master' into fix-player-load-stuck-at-empty-screen 2020-12-11 20:49:27 +01:00
Bartłomiej Dach
3ffa03a2c5
Merge pull request #11139 from peppy/fix-single-threaded-seeking 2020-12-11 20:46:54 +01:00
Bartłomiej Dach
01833e8c9b
Merge branch 'master' into fix-single-threaded-seeking 2020-12-11 20:14:28 +01:00
Dan Balasescu
31ae79a140
Merge pull request #11149 from peppy/add-cache-suffix-online-db
Add a simple cache-busting query string to online.db retrieval
2020-12-11 20:20:52 +09:00
Dean Herbert
b5f6baf341 Update framework 2020-12-11 18:03:48 +09:00
Dean Herbert
bd66a3f8c7
Merge pull request #11131 from ekrctb/caught-object-pooling 2020-12-11 18:03:21 +09:00
Dean Herbert
a35060ea7a Add a simple cache-busting query string to online.db retrieval
As we are finally pushing updates for this database, this adds a minimum
level of guarantee that a client will request a new version (without
having to worry about multiple levels of server-side caching).
2020-12-11 17:56:02 +09:00
Dean Herbert
c0d20d8ce4 Add some spacing to interface class 2020-12-11 16:43:00 +09:00
Dean Herbert
2dd5911256 Rename method to better match purpose 2020-12-11 14:44:01 +09:00
ekrctb
2634c6b8d9 Combine DisplayRadius and Scale to DisplaySize 2020-12-10 20:43:01 +09:00
ekrctb
e097b6e61c Add ScalingContainer back
Don't want to set DHO.Scale or DHO.Rotation because because DHO may be transformed by mods.
DHO.Size is also assigned for drawable visualizer
2020-12-10 19:42:01 +09:00
Dean Herbert
01bd765384 Simplify pause handling by moving transform logic to bindable change event 2020-12-10 17:42:47 +09:00
Dean Herbert
679a550d83 Fix single threaded seeking not working due to unnecessary seek call 2020-12-10 17:42:28 +09:00
Dean Herbert
437c0506ce Refactor to allow for special disposal handling to still work 2020-12-10 16:56:56 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
cc996ec7fc Ensure player is consumed at the point of scheduled push running the first time 2020-12-10 16:32:14 +09:00
Dean Herbert
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
ekrctb
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
ekrctb
775c4bad97 Remove unneeded lifetime assignment 2020-12-09 10:47:04 +09:00
ekrctb
da2f3d4473 Move classes to separate files 2020-12-09 10:40:42 +09:00
ekrctb
b52e279702 Reword exception message 2020-12-09 10:38:11 +09:00
ekrctb
86445e7c23 Remove unnecessary copy 2020-12-09 10:36:54 +09:00
ekrctb
c8b0934573 Rename caughtFruitContainer -> caughtObjectContainer 2020-12-09 10:35:36 +09:00
ekrctb
ccca7e0b25 more specific type droppedObjectContainer 2020-12-09 10:35:01 +09:00
ekrctb
df9de7a8dd Remove null check that is not required anymore 2020-12-09 10:28:42 +09:00
ekrctb
b80204642e Revert rename error 2020-12-09 10:25:35 +09:00
ekrctb
1212ffd24f Rename to CopyStateFrom, and add comment 2020-12-08 23:35:24 +09:00
ekrctb
5ca98b0033 Add doc comments a bit 2020-12-08 23:11:22 +09:00
ekrctb
1f36bbecd1 Fix dropped objects not removed on revert result 2020-12-08 23:07:30 +09:00
ekrctb
749d5380ca Pool caught objects and dropped objects 2020-12-08 22:38:10 +09:00
smoogipoo
168ba62500 Port StanR's dynamic SO pp changes 2020-12-08 22:09:48 +09:00