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

2214 Commits

Author SHA1 Message Date
Bartłomiej Dach
391dd73843 Fix typo in comment 2020-10-30 22:39:34 +01:00
Bartłomiej Dach
38cf90a69b Change background to seasonal right after login 2020-10-30 22:03:26 +01:00
Bartłomiej Dach
29ad099902 Allow to fetch if going online after launch 2020-10-30 21:49:14 +01:00
Bartłomiej Dach
67a325f47d Move config setting logic to background loader 2020-10-30 21:22:22 +01:00
Bartłomiej Dach
20c27c6943 Rename lookup & field 2020-10-30 19:55:22 +01:00
Bartłomiej Dach
82ef85569b Fix nullref when querying IsInSeason before request completion 2020-10-30 19:35:08 +01:00
Max Hübner
51a58269ad Fix nullref in case of successfull request but no backgrounds available 2020-10-30 17:57:29 +01:00
Max Hübner
f6eb5680ec Save full api response in SessionStatics 2020-10-30 16:43:18 +01:00
Max Hübner
d19dd4eef6 IsInSeason() -> IsInSeason 2020-10-30 15:56:19 +01:00
Max Hübner
f27ce7521d Make "Sometimes" setting depend on season end date, rather than chance 2020-10-30 10:27:43 +01:00
Max Hübner
d9846fad37 Remove fallback texture parameter
When there isn't a seasonal event, we don't want to fall back to the basic background here, but rather to the user selected background source.
2020-10-29 18:03:36 +01:00
Max Hübner
907e1921c7 Make SeasonalBackgroundLoader read from SessionStatics 2020-10-29 17:31:42 +01:00
Max Hübner
c1d03a5bac Add SeasonalBackgroundLoader and SeasonalBackground 2020-10-23 13:40:13 +02:00
Bartłomiej Dach
58c9e57a68 Fix comment 2020-10-21 17:17:23 +02:00
Dean Herbert
22112e4303 Fix ISourcedFromTouch events being blocked by LoadingLayer 2020-10-21 23:11:51 +09:00
Dean Herbert
f597572d73 Add comment with reasoning for TopRight anchor 2020-10-19 16:02:39 +09:00
Dean Herbert
03f336feb5 Merge branch 'master' into fix-tournament-ruleset-dropdown-anchor 2020-10-19 15:57:19 +09:00
Dean Herbert
cb1784a846 Fix score displays using non-matching zero padding depending on user score display mode 2020-10-19 14:05:28 +09:00
Dean Herbert
254eba9008 Add and consume skinnable accuracy counter 2020-10-15 17:53:16 +09:00
Dean Herbert
219cbec6bd Split out DefaultScoreCounter and make ScoreCounter abstract 2020-10-15 16:32:30 +09:00
Dean Herbert
2fce064e32 Add basic legacy combo counter and updating positioning logic 2020-10-14 19:16:34 +09:00
Dean Herbert
899bac6ca5 Rename catch combo counter for clarity 2020-10-14 19:16:34 +09:00
Dean Herbert
f5623ee21e Setup skinnable combo counter component with default implementation 2020-10-14 19:16:34 +09:00
Dean Herbert
87bf3bdc16 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:26:06 +09:00
Dean Herbert
dde7f706aa Avoid rapid triangle repositioning during editor slider placement 2020-10-02 15:51:14 +09:00
Dan Balasescu
600d37cc04
Merge pull request #10254 from peppy/fix-pancake-scrollbar
Fix scroll container's scrollbar not respecting minimum size on first resize
2020-09-28 13:31:21 +09:00
Dean Herbert
204024c76e Merge branch 'master' into editor-load-audio 2020-09-25 18:32:51 +09:00
Dan Balasescu
f1efc0ba42
Merge pull request #10240 from peppy/fix-setup-textbox-commit
Ensure setup screen text boxes commit on losing focus
2020-09-25 14:58:26 +09:00
Dean Herbert
7f9a5f5f0d Ensure setup screen text boxes commit on losing focus 2020-09-25 14:25:24 +09:00
Dean Herbert
71e1f981fe Merge branch 'file-selector' into editor-load-audio 2020-09-25 12:44:00 +09:00
Dean Herbert
a890e5830d Add more file icons 2020-09-25 12:42:28 +09:00
Joehu
6ff26f6b8c Fix anchor of tournament ruleset selector dropdown 2020-09-24 12:52:42 -07:00
Dean Herbert
c3df7e1fa8 Fix scroll container's scrollbar not respecting minimum size on first resize 2020-09-25 01:05:12 +09:00
Dean Herbert
4b9581bca0 Add audio selection to song setup screen 2020-09-24 20:56:35 +09:00
Dean Herbert
937d5870b3 Add a basic file selector with extension filtering support 2020-09-24 20:54:25 +09:00
Joehu
393ee1c9f5 Fix hovered osu tab items not showing hover state when deselected 2020-09-17 23:09:09 -07:00
Joehu
370f22f975 Show drag handle by default on main class 2020-09-10 11:11:45 -07:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
Dean Herbert
af412947b2
Merge branch 'master' into collection-database 2020-09-09 22:59:46 +09:00
Dan Balasescu
fbbc3b4921
Merge branch 'master' into fix-overlay-sound-on-disabled 2020-09-09 21:54:00 +09:00
smoogipoo
12188ec3c9 Fix broken RollingCounter current value 2020-09-09 20:51:56 +09:00
Dean Herbert
cdf3e20685 Add comment regarding feedback 2020-09-09 18:07:58 +09:00
Dean Herbert
b1daca6cd3 Fix overlay sound effects playing when open requested while disabled 2020-09-09 18:05:44 +09:00
smoogipoo
117c7ec6b2 Merge branch 'master' into score-recalc 2020-09-09 14:38:36 +09:00
Dean Herbert
66d3bda962
Merge branch 'master' into collection-database 2020-09-08 23:18:47 +09:00
Dean Herbert
c38e7d796a Fix tab key not working 2020-09-08 19:52:56 +09:00
Dean Herbert
2b4e2d8ed6 Standardise corner radius of dropdowns 2020-09-08 19:04:46 +09:00
smoogipoo
ae022d7559 Show all items in dropdown, set global max height 2020-09-08 18:55:53 +09:00
smoogipoo
1260e30cde Make ShowDragHandle into a bindable 2020-09-08 16:36:36 +09:00
smoogipoo
6cc4517600 Merge branch 'master' into collection-database 2020-09-07 20:03:11 +09:00
Dean Herbert
1a55d92c71 Use local input manager 2020-09-07 15:31:05 +09:00
Dean Herbert
daff060c9a Hide the game-wide cursor on touch input 2020-09-07 15:20:51 +09:00
Dean Herbert
d55c9c3cc2 Fix UserProfile weirdness 2020-09-03 17:11:34 +09:00
Dan Balasescu
84b3604192
Merge branch 'master' into game-overlay-activation-mode 2020-09-03 13:34:22 +09:00
smoogipoo
6862571672 Fix IconButton sometimes not recolourising 2020-09-02 22:02:57 +09:00
Dan Balasescu
f08e7828da
Merge branch 'master' into beatmap-track-rework 2020-09-01 16:06:38 +09:00
Dean Herbert
a171d0e292 Remove unused methods and classes 2020-08-31 18:14:22 +09:00
Dean Herbert
8b7446c43f Fix RollingCounter not updating initial value if changed before loaded 2020-08-31 18:13:51 +09:00
Lucas A
ad223bc460 Make game bindable immutable. 2020-08-29 19:34:53 +02:00
smoogipoo
c1838902a6 Add to more places 2020-08-28 22:51:48 +09:00
smoogipoo
1e5e5cae0c Add support for standardised -> classic changes 2020-08-28 21:34:34 +09:00
Dean Herbert
f65991f31f Revert some usages based on review feedback 2020-08-26 23:28:58 +09:00
Dean Herbert
357fb3a10e Merge branch 'master' into beatmap-track-rework 2020-08-21 12:53:09 +09:00
Dean Herbert
5714c761eb
Merge pull request #9768 from frenzibyte/allow-counter-customize-sprite-text
Allow providing custom sprite text for RollingCounter<T>
2020-08-20 00:14:48 +09:00
Dean Herbert
1badc584f6 Update textbox event names 2020-08-19 22:10:58 +09:00
Salman Ahmed
5759ffff6f Use the property instead of the backing field 2020-08-19 07:45:05 +03:00
Salman Ahmed
8f1a71c6b1 Remove counter sprite attributes for not being of any reasonable use 2020-08-19 07:44:45 +03:00
Dean Herbert
71f4e753f0 Merge branch 'master' into beatmap-track-rework 2020-08-16 22:35:32 +09:00
Dean Herbert
671141ec61 Load menu backgrounds via LargeTextureStore to reduce memory usage 2020-08-14 18:05:05 +09:00
smoogipoo
11a6c9bdcc Revert unnecessary change 2020-08-06 16:24:14 +09:00
smoogipoo
5c05fe3988 Expose track from MusicController 2020-08-06 16:24:14 +09:00
smoogipoo
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
Salman Ahmed
9d10658e3c Allow providing custom sprite text for RollingCounter<T> 2020-08-03 20:14:17 +03:00
Dean Herbert
e5991d6e14 Change method structure for hover/unhover state setting (shouldn't be called "Fade") 2020-07-30 13:49:04 +09:00
Andrei Zavatski
d4496eb982 Update ShowMoreButton in line with web 2020-07-30 04:51:09 +03:00
Dean Herbert
c1b9b847ec Merge branch 'master' into grey-logo-animation 2020-07-27 14:10:52 +09:00
Poliwrath
05235c70c5 remove jpeg quality setting, use 92 for quality 2020-07-24 02:26:45 -04:00
Poliwrath
4e0f16a450 Add JPEG screenshot quality setting 2020-07-24 02:00:18 -04:00
Dean Herbert
f75f1231b7 Invert conditional for readability 2020-07-24 10:41:09 +09:00
Dean Herbert
df3b91d029
Merge branch 'master' into fix-menu-cursor-container-allocs 2020-07-24 10:36:26 +09:00
jorolf
50f72ac9cb rename classes 2020-07-22 22:10:59 +02:00
Joehu
f71ed47e66 Fix focused textbox absorbing input when unfocused 2020-07-20 11:52:02 -07:00
Dean Herbert
72ace508b6 Reduce memory allocations in MenuCursorContainer 2020-07-19 11:41:54 +09:00
Dean Herbert
8147e67f53 Use static instances in all fallback ControlPoint lookups to reduce allocations 2020-07-18 11:53:04 +09:00
Dean Herbert
fe68e8276d Merge branch 'master' into logo-shader 2020-07-15 19:06:35 +09:00
Joehu
681f001525 Convert icon to local variable 2020-07-11 19:19:34 -07:00
Joehu
4d7dc9f5eb Fix color and underline of tab control checkboxes when initially checked 2020-07-11 18:27:47 -07:00
Dean Herbert
840380e0de Fix LocallyAvailable state case getting cleared 2020-07-10 20:30:59 +09:00
Dean Herbert
c7b5c5aef4 Add tooltips to beatmap download button 2020-07-10 20:22:51 +09:00
Dean Herbert
f699a34c77 Rename variable for potential future expansion 2020-07-10 18:19:18 +09:00
Dean Herbert
664ab6d5f6
Merge branch 'master' into add-textbox-samples-and-fix-distingushing-passwords 2020-07-10 17:14:46 +09:00
Dean Herbert
bbbe8d6f68 Remove group selector for now, tidy up code somewhat 2020-07-09 13:47:11 +09:00
Andrei Zavatski
bdec13d4a4 Move DateTooltip to it's on file 2020-07-07 16:46:17 +03:00
Andrei Zavatski
447cd17cf6 Merge remote-tracking branch 'refs/remotes/ppy/master' into news 2020-07-07 16:36:41 +03:00
Andrei Zavatski
c86bb2e755 Use DrawableDate tooltip for DateContainer 2020-07-07 00:01:06 +03:00
smoogipoo
cb69d1a865 Fix crash when changing tabs in changelog 2020-07-03 16:47:34 +09:00
jorolf
79eca8e1bf remove unneeded "base." 2020-06-28 17:55:01 +02:00
jorolf
1409ace282 apply suggestions 2020-06-25 00:59:12 +02:00
jorolf
6f0ec36407 remove size from hue animation 2020-06-24 16:27:00 +02:00
jorolf
768e28faba generalize and simplify animation 2020-06-24 14:11:38 +02:00
Dean Herbert
f2735a7797 Use new empty ChannelAmplitudes spec 2020-06-23 21:30:37 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
Dean Herbert
e91c2ee5e2 Simplify logic by considering all buttons equally 2020-06-22 16:19:38 +09:00
Power Maker
9230c148c7 Add cursor rotation on middle mouse button 2020-06-13 12:18:50 +02:00
Power Maker
aa977569e2
Merge branch 'master' into master 2020-06-12 16:41:34 +02:00
Power Maker
8924ff4ba6 Rename shouldRotateCursor() to shouldKeepRotating() 2020-06-12 15:43:19 +02:00
Power Maker
b076cf96b7 move cursorRotate.Value check into shouldRotateCursor() method 2020-06-12 13:20:09 +02:00
Dean Herbert
91b6979c97 Fix LoadingSpinner not always playing fade in animation 2020-06-12 13:38:20 +09:00
Salman Ahmed
178bbf16d1
Fix password text boxes having distinguishable key sounds
Closes https://github.com/ppy/osu-framework/issues/3280
2020-06-05 06:44:41 +03:00
Salman Ahmed
c6c88a901c
Add text box sample playback logic in OsuTextBox
Moved from osu!framework.
2020-06-05 06:43:44 +03:00
Power Maker
939a76b08f Simplify negative equality expression 2020-06-03 21:42:23 +02:00
Power Maker
ff220b2ebe Remove unnecessary using statement. 2020-06-03 21:13:11 +02:00
Power Maker
747ecd5ab2 Rename method to avoid confusion 2020-06-03 20:50:37 +02:00
Power Maker
eb15fc0bf9 Remove unnecessary comment 2020-06-03 20:46:24 +02:00
Power Maker
3fa02a5782 Add method for any mouse button pressed. 2020-06-03 20:43:47 +02:00
Power Maker
89d973416a
Simplify shouldRotate method
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-06-03 20:35:44 +02:00
Power Maker
86a4664d9b Add method for checking if cursor should rotate 2020-06-03 10:03:39 +02:00
Power Maker
fa4d13a22b Fixed whitespace 2020-06-02 22:25:25 +02:00
Power Maker
85d0c04e61
Add cursor rotation on right mouse button 2020-06-02 20:57:02 +02:00
Power Maker
a2fdf94483
Add cursor rotation on right mouse button 2020-06-02 20:55:21 +02:00
Dean Herbert
3487c1fd1b Add menus to mark as rim and strong 2020-05-29 16:45:47 +09:00
Dan Balasescu
e975e53e39
Merge branch 'master' into sections-container-fix 2020-05-18 19:16:44 +09:00
Dean Herbert
11537dd688 Merge branch 'master' into tourney-subscreen-back-button 2020-05-17 17:38:36 +09:00
Dean Herbert
13d4997c91 Remove custom back action logic (use receptor as intended) 2020-05-17 17:35:10 +09:00
Fukashi13
6416ace70d fixed indent 2020-05-15 14:31:05 +02:00
Fukashi13
c55eb83351 last section gets selected when scrolling to bottom of list 2020-05-15 14:03:45 +02:00
Fukashi13
097fcfd9ad
Update osu.Game/Graphics/Containers/SectionsContainer.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-15 00:06:58 +02:00
Fukashi13
e390d70b70 bestMatch changes on entering section with screen top border 2020-05-14 14:33:12 +02:00
Dean Herbert
d04079f6ab Fix directory selector not masking properly 2020-05-14 17:41:55 +09:00
Dean Herbert
6bb06e9d61 Expose CurrentDirectory bindable for consumption 2020-05-14 17:41:55 +09:00
Dean Herbert
149cb93e8c Add very basic error handling when a directory cannot be enumerated 2020-05-14 13:18:37 +09:00
Dean Herbert
c048d9b6ae Fix incorrect assignment 2020-05-13 18:55:06 +09:00
Dean Herbert
e9e03d038d Tidy up naming and structure 2020-05-13 18:54:46 +09:00
Dean Herbert
246812e0b1 Change breadcrumb display icons to match design 2020-05-13 18:54:45 +09:00
Dean Herbert
49e4fc6cba Move to better namespace 2020-05-13 18:54:45 +09:00
Joehu
259ef68811 Fix date tooltip not showing in 24-hour format 2020-05-06 22:29:37 -07:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
Dan Balasescu
4e22e569f5
Merge branch 'master' into timing-equivalence 2020-04-17 17:12:38 +09:00
smoogipoo
69fb984e71 Remove EquivalentTo() and Equals() 2020-04-17 17:04:09 +09:00
smoogipoo
9e2be6f2f4 Remove bindable to promote one-way access 2020-04-16 13:25:08 +09:00
smoogipoo
102c1d9095 Add disabled state to menu items 2020-04-15 16:17:17 +09:00
Dean Herbert
0be2dc9b2d Tidy up SectionsContainer class layout/ordering 2020-04-13 20:13:48 +09:00
Andrei Zavatski
b741e359cd Use OverlayScrollContainer for overlays 2020-04-13 12:23:28 +03:00
Dean Herbert
e10576325c
Merge branch 'master' into update-overlay-headers 2020-04-09 16:29:34 +09:00
TheWildTree
e33055e2c4 Simplify active tab font changes and expose necessary fields in OsuTabItem 2020-03-26 14:19:36 +01:00
Dean Herbert
07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
Dean Herbert
87db1ba487 Remove unused text transform helpers 2020-03-25 14:58:49 +09:00
TheWildTree
e85f45f911 Move old ScreenTitle to MultiHeaderTitle 2020-03-24 22:03:16 +01:00
Dean Herbert
729e006c3a
Merge branch 'master' into video-offset 2020-03-21 20:03:46 +09:00
Dean Herbert
7cece7ce1b
Merge pull request #8339 from smoogipoo/update-rank-colours
Update rank badge colours
2020-03-18 18:59:45 +09:00
smoogipoo
b91dc15dbf Update rank badge colours 2020-03-18 17:37:03 +09:00
smoogipoo
5f09c70f75 Move judgement colours to OsuColour 2020-03-18 17:21:36 +09:00
Dan Balasescu
514e72bffb
Merge branch 'master' into update-loader-animation 2020-03-18 11:36:29 +09:00
Dean Herbert
8396fcfd35
Merge pull request #8304 from smoogipoo/results-circle
Implement a circle that displays the user's accuracy
2020-03-17 18:59:40 +09:00
smoogipoo
e56d0f2eea Add black font weighting 2020-03-17 17:16:10 +09:00
smoogipoo
d77b0acd90 Move rank colour to OsuColour 2020-03-17 16:25:41 +09:00
smoogipoo
9e7c388202 Expose Spacing and UseFullGlyphHeight 2020-03-17 16:24:49 +09:00
Joehu
f7ea20a926 Limit font weight to bold 2020-03-16 16:32:25 -07:00
Dean Herbert
cd604785a8 Ignore italics specification for now 2020-03-15 00:38:27 +09:00
Dean Herbert
c45f9cafd4 Add medium -> regular fallback for torus 2020-03-13 13:43:48 +09:00
Dean Herbert
288470c313 Remove exo specification completely 2020-03-13 13:43:48 +09:00
Dan Balasescu
1d556bfc5f
Merge branch 'master' into video-offset 2020-03-11 15:13:18 +09:00
Dean Herbert
ec88f7a712 Update tests and delay push animation until loader is done disappearing 2020-03-11 13:20:31 +09:00
Dean Herbert
4012e878b0 Update loader look 2020-03-11 13:05:33 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Dean Herbert
c1ac800473
Merge pull request #8186 from Joehuu/fix-textbox-backspace-animation
Fix textbox characters not animating when typing/backspacing
2020-03-09 14:03:33 +09:00
Joehu
3903423a37 Fix textbox characters not animating when typing/backspacing 2020-03-08 19:43:53 -07:00
Dean Herbert
979988235d Increase flexibility of StarCounter component 2020-03-08 15:56:22 +09:00
voidedWarranties
48282dea8b Remove individual setting to disable videos, fix tests 2020-03-07 22:08:38 -08:00
Dan Balasescu
aa17a64a0e
Apply missed xmldoc suggestion 2020-03-04 12:47:01 +09:00
Dean Herbert
e9b0770f64
Apply suggestions from code review
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-04 12:44:44 +09:00
Dean Herbert
4294ed4b64 Better align fonts to weights 2020-03-04 11:45:19 +09:00
Dean Herbert
db56fb5759 Fix venera font usage 2020-03-03 22:28:47 +09:00
Dean Herbert
f1f4f1ffbd Add torus font 2020-03-03 18:17:51 +09:00
Dean Herbert
69b4713731 Refactor everything so I can read the code 2020-03-02 20:16:58 +09:00
smoogipoo
da89798765 Merge remote-tracking branch 'origin/master' into layout-rework 2020-02-26 15:06:40 +09:00
smoogipoo
334ec7bbd4 Apply further framework changes 2020-02-26 15:06:30 +09:00
smoogipoo
f71c45cb1b Remove shallPropagate 2020-02-25 11:30:33 +09:00
smoogipoo
6c28fd21c7 osu-side changes 2020-02-24 20:52:15 +09:00
Dean Herbert
aaa888a7c1 Adjust spin duration to make rotation more variable 2020-02-23 05:00:38 +09:00
Dean Herbert
8dbcdebd28 Use LoadingLayer at player loading screen 2020-02-23 05:00:08 +09:00
Dean Herbert
e7ac37715f Don't handle non-positional input 2020-02-21 16:31:16 +09:00
Dean Herbert
dacbbb5eee Add a maximum size to ensure things don't get out of hand 2020-02-21 16:11:09 +09:00
Dean Herbert
b94f937f7e Fill in missing xmldoc 2020-02-21 15:35:40 +09:00
Dean Herbert
92f6f0207c Rename LoadingAnimation to LoadingSpinner 2020-02-21 15:33:31 +09:00
Dean Herbert
623b78d675 Combine all loading animation implementations 2020-02-21 15:32:46 +09:00
Dean Herbert
4fb4c03956
Merge pull request #7779 from Malox10/hoverable-timestamps
Add tooltips with precise dates to beatmap set overlay
2020-02-21 09:48:22 +09:00
Dean Herbert
6c21cc3926
Adjust easing type to match in disposal clause
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-02-21 08:55:12 +09:00
Dan Balasescu
7adedcb7b9
Fix typo
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-21 08:34:51 +09:00
Dean Herbert
3380dbbd71 Improve visual appearance of ProcessingOverlay 2020-02-20 19:49:22 +09:00
smoogipoo
ec73e8f0c7 Allow different sizing modes for OverlinedParticipants 2020-02-19 17:40:38 +09:00
Andrei Zavatski
b6423dd92e Small textbox adjustments 2020-02-18 17:40:12 +03:00
Andrei Zavatski
ae942388a2 Move OsuTabDropdown to it's own file 2020-02-17 23:56:35 +03:00
recapitalverb
7c9569c9a3
Merge branch 'master' into remove-duplicated-load 2020-02-15 12:10:34 +07:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
smoogipoo
1909ea2bd3 Add a way to hide the drag handle 2020-02-14 16:09:19 +09:00
smoogipoo
eb75d26c8f Extract common rearrangeable list design 2020-02-14 15:36:16 +09:00
Berkan Diler
50899ddccb Use Span for OsuColour.FromHex 2020-02-14 03:19:25 +01:00
Malox10
c08398a404
Merge branch 'master' into hoverable-timestamps 2020-02-13 15:21:09 +01:00
Maximilian Junges
b2fbeab773 simplify string formatting and fix color 2020-02-13 14:07:14 +01:00