Fix and improve code owners

1 files changed, 54 insertions, 33 deletions

diff --git a/CODEOWNERS b/CODEOWNERS
index 27315f2c9d..3a973a100a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,36 +2,57 @@
 # Each line is a file pattern followed by one or more owners.
 # Owners can be @users, @org/teams or emails
 
-core/*            @reduz
-
-doc/*             @godotengine/documentation
-
-drivers/gles2/*   @karroffel
-drivers/gles3/*   @reduz
-
-editor/icons/*    @djrm
-
-main/*            @reduz
-
-misc/*            @akien-mga
-
-modules/bullet/*     @AndreaCatania
-modules/enet/*       @godotengine/network
-modules/gdnative/*   @karroffel
-modules/gdscript/*   @reduz @vnen @bojidar-bg
-modules/mbedtls/*    @godotengine/network
-modules/mobile_vr/*  @BastiaanOlij
-modules/mono/*       @neikeq
-modules/regex/*      @LeeZH
-modules/upnp/*       @godotengine/network
-modules/websocket/*  @godotengine/network
-
-platform/javascript/*  @eska014
-platform/uwp/*         @vnen
-
-scene/main/*      @reduz
-
-server/physics*   @reduz @AndreaCatania
-server/visual*    @reduz @karroffel
-
-thirdparty/*      @akien-mga
+/core/               @reduz
+
+/doc/                @godotengine/documentation
+doc_classes/*        @godotengine/documentation
+
+# Rendering
+/drivers/gl_context/ @reduz
+/drivers/gles2/      @reduz
+/drivers/gles3/      @reduz
+
+# Audio
+/drivers/alsa/       @marcelofg55
+/drivers/alsamidi/   @marcelofg55
+/drivers/coreaudio/  @marcelofg55
+/drivers/coremidi/   @marcelofg55
+/drivers/pulseaudio/ @marcelofg55
+/drivers/rtaudio/    @marcelofg55
+/drivers/wasapi/     @marcelofg55
+/drivers/winmidi/    @marcelofg55
+/drivers/xaudio2/    @marcelofg55
+
+# Porting
+/drivers/unix/       @reduz @hpvb
+/drivers/windows/    @reduz @hpvb
+
+/editor/icons/       @djrm
+
+/main/               @reduz
+
+/misc/               @akien-mga
+
+/modules/bullet/     @AndreaCatania
+/modules/csg/        @reduz @BastiaanOlij
+/modules/enet/       @godotengine/network
+/modules/gdnative/   @karroffel
+/modules/gdnative/*arvr/ @BastiaanOlij
+/modules/gdscript/   @reduz @vnen @bojidar-bg
+/modules/mbedtls/    @godotengine/network
+/modules/mobile_vr/  @BastiaanOlij
+/modules/mono/       @neikeq
+/modules/opensimplex/ @JFonS
+/modules/regex/      @LeeZH
+/modules/upnp/       @godotengine/network
+/modules/websocket/  @godotengine/network
+
+/platform/javascript/ @eska014
+/platform/uwp/       @vnen
+
+/scene/main/         @reduz
+
+/server/physics*/    @reduz @AndreaCatania
+/server/visual*/     @reduz @karroffel
+
+/thirdparty/         @akien-mga