RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-28 01:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,618 Commits 6 Branches 666 Tags 364 MiB
98badd644f
Commit Graph

44618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Balasescu
24105debce
Merge branch 'master' into fix-skin-editor-masking 2021-09-17 13:54:24 +09:00
Dan Balasescu
87dbdfe632
Merge pull request #14774 from peppy/move-allow-adjustments-specification 
Move `AllowTrackAdjustments` specification to `RoomSubScreen`
 2021-09-17 13:48:44 +09:00
Dean Herbert
1b13b74740 Fix skin editor potentially leaving game-wide masking in the wrong state 
Just going with the simplest way to solve this.

Closes https://github.com/ppy/osu/issues/14769.
 2021-09-17 13:48:20 +09:00
Dean Herbert
f524e913e1 Move AllowTrackAdjustments specification to RoomSubScreen 2021-09-17 13:24:01 +09:00
Dean Herbert
cd4ba71a6b Revert "Merge pull request #14772 from Joehuu/lounge-disallow-track-adj" 
This reverts commit 06ff4838fb55f3362019ac0e173f10b64ec372b2, reversing
changes made to 5453ea0ce99bea69a9f87163a500140b1d7b318a.
 2021-09-17 13:22:39 +09:00
Dan Balasescu
06ff4838fb
Merge pull request #14772 from Joehuu/lounge-disallow-track-adj 
Disallow track adjustments on playlists / multi lounge
 2021-09-17 13:20:49 +09:00
Joseph Madamba
55feb47e61 Disallow track adjustments on playlists / multi lounge 2021-09-16 20:17:21 -07:00
Dean Herbert
5453ea0ce9
Merge pull request #14771 from Joehuu/fix-overflowing-wiki-blurb 
Fix wiki main page blurb overflowing at higher ui scale
 2021-09-17 10:45:51 +09:00
Joseph Madamba
2983d54682 Fix wiki main page blurb overflowing at higher ui scale 2021-09-16 17:32:23 -07:00
Dean Herbert
414735b8d0 Bump mobile project props realm references 2021-09-17 00:18:08 +09:00
Dean Herbert
c8b9756398
Merge pull request #14764 from smoogipoo/update-framework 
Update framework with KeyBindings + TextBuilder changes
 2021-09-16 23:37:15 +09:00
Dean Herbert
6b43e955be Merge branch 'limit-max-triangles' into update-framework 2021-09-16 22:49:50 +09:00
Dean Herbert
fde7c88999
Merge branch 'master' into update-framework 2021-09-16 22:49:02 +09:00
Dean Herbert
edb1230111 Fix potential nullref throw on failed startup 2021-09-16 22:48:09 +09:00
Dean Herbert
b399f910e4 Merge branch 'fix-osu-game-test-scene' into update-framework 2021-09-16 22:46:52 +09:00
Dean Herbert
bb132f9509 Update a few more missed event changes in tests 2021-09-16 22:41:35 +09:00
Dean Herbert
a1d33c1a46 Update framework 2021-09-16 22:38:19 +09:00
Dean Herbert
df786afb24
Merge pull request #14763 from kj415j45/localisation-settings-GlobalAction 
Add localisation for Settings-KeyBindings-GlobalActions
 2021-09-16 21:08:00 +09:00
Dean Herbert
9aed92a4d3
Merge pull request #14765 from smoogipoo/fix-legacy-approach-alpha 
Fix legacy approach circles accepting 0-alpha
 2021-09-16 21:06:35 +09:00
smoogipoo
bcbd0e0961 Revert ctor param 2021-09-16 20:06:20 +09:00
smoogipoo
d8f27633a4 Fix legacy approach circles accepting alpha 2021-09-16 19:35:15 +09:00
kj415j45
a18fed0da4
Remove unused using 2021-09-16 17:38:33 +08:00
smoogipoo
4b5857c876 Merge branch 'baseline-changes-update' into update-framework 2021-09-16 18:34:22 +09:00
smoogipoo
e8dea0138c Fix one more issue 2021-09-16 18:34:13 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
kj415j45
e323f10cd5
Remove unused [Description] 2021-09-16 17:10:29 +08:00
kj415j45
18e7d86dd4
Resolve test failure after localizing 2021-09-16 17:08:19 +08:00
kj415j45
51997fa533
Add localisation for GlobalActions 2021-09-16 16:02:04 +08:00
Dean Herbert
d3767ec4e9
Merge pull request #14743 from AbstractQbit/inheritable-allow-track-adjust 
Make `IOsuScreen.AllowTrackAdjustments` nullable
 2021-09-16 16:55:25 +09:00
Dean Herbert
9127a706ac Use private for internally used property 2021-09-16 16:54:56 +09:00
Dean Herbert
2df4073946 SpawnParticle -> CreateParticle (and set time outside of virtual call) 
Allows easier overriding (no need to call the `base.CreateParticle` call
and worry about overwriting the time value.
 2021-09-16 16:52:46 +09:00
Dean Herbert
29ce2f05bd Remove implied defaults 2021-09-16 16:44:46 +09:00
Dean Herbert
da0667365b
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-16 16:35:11 +09:00
Dean Herbert
6f2d818b64
Merge pull request #14740 from smoogipoo/mania-note-animations 
Add animation support for mania notes
 2021-09-16 16:34:53 +09:00
Dean Herbert
3495fae519 Handle potential for OnResuming call without an OnSuspending first 2021-09-16 16:31:41 +09:00
Dean Herbert
b58415fe19 Make suspend stored state nullable to ensure we don't break it 2021-09-16 16:12:14 +09:00
Dean Herbert
fa693bb8a8 Move MusicController adjustment set to inside OsuScreen itself (and result nullable) 2021-09-16 16:08:09 +09:00
Dean Herbert
45b07aa362 Add some basic animated textures to mania metric skin 2021-09-16 15:33:55 +09:00
smoogipoo
7976442aec Fix CI issues 2021-09-16 14:20:42 +09:00
smoogipoo
2dd9d457e8 Merge branch 'master' into speedpp 2021-09-16 14:18:47 +09:00
Dan Balasescu
43379a2eaa
Merge pull request #14752 from peppy/realm-settings 
Move (ruleset) settings to realm
 2021-09-16 14:05:41 +09:00
Dean Herbert
4d4a9b86c1 Merge branch 'master' into mania-note-animations 2021-09-16 11:12:07 +09:00
AbstractQbit
9057be1a02 Remove unused usings 2021-09-16 01:30:53 +03:00
AbstractQbit
3cd3e133ce Move AllowTrackAdjustments test to TestSceneOsuScreenStack 2021-09-16 01:24:50 +03:00
Opelkuh
32d65adb35 Fix cursor particle scale 2021-09-15 21:22:37 +02:00
AbstractQbit
30c458c662 Oops, fix not compiling test 2021-09-15 21:34:41 +03:00
AbstractQbit
318f0941ca Move all the "inherit previous AllowTrackAdjustments" logic into OsuScreen 2021-09-15 21:25:39 +03:00
apollo-dw
2637c063a9 forgot a deltatime 2021-09-15 15:40:26 +01:00
apollo-dw
2c3e7bfd2d moved 2b straintime cap up to 25ms 2021-09-15 15:27:36 +01:00
Dean Herbert
931e873a7e
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-15 22:26:13 +09:00