h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 10:12:54 +08:00
Code Issues Releases Wiki Activity
25,268 Commits 3 Branches 657 Tags 364 MiB
be2a88c8a5
Commit Graph

16018 Commits

Author SHA1 Message Date
wltu
8aeef3f59a Added refresh scoreboard upon deleting local score and formatted the code 2019-12-17 12:56:30 -08:00
wltu
bb2b1475cd Merge branch 'master' of https://github.com/ppy/osu into #7146 2019-12-17 12:54:47 -08:00
Lucas A
0a278ef943 Apply review suggestions 2019-12-17 19:23:30 +01:00
smoogipoo
bcc19e29f2 Fix editor crashing after re-ordering objects 2019-12-18 02:56:29 +09:00
Dean Herbert
036efb9947
Merge branch 'master' into fix-effect-points 2019-12-18 01:43:15 +09:00
Dean Herbert
886db8eb22
Merge branch 'master' into fix-local-score-availability 2019-12-18 01:15:20 +09:00
Dean Herbert
4443d2196b
Merge branch 'master' into legacy-slider-body 2019-12-17 23:42:31 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset (#7244) 
Move CreateScoreProcessor() to Ruleset
 2019-12-17 22:15:42 +09:00
Dan Balasescu
3d13fe485d
Merge pull request #7238 from huoyaoyuan/fxcop 
Apply FxCop at game side
 2019-12-17 21:29:52 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1 Move CreateScoreProcessor() to Ruleset 2019-12-17 20:08:13 +09:00
smoogipoo
527ab1a72f Fix traceable mod not working on skin change 2019-12-17 19:49:13 +09:00
Andrei Zavatski
f6cde911e2 Use switch expressions 2019-12-17 13:41:28 +03:00
Andrei Zavatski
bc9177983a Fix possible null 2019-12-17 12:50:50 +03:00
Andrei Zavatski
023892738a Integration into overlay 2019-12-17 12:36:44 +03:00
Andrei Zavatski
8cd96acffc CounterPill implementation 2019-12-17 12:05:35 +03:00
smoogipoo
946a202ee5 Fix online replays not being available locally 2019-12-17 15:47:08 +09:00
Craftplacer
415defdfbd Merge branch 'chat-mention' of https://github.com/Craftplacer/osu into chat-mention 2019-12-17 07:05:21 +01:00
Craftplacer
7bdfd2e23c All copyright goes to peppy 2019-12-17 07:04:55 +01:00
Craftplacer
02f9fc89f6
Merge branch 'master' into chat-mention 2019-12-17 06:59:49 +01:00
Craftplacer
b6c31e7764 Remove ignore list, move code to MessageNotifier and add it to DI 
This also adds countable private message notifications.
 2019-12-17 06:59:27 +01:00
Craftplacer
02dc70be02 Make it possible to retrieve loaded channel drawables in ChatOverlay 2019-12-17 06:56:05 +01:00
Craftplacer
bea34e3aab Make it possible to retrieve notifications from NotificationOverlay 2019-12-17 06:55:48 +01:00
Dean Herbert
c92332d2e4
Merge pull request #7214 from Joehuu/default-placeholder-channel-search 
Use default placeholder text on chat channel search box
 2019-12-17 14:38:56 +09:00
Dean Herbert
735b7a8455
Merge pull request #6940 from aspriddell/cinema-mod 
Add "Cinema" mod
 2019-12-17 14:33:12 +09:00
Huo Yaoyuan
40b43b85f1 CA1715: use prefix for generic parameters. 2019-12-17 13:00:25 +08:00
Huo Yaoyuan
61a6106e52 CA2200: don't explictly throw caught exception. 2019-12-17 13:00:23 +08:00
Huo Yaoyuan
caf3f774ba CA1309: compare strings correctly. 2019-12-17 13:00:15 +08:00
Huo Yaoyuan
e46f6627e4 CA1052: make type static. 2019-12-17 13:00:13 +08:00
Huo Yaoyuan
d5994ed484 CA2208: create exceptions correctly. 2019-12-17 13:00:10 +08:00
Huo Yaoyuan
09257b0c6d CA1820: use IsNullOrEmpty. 2019-12-17 13:00:08 +08:00
Huo Yaoyuan
3c39fde7ff CA1065: throw NotSupportedException in properties. 2019-12-17 13:00:05 +08:00
Huo Yaoyuan
d7b3578cc6 CA2201: throw correct exception type. 2019-12-17 13:00:02 +08:00
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Dean Herbert
f8ffa67693 Add test and isolate ignore bindable from EnableUserDim 2019-12-17 13:21:23 +09:00
Dean Herbert
5761d763ec
Allow changing volume using alt when hovering scroll containers (#7213) 
Allow changing volume using alt when hovering scroll containers

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-17 13:20:31 +09:00
Dean Herbert
b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
Dean Herbert
272d7d0ca9
Merge branch 'master' into fallback-to-skin-combo-colours 2019-12-17 12:36:20 +09:00
Willy Tu
bef9637fdf Implemented delete local score individually. Currently does not refresh the score screen after the delete is compelete. 2019-12-16 19:25:28 -08:00
Dean Herbert
a85653ebec Add comment 2019-12-17 12:24:59 +09:00
Dean Herbert
87035f8251 Simplify complex method 2019-12-17 12:12:15 +09:00
Dean Herbert
795416c066 Move first beat offset to BeatSyncedContainer 2019-12-17 12:06:09 +09:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version (#7208) 
Update sdk and InspectCode version
 2019-12-16 19:46:12 +09:00
Dean Herbert
438d97f4f5 Rename variable for clarity 2019-12-16 19:42:28 +09:00
Dean Herbert
cfd8111120 Better initial beat handling 2019-12-16 19:41:02 +09:00
Dean Herbert
72404bff9a Add support for simple triple time 2019-12-16 19:16:54 +09:00
Dean Herbert
210fecc951 Fix incorrect hat logic; add support for first barline omission 2019-12-16 18:57:11 +09:00
Dean Herbert
0f9ff32cdc Fix beat playing while paused 2019-12-16 18:51:22 +09:00
Dean Herbert
c883c97bab Fix off-by-one starting bar 2019-12-16 18:50:58 +09:00
Dean Herbert
3e0fda58ea Play finish in addition to kick, not isolated 2019-12-16 18:47:06 +09:00
smoogipoo
6cf318c34b Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding 2019-12-16 18:41:21 +09:00
smoogipoo
a276643a4b Reorder health display and score elements 2019-12-16 18:41:14 +09:00
smoogipoo
83f77d9c35 Make the layout faster 2019-12-16 18:41:02 +09:00
Dean Herbert
9de6b62fb1 Fix nightcore beat not playing if song doesn't hit beat index 0 2019-12-16 18:24:29 +09:00
Dean Herbert
3f3ba603c1 Merge remote-tracking branch 'upstream/master' into nightcore-beats 2019-12-16 18:03:32 +09:00
smoogipoo
be7b00cc34 Fix potentially incorrect custom sample bank 2019-12-16 17:12:31 +09:00
smoogipoo
8beb6b534f Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving 2019-12-16 17:09:03 +09:00
smoogipoo
3c9884456f Use writeline 2019-12-16 17:08:46 +09:00
smoogipoo
5278236458 Use invariant ToLower() 2019-12-16 17:07:30 +09:00
smoogipoo
27150d6bbc Use char concatenation for performance 2019-12-16 17:06:52 +09:00
smoogipoo
9fa6954ac2 Refactor getSampleBank a bit 2019-12-16 17:05:24 +09:00
smoogipoo
98dd1c2590 Use SingleOrDefault() where possible 2019-12-16 17:03:58 +09:00
smoogipoo
d56e99865c Throw not implemented exceptions 2019-12-16 16:57:49 +09:00
smoogipoo
596fda3c1f Refactor switch 2019-12-16 16:57:40 +09:00
smoogipoo
58e3fb0d0f Coalesce to -1 2019-12-16 16:43:20 +09:00
dependabot-preview[bot]
fef1877095
Bump ppy.osu.Game.Resources from 2019.1010.0 to 2019.1215.0 
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.1010.0 to 2019.1215.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.1010.0...2019.1215.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 07:36:30 +00:00
Dean Herbert
d7eb4f73f4
Merge branch 'master' into update-beatmap-settings 2019-12-16 14:57:57 +09:00
Dean Herbert
befb78f83b Simplify LegacySkinResourceStore by deriving from ResourceStore 2019-12-16 14:01:08 +09:00
Dean Herbert
9062fe1935 Fix crashes on custom skins due to extension-less file lookups 2019-12-16 13:32:53 +09:00
Craftplacer
1a1253a4aa Add null check to ScrollToAndHighlightMessage 2019-12-16 03:27:19 +01:00
Craftplacer
997b51b1f8 Make messageRemoved use helper method 2019-12-16 03:26:30 +01:00
Craftplacer
0225372e83 Rename method to ScrollToAndHighlightMessage 2019-12-16 03:24:07 +01:00
Craftplacer
eb3f851ce2 Split Notification class into three separate ones 2019-12-16 03:22:55 +01:00
Craftplacer
81d994abed Change ChatMessageNotification's LabelText 2019-12-16 03:22:14 +01:00
Craftplacer
8b14090c95 Remove unused field 2019-12-16 02:13:26 +01:00
Craftplacer
20670730b9 Resolve code formatting 2019-12-16 01:57:07 +01:00
Craftplacer
28d1fb181f Add missing license header for InGameChatSettings.cs 
My unit tests fail at a solution filter, let's hope AppVeyor says yes.
 2019-12-16 01:14:51 +01:00
Craftplacer
15c25c571d Merge remote-tracking branch 'upstream/master' into chat-mention 2019-12-16 00:59:06 +01:00
Craftplacer
8dfc8929f1 Add chat and notification logic to DrawableChannel 
with alongside multiple helper methods
 2019-12-16 00:48:22 +01:00
Craftplacer
e8180ab153 Add ToString() method to message for better debugging 2019-12-16 00:45:55 +01:00
Craftplacer
6e812ebd56 Reimplement chat settings from stable 2019-12-16 00:45:33 +01:00
unknown
88d3a1707d ensure beatIndex is 0 before starting beats 2019-12-16 06:35:18 +08:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Huo Yaoyuan
ab70abe8bd Turn off unexpected new warnings. 2019-12-15 20:07:56 +08:00
Willy Tu
ad077042ba Created ContextMenu for scores by adding OsuContextMenuContainer as a child of LeaderboardScore and a Drawable that extended the IHasContextMenu interface to the MenuContainer. Tried to the LeaderboardScore extend IHASContextMenu itself, but it is not working yet. 2019-12-15 02:18:12 -08:00
unknown
154bc57c6e remove unused dependency 2019-12-15 17:46:44 +08:00
unknown
6da168118e remove unused usings 2019-12-15 17:02:29 +08:00
unknown
01c036b0b0 implement backing beats for nightcore mods 2019-12-15 16:56:02 +08:00
Joehu
5af363c920 Use default placeholder text on chat channel search box 2019-12-14 12:58:13 -08:00
Joehu
a04f4b76bb Allow changing volume using alt when hovering scroll containers 2019-12-14 11:39:59 -08:00
Dean Herbert
91bb851a7d Update framework 2019-12-15 03:32:50 +09:00
Dean Herbert
41d4609c92 Fix crash on trying to retrieve mods from unavailable ruleset 2019-12-15 02:37:30 +09:00
Huo Yaoyuan
ddb2cfc46d Use GetEndTime in Taiko and Mania 2019-12-14 18:16:13 +08:00
Lucas A
43720fbf45 Fix CI issues 2019-12-13 18:59:40 +01:00
Lucas A
e05c9426ed Initial implementation of NewsArticleCover class 2019-12-13 18:50:49 +01:00
Dean Herbert
b94d5bf82e Fix error when entering multiplayer game in different ruleset 2019-12-14 00:42:54 +09:00
Dean Herbert
bc397a4f1d
Merge branch 'master' into adjustable-rate-mods 2019-12-13 22:23:30 +09:00
Dean Herbert
59538bfd32 Merge branch 'global-available-mods' into adjustable-rate-mods 2019-12-13 21:57:27 +09:00
Dan Balasescu
ef94df917c
Add whitespace 2019-12-13 21:56:03 +09:00
smoogipoo
72ea871bff Make constructor protected 2019-12-13 21:55:20 +09:00
Dean Herbert
af15662856 Fix WindUp applying too much change 2019-12-13 21:55:07 +09:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
8052aeb238 Fix potential nullref in disposal logic 2019-12-13 21:36:50 +09:00
Dean Herbert
440a8470e1 Move available mods to global context 
This also tidies up ModSelectOverlay and setting creation flow in general.
 2019-12-13 21:36:50 +09:00
smoogipoo
ea4eb6b204 CI cleanups 2019-12-13 21:29:10 +09:00
Dean Herbert
fa7520d177
Merge pull request #7185 from peppy/update-framework 
Update framework
 2019-12-13 20:59:22 +09:00
Dean Herbert
34f67b9cad Update framework 2019-12-13 20:31:20 +09:00
Dean Herbert
a1f8ab1735 Fix unrequired type keyword 2019-12-13 20:13:53 +09:00
Dean Herbert
3dc2b59d2a Move variable above common bindables 2019-12-13 20:06:12 +09:00
Dean Herbert
395b058ff8 Fix OsuScreenDependencies not caching non-leased versions 2019-12-13 20:05:54 +09:00
Dean Herbert
952bc96bbf Use GameBase data sources for Beatmap/Mods/Ruleset 
Sourced in via OsuScreenDependencies for management
 2019-12-13 20:05:38 +09:00
smoogipoo
9bc02f489e Add missing headers 2019-12-13 19:14:49 +09:00
smoogipoo
0ad28a9400 Start at version 128 2019-12-13 19:11:45 +09:00
smoogipoo
abf3f341b7 Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving 2019-12-13 19:01:25 +09:00
smoogipoo
87a7f340e3 Fix first sample point being treated as redundant 2019-12-13 18:14:01 +09:00
smoogipoo
654499d8b0 Remove whitespace 2019-12-13 17:33:18 +09:00
smoogipoo
97158fce7d Always attach a new combo to spinners 2019-12-13 17:02:10 +09:00
smoogipoo
0b7c4f252c Fix artist being written in place of version 2019-12-13 17:01:59 +09:00
smoogipoo
53a665a034 Fix sound types and banks not being written correctly 2019-12-13 17:01:44 +09:00
unknown
ab5aa8594d remove whitespace 2019-12-13 15:46:58 +08:00
unknown
0311cc83ad add whitespace 2019-12-13 15:27:34 +08:00
unknown
ababe7b6c9 refactor mod to make use of #7175 2019-12-13 15:22:07 +08:00
unknown
7f659cd057 Merge branch 'update-beatmap-settings' into adjustable-map-settings 2019-12-13 09:45:10 +08:00
unknown
3945e7403a improve tests and refactor AdvancedStats 2019-12-13 09:39:54 +08:00
unknown
ec5b506960 apply mod difficulty settings during song select 2019-12-12 23:41:46 +08:00
unknown
002a125b4a make ModDifficultyAdjust generic 2019-12-12 21:14:26 +08:00
Dean Herbert
5e634c1183 Move test values to constants 2019-12-12 20:51:58 +09:00
Salman Ahmed
bf8caee53f Inherit SkinConfiguration directly 2019-12-12 14:05:24 +03:00
Dean Herbert
7559012fb7 Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks 2019-12-12 19:55:09 +09:00
smoogipoo
ac984423bb Fix only single sound type being written 2019-12-12 19:53:30 +09:00
smoogipoo
dedae69db8 Prefer legacy curve format if possible 2019-12-12 19:52:15 +09:00
smoogipoo
d35d34c01b Fix hanging semicolon for per-node bank output 2019-12-12 19:01:43 +09:00
smoogipoo
4760307bbb Don't output the first slider control point 2019-12-12 19:01:15 +09:00
smoogipoo
60063eefd2 Fix up background/video events 2019-12-12 18:51:05 +09:00
smoogipoo
51bdb73b91 Don't write empty file names 2019-12-12 18:49:47 +09:00
smoogipoo
f89042cd0a Add missing section header 2019-12-12 18:48:22 +09:00
smoogipoo
e09bbf0315 Implement background/video/break encoding 2019-12-12 18:47:28 +09:00
smoogipoo
d1dc3456d1 Fix incorrect repeat point count 2019-12-12 18:42:48 +09:00
smoogipoo
c3475a2dde Write control points in absolute coordinates 2019-12-12 18:41:13 +09:00
smoogipoo
8f03599a62 Write default sampleset by name 2019-12-12 18:40:33 +09:00
Salman Ahmed
a9125f6544 Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-12 12:37:51 +03:00
smoogipoo
be000e13e4 Implement initial legacy beatmap encoding support 2019-12-12 18:34:40 +09:00
Dean Herbert
623ab1ef3b Update time ramp preview on setting change 2019-12-12 17:38:18 +09:00
Dean Herbert
bd3fe23cee Merge branch 'fix-mod-retention' into adjustable-rate-mods 2019-12-12 17:21:15 +09:00
Dean Herbert
a0792f82e8 Re-jig mod select logic to reduce event fires 2019-12-12 17:05:47 +09:00
Dean Herbert
d15f49f60f Also hide the break overlay 2019-12-12 16:13:02 +09:00
Dean Herbert
99280db694 Add note about AlwaysPresent requirement 2019-12-12 16:12:40 +09:00
Dean Herbert
e4297ffead Hide HUD in a better way 2019-12-12 16:12:32 +09:00
Dean Herbert
37a94988a3 Merge branch 'improve-hud-hiding' into cinema-mod 2019-12-12 16:12:19 +09:00
Dean Herbert
94f3dbb2f6 Adjust transitions slightly 2019-12-12 16:09:50 +09:00
Dean Herbert
3ccfee64f6 Add HUDOverlay tests 2019-12-12 16:09:42 +09:00
smoogipoo
59345c97e4 Remove now unnecessary editor working beatmap 2019-12-12 15:58:31 +09:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
Dean Herbert
4c4199269c Use protected constructors 2019-12-12 15:25:37 +09:00
Dean Herbert
ffb5cdc6ae Hide settings overlay along with other HUD-hidden content 2019-12-12 15:20:42 +09:00
Dean Herbert
ad2528d4d2 Hide key counter along with other hud elements 
Also tidies up HUD hide logic and protects against incorrect hiding.
 2019-12-12 15:19:45 +09:00
Dean Herbert
9961fa7385
Merge branch 'master' into adjustable-rate-mods 2019-12-12 15:10:23 +09:00
Dean Herbert
76a7e9cde8 Catch file exception in test reset 2019-12-12 14:04:57 +09:00
Dean Herbert
b6c86d512a Update framework 2019-12-12 13:28:27 +09:00
Dean Herbert
8168872952 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 13:28:21 +09:00
Dean Herbert
606bd33aa6 Use beatmap background in editor 2019-12-12 13:04:32 +09:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks 2019-12-12 11:57:21 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor 2019-12-12 11:36:45 +09:00
unknown
472fa9822c make ModDifficultyAdjust incompatible with ModEasy and ModHardRock 2019-12-12 08:25:51 +08:00
Salman Ahmed
4f6b85e5ea Add test ensuring correct break lightening behaviour 2019-12-12 00:32:39 +03:00
Albie
6b048a03a6 Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod 2019-12-11 19:01:28 +00:00
Albie
2ca722423b remove uneccesary using statement 2019-12-11 18:58:14 +00:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod 2019-12-11 18:00:17 +00:00
Albie
caa9286a90 update tests, change binding and reduce lines in cinema mod 2019-12-11 17:39:40 +00:00
Dean Herbert
e6102200a8 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 01:59:57 +09:00
unknown
b0cf44c3be fix appveyor issues 2019-12-11 20:12:29 +08:00
unknown
b795532aa5 add difficulty adjustment mods 2019-12-11 19:43:16 +08:00
smoogipoo
40f918dce6 Remove unused using 2019-12-11 19:49:32 +09:00
smoogipoo
c34b6b59ed Remove time ramp and rate adjust mod incompatibility 2019-12-11 19:48:57 +09:00
smoogipoo
404d3207ff Refactor ModNightcore/ModDaycore 2019-12-11 19:43:32 +09:00
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods 2019-12-11 19:28:59 +09:00
Dan Balasescu
9963d18d17
Add whitespace 2019-12-11 19:13:04 +09:00
Dan Balasescu
e288706802
Merge branch 'master' into rankings-overlay-refactor 2019-12-11 19:09:29 +09:00
Dan Balasescu
166e957104
Merge pull request #6432 from LeNitrous/customized-mods 
Add per-mod settings
 2019-12-11 19:07:29 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects (#7138) 
Refactor distance snap grid to not require hitobjects
 2019-12-11 19:02:29 +09:00
Dan Balasescu
900cbd7af3
Merge branch 'master' into customized-mods 2019-12-11 18:52:00 +09:00
smoogipoo
48f1dad4aa Remove abstract ScoreProcessor class 2019-12-11 17:25:06 +09:00
Huo Yaoyuan
cffeceb229 Remove unnecessary comment. 2019-12-11 16:24:22 +08:00
Huo Yaoyuan
b86a3dbfab PathStandardise -> ToStandardisedPath 2019-12-11 16:06:56 +08:00
Huo Yaoyuan
6b3c7c8421 Remove usages of FileSafety class. 2019-12-11 16:05:35 +08:00
Albie
83b2e0525e further fixes, not perfect yet 2019-12-11 07:02:51 +00:00
Dean Herbert
75f9250645 Don't automatically pause when window is inactive if in break time 2019-12-11 15:46:07 +09:00
Dean Herbert
6c8f325063 Add failing test 2019-12-11 15:46:07 +09:00
Dean Herbert
9ebad16436 Fix logic regression 2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11 Fix some weird private field names 2019-12-11 14:10:35 +09:00
Dean Herbert
9eed64997f Merge branch 'customized-mods' into adjustable-rate-mods 2019-12-11 13:26:05 +09:00
Dean Herbert
5624b9fd3f Fix US english 2019-12-11 13:19:13 +09:00
Dean Herbert
a37af311d0 Simplify settings update logic 2019-12-11 13:19:02 +09:00
Salman Ahmed
53daa37eaa Fix failing tests 2019-12-10 23:06:13 +03:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
Albie
6c1ae3bc8a add tests 2019-12-10 16:59:31 +00:00
Salman Ahmed
38f1a8bc17 Bind UserDimContainer.IsBreakTime from Player 2019-12-10 15:14:47 +03:00
Salman Ahmed
bb078c2afc Lighten user-dim container if on break time 2019-12-10 15:13:44 +03:00
Salman Ahmed
b93bbf81aa Add lighten background during breaks setting 2019-12-10 15:10:35 +03:00
smoogipoo
c378e525da Extract the rest of legacy enums 2019-12-10 20:23:15 +09:00
smoogipoo
3c18872a16 Extract legacy effect flags enum 2019-12-10 20:19:31 +09:00
smoogipoo
e3f925f69a Extract legacy hitobject type enum 2019-12-10 20:19:16 +09:00
smoogipoo
8012b21ffa Extract legacy sound type enum 2019-12-10 20:18:44 +09:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
Dean Herbert
f6c0b5c44a
Merge branch 'master' into settings-source 2019-12-10 18:49:41 +09:00
Dean Herbert
efc3b7fc9f
Merge branch 'master' into fix-settings-bindable-logic 2019-12-10 18:30:27 +09:00
Dean Herbert
55c938e5da Fix bindable usage 2019-12-10 18:08:24 +09:00
Dean Herbert
65f2d1f875 Update framework 2019-12-10 17:49:42 +09:00
Dean Herbert
f7f4a57c5f Update bindable types in line with framework 2019-12-10 16:48:24 +09:00
Dean Herbert
609c511309 Update framework 2019-12-10 16:43:58 +09:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track 2019-12-10 16:15:24 +09:00
smoogipoo
94a298a82d Refactor distance snap grid to not require hitobjects 2019-12-10 16:00:09 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3 2019-12-10 14:28:20 +09:00
smoogipoo
ab0f2e7c6a Apply suggested refactorings 2019-12-10 13:12:54 +09:00
Dean Herbert
cdde5d1d69 Fix song select filters not reapplied if in a child screen 
Closes https://github.com/ppy/osu/issues/6980.
 2019-12-10 02:30:23 +09:00
Dean Herbert
dc9775742c
Fix incorrect code migration 
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2019-12-10 02:23:17 +09:00
Dean Herbert
12bdb1dafd Pin DC/NC pitch 2019-12-09 20:40:38 +09:00
smoogipoo
47f3c4a596 Don't serialise path version 2019-12-09 20:18:18 +09:00
Dean Herbert
edc8220554 Add time ramp settings 2019-12-09 19:58:51 +09:00
Dean Herbert
7fd52c21f5 Update mods and user adjust to use adjustments 2019-12-09 19:41:31 +09:00
Dean Herbert
6b667daf09 Update bindable types in line with framework 2019-12-09 19:41:18 +09:00
Huo Yaoyuan
ad1fb3bda2 Remove IComparable in constraint. 2019-12-09 17:48:41 +08:00
Huo Yaoyuan
c3518a2b94 Enum constraint for enum dropdown. 2019-12-09 17:45:26 +08:00
Huo Yaoyuan
40a5c1fd96 Constrain transformable with class. 2019-12-09 17:45:26 +08:00
Huo Yaoyuan
04b3297a05 Constrain configuration lookup as enum. 2019-12-09 17:45:26 +08:00
smoogipoo
cd61893814 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 18:25:27 +09:00
smoogipoo
6d9cd0fafe Split out complex method 2019-12-09 18:25:13 +09:00
smoogipoo
b6e2738236 Remove unused using 2019-12-09 18:15:00 +09:00
Dean Herbert
9fa745aecc Merge branch 'apply-to-track' into adjustable-rate-mods 2019-12-09 18:12:01 +09:00
Dean Herbert
d650bfb6d6 Remove unnecessary cast 2019-12-09 18:05:14 +09:00
smoogipoo
a1798fd38d Fix bad ctor implementation 2019-12-09 18:01:13 +09:00
smoogipoo
bfbb9aa18e Remove outdated assert 2019-12-09 18:01:02 +09:00
Dean Herbert
c39d2f006c Merge branch 'master' into fix-settings-bindable-logic 2019-12-09 17:55:17 +09:00
smoogipoo
883d5bc11d Remove automatic slider path offsetting 2019-12-09 17:54:22 +09:00
smoogipoo
9cb649436c Default to linear control point type 2019-12-09 17:47:05 +09:00
smoogipoo
5a093c039c Simplify path/point construction 2019-12-09 17:46:40 +09:00
Dean Herbert
ba538cf09b Merge branch 'apply-to-track' into adjustable-double-time 2019-12-09 17:45:19 +09:00
Dean Herbert
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
Dean Herbert
0c7e5a2e3b Add bindable adjustments for DT/HT rate 2019-12-09 16:54:00 +09:00
Dean Herbert
e37526888c Merge remote-tracking branch 'upstream/master' into adjustable-double-time 2019-12-09 16:43:17 +09:00
dependabot-preview[bot]
12cfb7dedb
Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0 
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 07:28:11 +00:00
smoogipoo
c18f2e6436 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 15:34:49 +09:00
Dan Balasescu
0c9f7a64f1
Merge branch 'master' into improve-dialog-button-visuals 2019-12-09 15:31:48 +09:00
Dan Balasescu
07efd66287
Merge pull request #7075 from peppy/editor-timeline-hitobject-display 
Editor timeline hitobject display
 2019-12-09 14:53:25 +09:00
Dan Balasescu
5738ef5fab
Merge branch 'master' into editor-timeline-hitobject-display 2019-12-09 14:34:55 +09:00
Dean Herbert
58db745121 Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals 2019-12-09 14:11:52 +09:00
Dean Herbert
03d18186c2 Fix broken merge 2019-12-09 14:11:44 +09:00
Andrei Zavatski
69deb0ca96 Fix unavailable replays can be accessed via leaderboard 2019-12-09 07:19:55 +03:00
smoogipoo
4905709ea4 Remove unused usings 2019-12-09 13:19:21 +09:00
Dean Herbert
003eef8595
Fix mod buttons being selected when drag scrolling overlay (#7099) 
Fix mod buttons being selected when drag scrolling overlay
 2019-12-09 12:24:48 +09:00
Dean Herbert
ad2ecf4dff
Fix key config search not clearing after pressing escape (#7105) 
Fix key config search not clearing after pressing escape
 2019-12-09 12:22:30 +09:00
Dean Herbert
4fbe5b7002
Merge branch 'master' into rankings-overlay-refactor 2019-12-09 11:34:32 +09:00
Joehu
9974fff5cc Make sub panel back button inherit osu button 2019-12-08 10:51:25 -08:00
Joehu
5cf35869e9 Fix key config search not clearing after pressing escape 2019-12-08 10:40:39 -08:00
Lucas A
88ec0c1486 Add missing async content loading logic to NewsOverlay 2019-12-08 18:49:58 +01:00
Dean Herbert
fd38e56435
Merge branch 'master' into fix-settings-bindable-logic 2019-12-09 02:18:51 +09:00
Dean Herbert
c2a40c574d Split out if statement for readability 2019-12-09 02:13:47 +09:00
Joehu
e394b28799 Remove redundant transform 2019-12-08 09:12:32 -08:00
Joehu
463b6c0030 Remove whitespace 2019-12-08 09:04:34 -08:00
Joehu
8956768fe0 Fix mod buttons being selected when drag scrolling overlay 2019-12-08 08:55:45 -08:00
Andrei Zavatski
929be3e9e7 Highlight own score in BeatmapSetOverlay 2019-12-08 12:34:07 +03:00
Dan Balasescu
52a0d98012
Merge pull request #7077 from peppy/fix-player-loader-speed 
Fix mod speed adjustments unapplying if exiting the player loading screen early
 2019-12-08 03:53:55 +09:00
Dan Balasescu
54798b134e
Add accessibility modifiers 2019-12-08 03:16:41 +09:00
Dan Balasescu
299daa26da
Merge branch 'master' into dont-confine-skins 2019-12-08 03:14:24 +09:00
Dean Herbert
5347e7c4a2 Apply code quality improvements 2019-12-06 20:14:06 +09:00
Dean Herbert
347373a3ba Fix test failures 2019-12-06 19:04:55 +09:00
Dean Herbert
46d055604a Customize -> Customise 2019-12-06 18:59:45 +09:00
Dean Herbert
680b2653ae Improve animation of popup dialog buttons 2019-12-06 18:51:30 +09:00
smoogipoo
16f8341a02 Handle control point positional updates within SliderPath 2019-12-06 18:49:01 +09:00
Dean Herbert
cf0413663d Merge branch 'settings-source' into customized-mods 2019-12-06 18:05:39 +09:00
Dean Herbert
2fa0b30fa2 Add textbox and dropdown support 2019-12-06 18:04:46 +09:00
Dean Herbert
ed6d1ccd95 Add a method for getting settings UI components automatically from a target class 2019-12-06 18:04:46 +09:00
Dean Herbert
901eb5d996 Fix incorrect trigger logic 2019-12-06 18:03:50 +09:00
Dean Herbert
9de032e35f Fix SettingsItem bindable logic 2019-12-06 17:10:06 +09:00
Dean Herbert
a5d5099868 Use SettingsSource for mod cusomisation 2019-12-06 17:09:48 +09:00
Dean Herbert
23e47530c5 Add a method for getting settings UI components automatically from a target class 2019-12-06 17:09:24 +09:00
smoogipoo
b4e1b5fa98 Explose + use the full calculated length of the path 2019-12-06 15:53:19 +09:00
Dean Herbert
af35df4077 Add multiple mod testing and update test code style 2019-12-06 15:42:11 +09:00
smoogipoo
2654710d91 Add tests and fix negative expected distances 2019-12-06 15:37:06 +09:00
Dean Herbert
170954bc6e Merge remote-tracking branch 'upstream/master' into customized-mods 2019-12-06 15:31:20 +09:00
Dean Herbert
f4bc9f087e Merge remote-tracking branch 'upstream/master' into fix-player-loader-speed 2019-12-06 15:29:06 +09:00
smoogipoo
27dd12a66d Rewrite slider length calculation for readability 2019-12-06 15:06:31 +09:00
Dean Herbert
21ceb7f85d Always display skins at native sizes for now 2019-12-06 14:40:45 +09:00
Dean Herbert
04b89c8242
Merge branch 'master' into expertplus-tooltip-colour 2019-12-06 13:54:13 +09:00
Dean Herbert
48c6279e8b Only undo adjustments in GameplayClockContainer if applied at least once 2019-12-06 13:49:22 +09:00
Dean Herbert
de23364608 Add failing test 2019-12-06 13:47:34 +09:00
Dean Herbert
b1426d1b22 Full impossible nullref 2019-12-06 12:51:43 +09:00
Dean Herbert
9248fbe881 Remove extra checkboxes for now 2019-12-06 12:22:44 +09:00
Dean Herbert
9f4c8db395 Add xmldoc 2019-12-06 12:17:41 +09:00
Ganendra Afrasya
8be6abf607 Add param to let function return lighter colour for some diff 2019-12-06 10:07:16 +07:00
smoogipoo
23c7132c4f Add missing license header 2019-12-06 11:53:22 +09:00
Dean Herbert
28400aa865 Update test scene 2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835 Move thickness to a constant 2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64 Fix warnings 2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb Make work in editor 2019-12-05 20:12:25 +09:00
smoogipoo
3ebbf62b2a Initial game-wide update with the new SliderPath 2019-12-05 19:53:36 +09:00
Dean Herbert
e225b0032a Add basic hitobject display to timeline 2019-12-05 19:31:40 +09:00
smoogipoo
c9a66c0d07 Expose a version to indicate path changes 2019-12-05 18:31:28 +09:00
Dean Herbert
2419077c07 Update framework 2019-12-05 18:31:13 +09:00
smoogipoo
1585d83b96 Add legacy constructor 2019-12-05 18:19:42 +09:00
smoogipoo
986ac1cee4 Make expected distance a bindable 2019-12-05 17:51:29 +09:00
smoogipoo
2702edfa55 Rename new path, replace existing one 2019-12-05 17:49:32 +09:00
Ganendra Afrasya
0e97871461 Change colour if difficulty is ExpertPlus 2019-12-05 14:53:01 +07:00
smoogipoo
5e9b739b67 Re-implement slider paths to support multiple segments 2019-12-05 16:45:02 +09:00
Andrei Zavatski
33737d3d89 Move tests to TestSceneRankingsOverlay due to refactoring 2019-12-05 09:53:25 +03:00
Andrei Zavatski
22863da360 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor 2019-12-05 09:29:37 +03:00
Dean Herbert
de413418c7 Remove redundant prefix 2019-12-05 14:50:12 +09:00
smoogipoo
0149e47673 Expose general control point change event 2019-12-05 14:38:32 +09:00
smoogipoo
3e0f499e72 Add xmldocs 2019-12-05 14:38:21 +09:00
Dean Herbert
6e9157d59c Standardise request/response handling 2019-12-05 14:29:48 +09:00
Dean Herbert
cd473f207a Use child set, not Clear/Add 2019-12-05 14:09:33 +09:00
Dean Herbert
5f9b9631ef Move scope/country restrictions into RankingsOverlay 2019-12-05 14:07:39 +09:00
Dean Herbert
753715f7db
Merge branch 'master' into rankings-overlay-refactor 2019-12-05 13:46:21 +09:00
smoogipoo
40d0700fa5 Add structure for path control points 2019-12-05 13:43:38 +09:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo 2019-12-05 12:43:43 +09:00
Dan Balasescu
f18519965c
Merge branch 'master' into eager-skip-filters 2019-12-05 12:27:42 +09:00
Andrei Zavatski
f8f144b6c0 Remove pointless ScheduledDelegate 2019-12-05 05:20:22 +03:00
Andrei Zavatski
48732e49b9 Improve async logic 2019-12-05 04:20:13 +03:00
Andrei Zavatski
0560a6637c Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor 2019-12-05 04:11:45 +03:00
Dean Herbert
48287459a0 Optimise filters to avoid property retrieval 
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
 2019-12-05 01:52:22 +09:00
Dean Herbert
36224dca13 Fix multiplayer aggregate score inheriting from ScoreInfo 2019-12-05 01:45:28 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase 2019-12-05 01:00:27 +09:00
Dean Herbert
0734b52483 Update framework 2019-12-04 23:33:26 +09:00
Dean Herbert
ca1f3417a3
Merge pull request #7046 from smoogipoo/fix-replay-button 
Fix replay download button not working
 2019-12-04 23:00:40 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running 2019-12-04 11:29:25 +09:00
Huo Yaoyuan
46c9bdcf62 Replace Convert.ChangeType with IConvertible. 2019-12-03 20:49:41 +08:00
Huo Yaoyuan
5375af7820 Remove other Equals(object) calls. 2019-12-03 20:23:27 +08:00
Huo Yaoyuan
05cfef92f9 Don't compare spans with null. 2019-12-03 20:09:58 +08:00
Huo Yaoyuan
a42f9447e6 Don't use Equals(object) on T?. 2019-12-03 20:07:22 +08:00
Dean Herbert
e2591f154b Only parse statistics when not null 2019-12-03 16:16:46 +09:00
Dean Herbert
1ce6a5ceb3 Rename class 2019-12-03 15:38:57 +09:00
Dean Herbert
f0d49d0cdf Decouple APILegacyScoreInfo from ScoreInfo 2019-12-03 15:31:11 +09:00
smoogipoo
aadbbb1af3 Fix replay download button not working 2019-12-03 13:33:42 +09:00
recapitalverb
1ec11946c6
Fix spelling in comment on SearchTextBox.OnPressed 2019-12-02 18:45:57 +07:00
Dean Herbert
6893ec22bb Fix currenTrackCompleted not being run on main thread 2019-12-02 18:26:45 +09:00
Dan Balasescu
700fe5162d
Merge branch 'master' into fix-overlays-drag-closing 2019-12-02 14:12:37 +09:00
Dan Balasescu
133c25f4c1
Merge branch 'master' into hide-mouse-in-playfield 2019-12-02 13:29:32 +09:00
Joehu
74176a6954 Remove redundant ternary expression 2019-12-01 12:54:37 -08:00
Joehu
3b88afd069 Fix overlays closing when dragging from in/out or out/in 2019-12-01 12:02:47 -08:00
Andrei Zavatski
62daea195c Fix possible null 2019-12-01 04:09:45 +03:00
Andrei Zavatski
f375db368f Remove useless null check 2019-12-01 03:56:03 +03:00
Andrei Zavatski
0ac4675546 Implement IEquatable<Country> 2019-12-01 03:52:41 +03:00
Andrei Zavatski
c451542915 Rankings overlay basic implementation 2019-11-30 03:01:07 +03:00
Dean Herbert
c49aeb08c4 Add API methods to perform requests out-of-queue 2019-11-29 20:03:14 +09:00
Dean Herbert
f181ee1843 Hide the menu cursor while inside the playfield by default 2019-11-29 17:35:11 +09:00
Dean Herbert
5dbc32f49b Fix MedalIcon usage 2019-11-29 16:19:57 +09:00
Dean Herbert
b51ebe4431 Fix ScoreResultsPage usage 2019-11-29 15:50:50 +09:00
Dean Herbert
7efbf9f38f Merge remote-tracking branch 'upstream/master' into rankings-tables 2019-11-29 15:37:08 +09:00
Dean Herbert
e678fe7a77 Move potentially expensive load to BDL 2019-11-29 15:35:33 +09:00
Dean Herbert
2663e5d756 Add some more missing LongRunningLoad flags 2019-11-29 13:52:23 +09:00
Dean Herbert
f4f54bc46b Fix social browser calling game-wide load stalls 2019-11-29 13:03:17 +09:00
Andrei Zavatski
36d694ad2d Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-28 20:43:17 +03:00
Dean Herbert
9a941c4f94 Update font loading to use new method 2019-11-29 02:15:13 +09:00
Andrei Zavatski
83e3ad9e69 Make Rankings a ctor variable 2019-11-28 20:09:05 +03:00
Andrei Zavatski
da01f0ee5a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-11-28 20:08:41 +03:00
Dean Herbert
b20e62096d Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale 2019-11-29 01:49:25 +09:00
Albie
7864899249
Merge branch 'master' into cinema-mod 2019-11-28 16:42:01 +00:00
Dean Herbert
bb0a4db847 Fix failing tests 2019-11-29 01:17:58 +09:00
Dean Herbert
b9a8a36e60 Update framework 2019-11-29 00:44:32 +09:00
Ganendra Afrasya
71a871d7d1 Add loved enum on BeatmapApproval 2019-11-28 21:59:57 +07:00
Dean Herbert
56e8a1fdd5 Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale 2019-11-28 22:02:31 +09:00
Dean Herbert
a4f584c6a4 Update framework 2019-11-28 22:00:01 +09:00
Ganendra Afrasya
ada8dabf7e Add right margin on score multiplier text 2019-11-28 18:48:43 +07:00
Dean Herbert
46379902be
Merge branch 'master' into hover-debounce 2019-11-28 20:44:32 +09:00
Dean Herbert
aa9776d51a seal and compact rows 2019-11-28 19:07:43 +09:00
smoogipoo
f504370867 Make player block exit if pausable 2019-11-28 15:58:26 +09:00
Min
92ab8026a0
Completely remove click sound debounce 2019-11-28 16:03:59 +11:00
Ganendra Afrasya
944835da23 Add multiplier score text on mods footer button 2019-11-28 12:01:40 +07:00
Andrei Zavatski
8077c86d13 CI fixes 2019-11-27 23:58:31 +03:00
Andrei Zavatski
800bda7e81 Refactor tables to avoid code duplication 2019-11-27 23:35:02 +03:00
Andrei Zavatski
c546df8a80 Refactor API logic 2019-11-27 21:56:22 +03:00
Andrei Zavatski
2135a7fd7b Don't use repetitive headers in each class 2019-11-27 21:46:41 +03:00
Andrei Zavatski
4cf5968026 Simplify place calculation 2019-11-27 21:39:38 +03:00
Andrei Zavatski
14c471fe5d Move Rankings property below ctor 2019-11-27 21:37:34 +03:00
Andrei Zavatski
bb3152ac8b Use string.empty for empty headers 2019-11-27 21:35:03 +03:00
Dean Herbert
e1302d84dd Use string.Empty 2019-11-28 00:26:10 +09:00
Dean Herbert
2865f32052 Fix nullref on clicking links in tests 2019-11-28 00:13:44 +09:00
Dean Herbert
4221a0126c
Merge branch 'master' into rankings-tables 2019-11-27 23:26:54 +09:00
phosphene47
786fb9ede3 Split click and hover and disable click debounce 2019-11-28 00:44:01 +11:00
phosphene47
d4afea0b5e Use double instead of TimeSpan 2019-11-27 23:06:07 +11:00
phosphene47
037d927e45 TimeSpans can be negative! 2019-11-27 22:51:27 +11:00
phosphene47
b126700f01 Debounce hover sounds 2019-11-27 22:47:00 +11:00
Huo Yaoyuan
ffb5b6c82b Merge branch 'master' into ci 2019-11-27 19:38:24 +08:00
Dean Herbert
01a37771bc
Merge branch 'master' into customized-mods 2019-11-27 19:44:32 +09:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Dean Herbert
9494a477b6
Consider intro and outro time as "break" time (#6960) 
Consider intro and outro time as "break" time

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-11-27 17:09:01 +09:00
smoogipoo
d1e3718038 Reduce the scale of background blurs 2019-11-27 15:04:09 +09:00
Huo Yaoyuan
eba8657d38 Remove newly introduced redundant this. 2019-11-26 18:41:19 +08:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Huo Yaoyuan
deaeda7348 Change packing to be runned by AppVeyor. 2019-11-26 17:17:10 +08:00
Huo Yaoyuan
ffb2f21f50 Merge branch 'master' into ci 2019-11-26 15:41:34 +08:00
Albie
09158b6b08
Merge branch 'master' into cinema-mod 2019-11-26 06:57:47 +00:00
Dean Herbert
ab017ee648 Update framework 2019-11-26 15:37:13 +09:00
Dean Herbert
77ce9642ba Add test coverage and simplify break time updating 2019-11-26 15:32:48 +09:00
Dean Herbert
a453129d44 Fix nullref in tests 2019-11-26 15:13:50 +09:00
Dan Balasescu
8a8e863c0e
Merge branch 'master' into intro-outro-break 2019-11-26 12:47:42 +09:00
Dan Balasescu
7c5a49c4d8
Merge branch 'master' into username-login 2019-11-26 12:28:57 +09:00
Dan Balasescu
b21de98296
Merge branch 'master' into get-end-time 2019-11-26 11:47:01 +09:00
Dean Herbert
fbebbab5db Remove excess parenthesis 2019-11-25 22:37:07 +09:00