Merge branch 'master' into audio

2020-11-22 14:34:03 +03:00
parent f3ec9911ae ce2d4297dd
commit 104d64ff9a
142 changed files with 4769 additions and 1684 deletions
--- a/src/main/resources/assets/textures/entities/pyotr.png
+++ b/src/main/resources/assets/textures/entities/pyotr.png
--- a/src/main/resources/assets/textures/entities/test_skin.png
+++ b/src/main/resources/assets/textures/entities/test_skin.png
--- a/src/main/resources/assets/textures/entities/test_skin_layout.png
+++ b/src/main/resources/assets/textures/entities/test_skin_layout.png
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -13,18 +13,14 @@

        <RollingFile name="FileLog" fileName="${APP_LOG_ROOT}/game.log"
                     filePattern="${APP_LOG_ROOT}/game-%d{yyyy-MM-dd}-%i.log">
-            <LevelRangeFilter minLevel="FATAL" maxLevel="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
            <Policies>
                <SizeBasedTriggeringPolicy size="18MB" />
            </Policies>
-            <DefaultRolloverStrategy max="10"/>
        </RollingFile>
-
    </Appenders>

    <Loggers>
-
        <Root level="info">
            <AppenderRef ref="FileLog"  />
            <AppenderRef ref="Console"  />