Skip to content

Commit 6cba522

Browse files
authored
Merge branch 'master' into directx-silk
2 parents 7a7a5e3 + e68e4d7 commit 6cba522

File tree

1,120 files changed

+139585
-129623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,120 files changed

+139585
-129623
lines changed

.all-contributorsrc

Lines changed: 165 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,9 @@
466466
},
467467
{
468468
"login": "fydar",
469-
"name": "Anthony Marmont",
469+
"name": "Fydar",
470470
"avatar_url": "https://avatars.githubusercontent.com/u/19309165?v=4",
471-
"profile": "https://anthonymarmont.com/",
471+
"profile": "https://fydar.dev",
472472
"contributions": [
473473
"code"
474474
]
@@ -499,6 +499,169 @@
499499
"contributions": [
500500
"code"
501501
]
502+
},
503+
{
504+
"login": "Nicogo1705",
505+
"name": "nicogo.eth",
506+
"avatar_url": "https://avatars.githubusercontent.com/u/20603105?v=4",
507+
"profile": "https://github.com/Nicogo1705",
508+
"contributions": [
509+
"code"
510+
]
511+
},
512+
{
513+
"login": "ourabigdev",
514+
"name": "hatim ourahou",
515+
"avatar_url": "https://avatars.githubusercontent.com/u/147079928?v=4",
516+
"profile": "https://github.com/ourabigdev",
517+
"contributions": [
518+
"code"
519+
]
520+
},
521+
{
522+
"login": "kopffarben",
523+
"name": "kopffarben",
524+
"avatar_url": "https://avatars.githubusercontent.com/u/1833690?v=4",
525+
"profile": "https://github.com/kopffarben",
526+
"contributions": [
527+
"code"
528+
]
529+
},
530+
{
531+
"login": "Feralnex",
532+
"name": "Tomasz Czech",
533+
"avatar_url": "https://avatars.githubusercontent.com/u/30673252?v=4",
534+
"profile": "https://github.com/Feralnex",
535+
"contributions": [
536+
"code"
537+
]
538+
},
539+
{
540+
"login": "TranquilAbyss",
541+
"name": "Tranquil Abyss",
542+
"avatar_url": "https://avatars.githubusercontent.com/u/2864849?v=4",
543+
"profile": "https://github.com/TranquilAbyss",
544+
"contributions": [
545+
"code"
546+
]
547+
},
548+
{
549+
"login": "levifmorais",
550+
"name": "Levi Ferreira",
551+
"avatar_url": "https://avatars.githubusercontent.com/u/102878183?v=4",
552+
"profile": "https://github.com/levifmorais",
553+
"contributions": [
554+
"design"
555+
]
556+
},
557+
{
558+
"login": "tymokvo",
559+
"name": "Tyler Kvochick",
560+
"avatar_url": "https://avatars.githubusercontent.com/u/12144028?v=4",
561+
"profile": "http://tylerkvochick.com",
562+
"contributions": [
563+
"doc"
564+
]
565+
},
566+
{
567+
"login": "Arc-huangjingtong",
568+
"name": "Arc",
569+
"avatar_url": "https://avatars.githubusercontent.com/u/87562566?v=4",
570+
"profile": "https://github.com/Arc-huangjingtong",
571+
"contributions": [
572+
"code"
573+
]
574+
},
575+
{
576+
"login": "minktusk",
577+
"name": "minktusk",
578+
"avatar_url": "https://avatars.githubusercontent.com/u/121324712?v=4",
579+
"profile": "https://github.com/minktusk",
580+
"contributions": [
581+
"code",
582+
"content"
583+
]
584+
},
585+
{
586+
"login": "timcassell",
587+
"name": "Tim Cassell",
588+
"avatar_url": "https://avatars.githubusercontent.com/u/35501420?v=4",
589+
"profile": "https://www.timcassell.net/",
590+
"contributions": [
591+
"code"
592+
]
593+
},
594+
{
595+
"login": "dloe",
596+
"name": "Dylan Loe",
597+
"avatar_url": "https://avatars.githubusercontent.com/u/18317814?v=4",
598+
"profile": "http://www.linkedin.com/in/dylan-loe",
599+
"contributions": [
600+
"code"
601+
]
602+
},
603+
{
604+
"login": "wrshield",
605+
"name": "Will S",
606+
"avatar_url": "https://avatars.githubusercontent.com/u/145876802?v=4",
607+
"profile": "https://github.com/wrshield",
608+
"contributions": [
609+
"code"
610+
]
611+
},
612+
{
613+
"login": "soorMSWE",
614+
"name": "Ryan Soo",
615+
"avatar_url": "https://avatars.githubusercontent.com/u/147351572?v=4",
616+
"profile": "https://github.com/soorMSWE",
617+
"contributions": [
618+
"code"
619+
]
620+
},
621+
{
622+
"login": "MechWarrior99",
623+
"name": "MechWarrior99",
624+
"avatar_url": "https://avatars.githubusercontent.com/u/8076495?v=4",
625+
"profile": "https://github.com/MechWarrior99",
626+
"contributions": [
627+
"code"
628+
]
629+
},
630+
{
631+
"login": "kristian15959",
632+
"name": "Proxid",
633+
"avatar_url": "https://avatars.githubusercontent.com/u/8007327?v=4",
634+
"profile": "https://github.com/kristian15959",
635+
"contributions": [
636+
"code"
637+
]
638+
},
639+
{
640+
"login": "YerkoAndrei",
641+
"name": "Yerko Andrei",
642+
"avatar_url": "https://avatars.githubusercontent.com/u/19843418?v=4",
643+
"profile": "http://yerkoandrei.github.io",
644+
"contributions": [
645+
"code"
646+
]
647+
},
648+
{
649+
"login": "ComputerSmoke",
650+
"name": "Addison Schmidt",
651+
"avatar_url": "https://avatars.githubusercontent.com/u/22194459?v=4",
652+
"profile": "https://github.com/ComputerSmoke",
653+
"contributions": [
654+
"code"
655+
]
656+
},
657+
{
658+
"login": "timconner",
659+
"name": "Tim Conner",
660+
"avatar_url": "https://avatars.githubusercontent.com/u/22841670?v=4",
661+
"profile": "https://github.com/timconner",
662+
"contributions": [
663+
"code"
664+
]
502665
}
503666
],
504667
"contributorsPerLine": 7,

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
As a [.NET Foundation](https://www.dotnetfoundation.org/) project, Stride has adopted the code of conduct defined by the [Contributor Covenant](https://www.contributor-covenant.org/) to clarify the expected behavior within our community. For more information, please see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
1+
As a [.NET Foundation](https://www.dotnetfoundation.org/) project, Stride has adopted the code of conduct defined by the [Contributor Covenant](https://www.contributor-covenant.org/) to clarify the expected behavior within our community.
2+
3+
For more information, please see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

0 commit comments

Comments
 (0)