1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 22:27:25 +08:00
Commit Graph

42130 Commits

Author SHA1 Message Date
smoogipoo
c5977f3318 Merge branch 'master' into lounge-redesign 2021-07-14 12:47:16 +09:00
Dean Herbert
48d5a3f94f
Merge pull request #13866 from frenzibyte/remove-duplicates
Reference `OverlayColourProvider` static colours in `OsuColour`'s definitions xmldocs
2021-07-14 12:06:47 +09:00
Salman Ahmed
80636be767 Link Lime1 and Orange1 to their OverlayColourProvider's alternative 2021-07-14 03:22:00 +03:00
Salman Ahmed
b4961cd12e Revert "Remove duplicated colour definitions"
This reverts commit 9869986c59.
2021-07-14 03:18:13 +03:00
Dean Herbert
b183b1e3dd
Merge pull request #13688 from Henry-YSLin/osu-random-mod-improvements
Improve osu random mod
2021-07-13 22:17:55 +09:00
Henry Lin
94dc25837f
Merge branch 'master' into osu-random-mod-improvements 2021-07-13 20:39:23 +08:00
Dean Herbert
8d82412b39
Merge pull request #13851 from gagahpangeran/autolink-md
Add autolink support in osu markdown container
2021-07-13 19:40:53 +09:00
Dean Herbert
4314946e10 Reorganise functions to order more logically (hitcircle before slider methods) 2021-07-13 19:37:17 +09:00
Dean Herbert
6b663037e4 Use switch for pattern matching 2021-07-13 19:37:02 +09:00
Dean Herbert
db8ffc6316
Merge branch 'master' into osu-random-mod-improvements 2021-07-13 19:31:37 +09:00
Dean Herbert
2436ebb6d3
Merge pull request #13874 from Naxesss/short-object-checks
Add object duration checks
2021-07-13 19:01:02 +09:00
Dan Balasescu
9e1f929d52
Merge pull request #13873 from peppy/fix-match-screen-buttons-no-user
Fix multiplayer screen buttons showing no text when local user not available
2021-07-13 19:00:00 +09:00
Dan Balasescu
4ce96109b7
Merge branch 'master' into fix-match-screen-buttons-no-user 2021-07-13 18:20:23 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash
Fix crash when multiplayer server join fails during game creation
2021-07-13 18:00:47 +09:00
Dean Herbert
e791669c40 Fix multiplayer screen buttons showing no text when local user not available 2021-07-13 17:59:58 +09:00
Dan Balasescu
80e33065c6
Merge pull request #13872 from peppy/fix-multiplayer-exit-blocking
Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog
2021-07-13 17:57:43 +09:00
Naxess
3a5912e35e Add new checks to verifiers 2021-07-13 10:53:25 +02:00
Naxess
53c0298b5e Add too short spinners check and tests 2021-07-13 10:51:40 +02:00
Naxess
fec9448301 Add too short sliders check and tests 2021-07-13 10:50:41 +02:00
Naxess
6da2a3d51f Add zero-length objects check and tests 2021-07-13 10:50:11 +02:00
smoogipoo
28ff92e34e Add test 2021-07-13 17:31:28 +09:00
Dean Herbert
60e17fc2b7 Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog 2021-07-13 17:12:35 +09:00
Gagah Pangeran Rosfatiputra
1c69da09d3
Merge branch 'master' into autolink-md 2021-07-13 15:04:36 +07:00
smoogipoo
b5d4b9444f wip 2021-07-13 16:51:29 +09:00
smoogipoo
0cb80e105b Renamespace classes 2021-07-13 16:02:18 +09:00
smoogipoo
ab282b9e59 Remove RoomInspector from the lounge 2021-07-13 16:00:42 +09:00
smoogipoo
689cee832c Fix 1px gaps in DrawableRoom background 2021-07-13 15:50:46 +09:00
smoogipoo
8c4a257742 Add recent participants 2021-07-13 15:10:44 +09:00
Dean Herbert
5cffaf4d3b Add extra explanatory comment to avoid any confusion 2021-07-13 14:34:56 +09:00
Dean Herbert
c7c691078a Merge branch 'master' into fix-multiplayer-create-game-failure-crash 2021-07-13 14:34:42 +09:00
Dean Herbert
e70744ee37
Merge pull request #13870 from bdach/fix-difficulty-bindable-bind-order
Fix reset to default logic failing for difficulty adjust mod
2021-07-13 14:12:22 +09:00
Dean Herbert
35841fa4f7
Merge branch 'master' into fix-difficulty-bindable-bind-order 2021-07-13 13:42:53 +09:00
Dean Herbert
5cff379cd9
Merge pull request #13860 from smoogipoo/fix-bindable-ctor
Fix DifficultyBindable not binding correctly and not having default ctor
2021-07-13 13:42:44 +09:00
Dean Herbert
5af2190246 Merge branch 'master' into fix-bindable-ctor 2021-07-13 12:46:01 +09:00
Dean Herbert
ac15dae930 Update framework 2021-07-13 12:35:25 +09:00
Dan Balasescu
351a46b379
Merge pull request #13823 from ekrctb/catch-editor-tests
Add some tests for catch editor blueprints
2021-07-13 08:27:41 +09:00
Dan Balasescu
ba5d884ab0
Merge pull request #13856 from peppy/fix-line-break
Fix one new incorrect formatting inspection from EAP6
2021-07-13 07:46:39 +09:00
Bartłomiej Dach
cce4a4dc31 Fix incorrect value copy order in BindTo() 2021-07-12 22:27:36 +02:00
Bartłomiej Dach
f3fe472a33 Add failing test case for reset to defaults 2021-07-12 22:25:21 +02:00
Salman Ahmed
9869986c59 Remove duplicated colour definitions 2021-07-12 17:55:29 +03:00
Salman Ahmed
1deaefacb7 Add "basic" lime colour theme 2021-07-12 17:53:15 +03:00
Dean Herbert
c6bd58ea4b Exit match sub screen when a room goes away
Closes #13847.

I think we can probably get some test coverage of this if required, but
needs a bit of thought (basically an error needs to be thrown during the
multiplayer client portion of the join procedure, after `CurrentRoom` is
non-null but before the join completes).

Manual testing on password branch (#13861) is possible since it
currently errors due to missing method on the live/dev servers.

- Create game, which will fail with `MethodNotExists`.
- Note the fields on the settings screen are emptied.
- Fill fields again and press create game (crash).
2021-07-12 19:20:41 +09:00
Dean Herbert
78c74e97d1 Change to alternative formatting 2021-07-12 18:08:19 +09:00
Dan Balasescu
d85fc08d12
Merge pull request #13842 from peppy/fix-multiple-update-pompts
Limit update notifications to once per startup
2021-07-12 17:40:28 +09:00
smoogipoo
4b393209ec Implement UnbindFrom() 2021-07-12 17:33:29 +09:00
smoogipoo
242982730f Fix incorrect DifficultyBindable binding implementation 2021-07-12 17:09:09 +09:00
Dan Balasescu
36dd2c36de
Merge pull request #13859 from peppy/update-realm-win-81-fix
Update realm libraries to fix windows 8.1 incompatibility
2021-07-12 16:40:35 +09:00
smoogipoo
c1fba3da6b Add solid background 2021-07-12 16:30:34 +09:00
smoogipoo
aba09b20a5 Add host under room title 2021-07-12 16:28:22 +09:00
smoogipoo
4ac812de86 Add rank range pill 2021-07-12 16:15:26 +09:00