[PRE-RELEASE] 2.0.0-alpha.3 (#21)

.gitignore

@@ -21,21 +21,6 @@ src/Tools/toolsource_old/
 *.iws
 
 *.pdb
-compiler/BlitzRC/src/libvorbis/win32/VS2010/.vs/*
-
-compiler/BlitzRC/src/libvorbis/win32/VS2010/.vs/
-
-compiler/BlitzRC/src/libvorbis/win32/VS2010/libvorbis/Win32/Release/
-
-compiler/BlitzRC/src/libvorbis/win32/VS2010/libvorbisfile/Win32/Release/
-
-compiler/BlitzRC/src/libvorbis/win32/VS2010/vorbisdec/Win32/Release/
-
-compiler/BlitzRC/src/libvorbis/win32/VS2010/vorbisenc/Win32/Release/
-
-compiler/BlitzRC/src/libvorbis/win32/VS2010/Win32/Release/vorbisenc_static.exe
-
-compiler/BlitzRC/src/libvorbis/win32/VS2010/Win32/Release/vorbisdec_static.exe
 
 ATTACH
 
@@ -82,3 +67,11 @@ data/Server Data/Accounts.dat
 data/Server Data/Environment.dat
 
 .vscode/settings.json
+
+Game/
+
+Server/
+
+.vscode/c_cpp_properties.json
+
+.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "compiler/BlitzForge"]
+	path = compiler/BlitzForge
+	url = https://github.com/RydeTec/blitz-forge.git

.vscode/tasks.json

@@ -5,8 +5,8 @@
         "id": "compilerVersion",
         "type": "pickString",
         "description": "Select Compiler",
-        "options": ["BlitzRC", "BlitzPlus"],
-        "default": "BlitzRC"
+        "options": ["BlitzForge", "BlitzPlus"],
+        "default": "BlitzForge"
       }
     ],
     "tasks": [

ReadMe.md

@@ -8,7 +8,7 @@ RealmCrafter: Community Edition is an actively maintained and updated version of
 You can download a pre-compiled version of the latest release here: https://github.com/RydeTec/rcce2/releases
 
 ## Compile
-Once you download the repository you can compile easily by running the `compile.bat` batch file. A release can be generated by running the `publish.bat` batch file.
+Once you download the repository you can compile easily by running the `compile.bat` batch file. A release can be generated by running the `publish.bat` batch file. If you would like to build the entire blitz toolchain along with the engine and tools you can run `compile.bat -b`. You can use `-e` to skip the engine compilation and `-t` to skip the engine tools.
 
 ## Contribute
 
@@ -38,9 +38,13 @@ If you are familiar with the scripting language used by RealmCrafter, improvemen
 
 If you are familiar with the Blitz programming language you can help make improvements or changes to the RealmCrafter [engine source code](src) itself.
 
+##### Tests
+
+You could also help writing tests in blitz as well. All tests should live under the [src\Tests](src\Tests) folder and you can run all tests by running the `test.bat` script. Tests are run before every git commit locally and must pass for your commit to succeed.
+
 #### C++
 
-If you are familiar with C++ you can help by making improvements or changes to the Blitz runtime [source code](compiler\BlitzRC\src).
+If you are familiar with C++ you can help by making improvements or changes to the Blitz runtime [source code](compiler\BlitzForge\src).
 
 ### Documentation
 
@@ -61,8 +65,8 @@ Discord: A discord invite link is available from the RCCE Project Manager.
 
 ## Resources
 
-### BlitzRC
-BlitzRC is a custom version of Blitz3D specifically tailored for RealmCrafter: Community Edition. The [source](compiler\BlitzRC\src) for this is included in the compilers folder.
+### BlitzForge (previously BlitzRC)
+BlitzForge is a custom version of Blitz3D specifically tailored for RealmCrafter: Community Edition. The [source](compiler\BlitzForge\src) for this is included in the compilers folder.
 
 ### BlitzRCPlus
 BlitzRCPlus is a custom version of BlitzPlus specifically tailored for RealmCrafter: Community Edition. The [source](compiler\BlitzPlus\src) for this is included in the compilers folder.
@@ -73,7 +77,7 @@ Blitz Syntax Plugin Link: https://marketplace.visualstudio.com/items?itemName=do
 You can compile, debug, test, run and publish via the VSCode launch configurations.
 
 ### IDEs
-BlitzRC and BlitzRCPlus has native IDEs available in the compiler folders.
+BlitzForge and BlitzRCPlus have native IDEs available in the compiler folders.
 
 There are other Blitz specific IDE installers included in the repository.
 

compile.bat

@@ -1,24 +1,117 @@
 @echo off
+setlocal EnableDelayedExpansion
+
+set TOOLCHAIN=0
+set RCCETOOLS=1
+set RCCE=1
+set PLUS=0
+
 set ROOTDIR=%CD%
 
-cd %ROOTDIR%\src
+:parse_args
+if "%1"=="" goto end_args
+if "%1"=="-b" (
+    set TOOLCHAIN=1
+) else if "%1"=="--blitz" (
+    set TOOLCHAIN=1
+) else if "%1"=="-p" (
+    set PLUS=1
+) else if "%1"=="--plus" (
+    set PLUS=1
+) else if "%1"=="-t" (
+    set RCCETOOLS=0
+) else if "%1"=="--skip-tools" (
+    set RCCETOOLS=0
+) else if "%1"=="-h" (
+    goto help_text
+) else if "%1"=="--help" (
+    goto help_text
+) else if "%1"=="-e" (
+    set RCCE=0
+) else if "%1"=="--skip-engine" (
+    set RCCE=0
+) else (
+    echo Unknown flag: %1
+    endlocal
+    exit /b 1
+)
+shift
+goto parse_args
+
+:help_text
+echo RCCE2 Compiler Script
+echo.
+echo -t ^| --skip-tools     Skip compilation of the RCCE2 tool applications in \src\tools
+echo -b ^| --blitz          Compile the BlitzForge toolchain
+echo -p ^| --plus           Compile the BlitzRCPlus toolchain
+echo -e ^| --skip-engine    Skip compilation of the RCCE2 engine itself in \src
+endlocal
+exit /b
+
+:end_args
+
+if %TOOLCHAIN%==1 (
+    echo Compiling BlitzForge Toolchain...
+    call %ROOTDIR%\scripts\submodules_init.bat
+    call %ROOTDIR%\compiler\BlitzForge\scripts\msbuild_init.bat
+
+    cd %ROOTDIR%
+
+    call %ROOTDIR%\compiler\BlitzForge\scripts\msbuild_blitzforge.bat
+)
+
+if %PLUS%==1 (
+    echo Compiling BlitzRCPlus Toolchain...
+    call %ROOTDIR%\scripts\msbuild_init.bat
 
-set BLITZPATH=%ROOTDIR%\compiler\BlitzPlus
+    cd %ROOTDIR%
 
-"%BLITZPATH%\bin\blitzcc.exe" -o "%ROOTDIR%\bin\Server.exe" "%ROOTDIR%\src\Server.bb"
+    call %ROOTDIR%\scripts\msbuild_blitzrcplus.bat
+)
+
+if %RCCE%==1 (
+    IF NOT EXIST "%ROOTDIR%\compiler\BlitzForge\bin\blitzcc.exe" (
+        echo "%ROOTDIR%\compiler\BlitzForge\bin\blitzcc.exe not found!"
+        echo "Compile source or download binaries from https://github.com/RydeTec/blitz-forge/releases"
+        exit 1;
+    )
+
+    echo Compiling RealmCrafter CE Engine...
+
+    cd %ROOTDIR%\src
+
+    set BLITZPATH=%ROOTDIR%\compiler\BlitzPlus
+
+    "!BLITZPATH!\bin\blitzcc.exe" -o "%ROOTDIR%\bin\Server.exe" "%ROOTDIR%\src\Server.bb"
+
+    set BLITZPATH=%ROOTDIR%\compiler\BlitzForge
+
+    "!BLITZPATH!\bin\blitzcc.exe" -o "%ROOTDIR%\Project Manager.exe" -n "%ROOTDIR%\res\Icon.ico" "%ROOTDIR%\src\Project Manager.bb"
+    "!BLITZPATH!\bin\blitzcc.exe" -o "%ROOTDIR%\bin\GUE.exe" -n "%ROOTDIR%\res\Icon.ico" "%ROOTDIR%\src\GUE.bb"
+    "!BLITZPATH!\bin\blitzcc.exe" -o "%ROOTDIR%\bin\Client.exe" -n "%ROOTDIR%\res\Icon.ico" "%ROOTDIR%\src\Client.bb"
+)
 
-set BLITZPATH=%ROOTDIR%\compiler\BlitzRC
+if %RCCETOOLS%==1 (
+    IF NOT EXIST "%ROOTDIR%\compiler\BlitzForge\bin\blitzcc.exe" (
+        echo "%ROOTDIR%\compiler\BlitzForge\bin\blitzcc.exe not found!"
+        echo "Compile source or download binaries from https://github.com/RydeTec/blitz-forge/releases"
+        exit 1;
+    )
+
+    echo Compiling RealmCrafter CE Tools...
 
-"%BLITZPATH%\bin\blitzcc.exe" -o "%ROOTDIR%\Project Manager.exe" "%ROOTDIR%\src\Project Manager.bb"
-"%BLITZPATH%\bin\blitzcc.exe" -o "%ROOTDIR%\bin\GUE.exe" "%ROOTDIR%\src\GUE.bb"
-"%BLITZPATH%\bin\blitzcc.exe" -o "%ROOTDIR%\bin\Client.exe" "%ROOTDIR%\src\Client.bb"
+    if not exist "%ROOTDIR%\bin\tools" (
+        mkdir "%ROOTDIR%\bin\tools"
+    )
 
-if not exist "%ROOTDIR%\bin\tools" mkdir "%ROOTDIR%\bin\tools"
+    cd %ROOTDIR%\src\tools
 
-cd %ROOTDIR%\src\tools
+    set "BLITZPATH=%ROOTDIR%\compiler\BlitzForge"
 
-for %%f in (*.bb) do (
-    "%BLITZPATH%\bin\blitzcc.exe" -o "%ROOTDIR%\bin\tools\%%~nf.exe" "%ROOTDIR%\src\tools\%%~nf.bb"
+    for %%f in (*.bb) do (
+        "!BLITZPATH!\bin\blitzcc.exe" -o "%ROOTDIR%\bin\tools\%%~nf.exe" -n "%ROOTDIR%\res\Icon.ico" -w "%ROOTDIR%\src" "%ROOTDIR%\src\tools\%%~nf.bb"
+    )
 )
 
 cd %ROOTDIR%
+endlocal