Compare commits
48 Commits
main
...
multi-inst
| Author | SHA1 | Date | |
|---|---|---|---|
| 01f35526ec | |||
| 485b18d567 | |||
| e680e9b0c4 | |||
| b1c92a9ba6 | |||
| bfdf5be5d6 | |||
| f30dc73f94 | |||
| b544a28e60 | |||
| 901dbed60d | |||
| 8dab229815 | |||
| eeaf50f4a3 | |||
| 8ec1dfc67b | |||
| a8ba344f0d | |||
| 91ec771a47 | |||
| ca0c0683ac | |||
| 15a54c6553 | |||
| 24a363cffd | |||
| b15077c827 | |||
| 5ac5f44baf | |||
| cb176cb748 | |||
| b325c16ef9 | |||
| c448f2e1c7 | |||
| c0107fcd8f | |||
| 79d5e31031 | |||
| 817114860d | |||
| 1cb1bae4e1 | |||
| 97a73132a3 | |||
| 48246fe21c | |||
| 8745bb22ed | |||
| 57be6c2ae5 | |||
| 8da4c27904 | |||
| b6ec056734 | |||
| 9bbfa88de0 | |||
| 0bdba27e1f | |||
| f68b84b007 | |||
| d754f46d58 | |||
| a3d21b4441 | |||
| e6b7d4fb24 | |||
| 9d1bc074b6 | |||
| 138b670be1 | |||
| ad4dd98f67 | |||
| 553d696233 | |||
| 18ec2efac4 | |||
| 60fdb067b9 | |||
| 82c82f5c89 | |||
| 1623007d94 | |||
| 24c18db3c9 | |||
| 60c9f5c2a4 | |||
| a88508018c |
@@ -113,3 +113,56 @@ DefaultFrameRate=(Numerator=24,Denominator=1)
|
||||
[/Script/NDIIO.NDIIOPluginSettings]
|
||||
bBeginBroadcastOnPlay=True
|
||||
|
||||
[/Script/DMXProtocol.DMXProtocolSettings]
|
||||
+OutputPortConfigs=(PortName="OutputPort1",ProtocolName="Art-Net",CommunicationType=Broadcast,bAutoCompleteDeviceAddressEnabled=False,AutoCompleteDeviceAddress="192.*",DeviceAddress="10.3.3.31",DestinationAddress="None",DestinationAddresses=((DestinationAddressString="10.3.3.255")),bLoopbackToEngine=False,LocalUniverseStart=1,NumUniverses=1,ExternUniverseStart=1,bIsExternUnivereStartEditable=False,Priority=100,Delay=0.000000,DelayFrameRate=(Numerator=25,Denominator=1),PortGuid=113BD0304F0500A965A6E5A0ECC5D52F)
|
||||
SendingRefreshRate=44
|
||||
+FixtureCategories=Other
|
||||
+FixtureCategories=Strobe
|
||||
+FixtureCategories=Moving Mirror
|
||||
+FixtureCategories=Moving Head
|
||||
+FixtureCategories=Matrix/Pixel Bar
|
||||
+FixtureCategories=Static
|
||||
+Attributes=(Name="NumBeams",Keywords="")
|
||||
+Attributes=(Name="Angle",Keywords="")
|
||||
+Attributes=(Name="Temperature",Keywords="")
|
||||
+Attributes=(Name="Launch",Keywords="")
|
||||
+Attributes=(Name="Burst",Keywords="")
|
||||
+Attributes=(Name="ModeStartStop",Keywords="")
|
||||
+Attributes=(Name="Prism",Keywords="")
|
||||
+Attributes=(Name="CIE_Y",Keywords="")
|
||||
+Attributes=(Name="CIE_X",Keywords="")
|
||||
+Attributes=(Name="FanMode",Keywords="")
|
||||
+Attributes=(Name="HSB_Brightness",Keywords="")
|
||||
+Attributes=(Name="HSB_Saturation",Keywords="")
|
||||
+Attributes=(Name="HSB_Hue",Keywords="")
|
||||
+Attributes=(Name="Color XF",Keywords="")
|
||||
+Attributes=(Name="Tint",Keywords="")
|
||||
+Attributes=(Name="CTC",Keywords="")
|
||||
+Attributes=(Name="Reset",Keywords="FixtureReset, FixtureGlobalReset, GlobalReset")
|
||||
+Attributes=(Name="Frost",Keywords="")
|
||||
+Attributes=(Name="Effects",Keywords="Effect, Macro, Effects")
|
||||
+Attributes=(Name="Shaper Rotation",Keywords="ShaperRot")
|
||||
+Attributes=(Name="Color Rotation",Keywords="ColorWheelSpin")
|
||||
+Attributes=(Name="Gobo Wheel Rotate",Keywords="GoboWheelSpin, GoboWheelRotate")
|
||||
+Attributes=(Name="Gobo Spin",Keywords="GoboSpin")
|
||||
+Attributes=(Name="Gobo",Keywords="GoboWheel, Gobo1")
|
||||
+Attributes=(Name="Iris",Keywords="")
|
||||
+Attributes=(Name="Focus",Keywords="")
|
||||
+Attributes=(Name="Zoom",Keywords="")
|
||||
+Attributes=(Name="Tilt",Keywords="")
|
||||
+Attributes=(Name="Shutter",Keywords="Strobe")
|
||||
+Attributes=(Name="Pan",Keywords="")
|
||||
+Attributes=(Name="Dimmer",Keywords="Intensity, Strength, Brightness")
|
||||
+Attributes=(Name="Amber",Keywords="ColorAdd_A")
|
||||
+Attributes=(Name="White",Keywords="ColorAdd_W")
|
||||
+Attributes=(Name="Yellow",Keywords="ColorAdd_Y, ColorSub_Y")
|
||||
+Attributes=(Name="Magenta",Keywords="ColorAdd_M, ColorSub_M")
|
||||
+Attributes=(Name="Cyan",Keywords="ColorAdd_C, ColorSub_C")
|
||||
+Attributes=(Name="Blue",Keywords="ColorAdd_B")
|
||||
+Attributes=(Name="Green",Keywords="ColorAdd_G")
|
||||
+Attributes=(Name="Red",Keywords="ColorAdd_R")
|
||||
+Attributes=(Name="Color",Keywords="ColorWheel, Color1")
|
||||
bDefaultSendDMXEnabled=True
|
||||
bDefaultReceiveDMXEnabled=False
|
||||
bAllFixturePatchesReceiveDMXInEditor=True
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Levels/Lidinis360/Lidinis360MultiInstance.umap
Normal file
BIN
Content/Levels/Lidinis360/Lidinis360MultiInstance.umap
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Levels/MetalVideoClip/MetalVideoClipSingleInstance.umap
Normal file
BIN
Content/Levels/MetalVideoClip/MetalVideoClipSingleInstance.umap
Normal file
Binary file not shown.
BIN
Content/Levels/SplatLevel/Lidinis2.uasset
Normal file
BIN
Content/Levels/SplatLevel/Lidinis2.uasset
Normal file
Binary file not shown.
BIN
Content/Levels/SplatLevel/Splat6_low1.uasset
Normal file
BIN
Content/Levels/SplatLevel/Splat6_low1.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/Levels/SplatLevel/SplatLevel2.umap
Normal file
BIN
Content/Levels/SplatLevel/SplatLevel2.umap
Normal file
Binary file not shown.
BIN
Content/NewDMXControlConsole.uasset
Normal file
BIN
Content/NewDMXControlConsole.uasset
Normal file
Binary file not shown.
BIN
Content/TheStudio/DMX/LS_DMX.uasset
Normal file
BIN
Content/TheStudio/DMX/LS_DMX.uasset
Normal file
Binary file not shown.
BIN
Content/TheStudio/DMX/NewDMXPixelMapping.uasset
Normal file
BIN
Content/TheStudio/DMX/NewDMXPixelMapping.uasset
Normal file
Binary file not shown.
BIN
Content/TheStudio/DMX/Remote_DMX.uasset
Normal file
BIN
Content/TheStudio/DMX/Remote_DMX.uasset
Normal file
Binary file not shown.
BIN
Content/TheStudio/DMX/RenderTargetForDMX.uasset
Normal file
BIN
Content/TheStudio/DMX/RenderTargetForDMX.uasset
Normal file
Binary file not shown.
BIN
Content/TheStudio/DMX/StudioDMXLibrary.uasset
Normal file
BIN
Content/TheStudio/DMX/StudioDMXLibrary.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -415,6 +415,48 @@
|
||||
{
|
||||
"Name": "ElectraPlayer",
|
||||
"Enabled": true
|
||||
},
|
||||
{
|
||||
"Name": "AvidDNxHDDecoderElectra",
|
||||
"Enabled": true,
|
||||
"SupportedTargetPlatforms": [
|
||||
"Win64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "AppleProResDecoderElectra",
|
||||
"Enabled": true,
|
||||
"SupportedTargetPlatforms": [
|
||||
"Win64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "HAPDecoderElectra",
|
||||
"Enabled": true,
|
||||
"SupportedTargetPlatforms": [
|
||||
"Win64",
|
||||
"Mac"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "VPxDecoderElectra",
|
||||
"Enabled": true
|
||||
},
|
||||
{
|
||||
"Name": "DMXFixtures",
|
||||
"Enabled": true
|
||||
},
|
||||
{
|
||||
"Name": "DMXDisplayCluster",
|
||||
"Enabled": true
|
||||
},
|
||||
{
|
||||
"Name": "DMXControlConsole",
|
||||
"Enabled": true
|
||||
},
|
||||
{
|
||||
"Name": "RemoteControlProtocolDMX",
|
||||
"Enabled": true
|
||||
}
|
||||
]
|
||||
}
|
||||
47
Source/git_management.bat
Normal file
47
Source/git_management.bat
Normal file
@@ -0,0 +1,47 @@
|
||||
@echo off
|
||||
REM ---------------------------------------------
|
||||
REM Safe Switchboard External Command: Git Pull
|
||||
REM Discards local changes, pulls latest from current branch
|
||||
REM Safe to keep inside the Git repo
|
||||
REM ---------------------------------------------
|
||||
|
||||
REM Change this to your project repo path (can be inside repo)
|
||||
set REPO_PATH=D:\Projects\DEV_TheStudio_Plugin
|
||||
|
||||
REM Name of this batch file
|
||||
set BATCH_NAME=%~nx0
|
||||
|
||||
echo ------------------------------------------------
|
||||
echo [%COMPUTERNAME%] Starting safe Git pull on %REPO_PATH%
|
||||
echo ------------------------------------------------
|
||||
|
||||
REM Navigate to the repo
|
||||
cd /d "%REPO_PATH%"
|
||||
|
||||
REM Ensure Git is installed
|
||||
where git >nul 2>&1
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
echo ERROR: Git is not installed or not in PATH
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
REM Get current branch
|
||||
for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i
|
||||
echo Current branch: %CURRENT_BRANCH%
|
||||
|
||||
REM Discard any local changes (staged and unstaged)
|
||||
git reset --hard
|
||||
|
||||
REM Clean untracked files and directories, excluding this batch file
|
||||
git clean -fdX -e "%BATCH_NAME%"
|
||||
|
||||
REM Pull latest changes from origin for current branch
|
||||
git pull origin %CURRENT_BRANCH%
|
||||
|
||||
REM Show status
|
||||
git status
|
||||
|
||||
echo ------------------------------------------------
|
||||
echo [%COMPUTERNAME%] Git pull complete
|
||||
echo ------------------------------------------------
|
||||
pause
|
||||
Reference in New Issue
Block a user