epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove trailing white-space from various files

Browse Source
This commit is contained in:
Ivaylo Draganov
2020-05-22 23:06:22 +03:00
committed by abcdefg30
parent 150d02ac0d
commit 3ab4a584ab
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL.md
View File

@@ -21,7 +21,7 @@ Linux
Mono, version 5.18 or later, is required to compile OpenRA. You can add the [upstream mono repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version if your system packages are not sufficient. Mono, version 5.18 or later, is required to compile OpenRA. You can add the [upstream mono repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version if your system packages are not sufficient.
To compile OpenRA, run `make` from the command line. After this one can run the game with `./launch-game.sh`. It is also possible to specify the mod you wish to run from the command line, e.g. with `./launch-game.sh Game.Mod=ts` if you wish to try the experimental Tiberian Sun mod. To compile OpenRA, run `make` from the command line. After this one can run the game with `./launch-game.sh`. It is also possible to specify the mod you wish to run from the command line, e.g. with `./launch-game.sh Game.Mod=ts` if you wish to try the experimental Tiberian Sun mod.
The default behaviour on the x86_64 architecture is to download several pre-compiled native libraries using the Nuget packaging manager. If you prefer to use system libraries, compile instead using `make TARGETPLATFORM=unix-generic`. The default behaviour on the x86_64 architecture is to download several pre-compiled native libraries using the Nuget packaging manager. If you prefer to use system libraries, compile instead using `make TARGETPLATFORM=unix-generic`.
@@ -31,7 +31,7 @@ If you choose to use system libraries, or your system is not x86_64, you will ne
* [OpenAL](http://kcat.strangesoft.net/openal.html) * [OpenAL](http://kcat.strangesoft.net/openal.html)
* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) * [liblua 5.1](http://luabinaries.sourceforge.net/download.html)
Type `sudo make install` for system-wide installation. Run `sudo make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run the Red Alert by executing the `openra-ra` command, the Dune 2000 mod by running the `openra-d2k` command and Tiberian Dawn by the `openra-cnc` command. Alternatively, you can also run these mods by clicking on their desktop shortcuts if you ran `sudo make install-linux-shortcuts`. Type `sudo make install` for system-wide installation. Run `sudo make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run the Red Alert by executing the `openra-ra` command, the Dune 2000 mod by running the `openra-d2k` command and Tiberian Dawn by the `openra-cnc` command. Alternatively, you can also run these mods by clicking on their desktop shortcuts if you ran `sudo make install-linux-shortcuts`.
Arch Linux Arch Linux
---------- ----------
@@ -89,7 +89,7 @@ sudo zypper in mono-devel openal-soft freetype2 SDL2 lua51 xdg-utils zenity
Red Hat Enterprise Linux (and rebuilds, e.g. CentOS) Red Hat Enterprise Linux (and rebuilds, e.g. CentOS)
---------------------------------------------------- ----------------------------------------------------
The EPEL repository is required in order for the following command to run properly. The EPEL repository is required in order for the following command to run properly.
``` ```
sudo yum install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity sudo yum install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity

2
Makefile
View File

@@ -39,7 +39,7 @@
WHITELISTED_OPENRA_ASSEMBLIES = OpenRA.Game.exe OpenRA.Utility.exe OpenRA.Platforms.Default.dll OpenRA.Mods.Common.dll OpenRA.Mods.Cnc.dll OpenRA.Mods.D2k.dll OpenRA.Game.dll WHITELISTED_OPENRA_ASSEMBLIES = OpenRA.Game.exe OpenRA.Utility.exe OpenRA.Platforms.Default.dll OpenRA.Mods.Common.dll OpenRA.Mods.Cnc.dll OpenRA.Mods.D2k.dll OpenRA.Game.dll
# These are explicitly shipped alongside our core files by the packaging script # These are explicitly shipped alongside our core files by the packaging script
WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll Eluant.dll BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.Core.dll WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll Eluant.dll BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.Core.dll
# These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack # These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack
# This list *must* be kept in sync with the files packaged by the AppImageSupport and OpenRALauncherOSX repositories # This list *must* be kept in sync with the files packaged by the AppImageSupport and OpenRALauncherOSX repositories

2
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -55,7 +55,7 @@
<PackageReference Include="OpenRA-Eluant" Version="1.0.17" /> <PackageReference Include="OpenRA-Eluant" Version="1.0.17" />
<PackageReference Include="OpenRA-Open.NAT" Version="1.0.0" /> <PackageReference Include="OpenRA-Open.NAT" Version="1.0.0" />
<PackageReference Include="SharpZipLib" Version="1.2.0" /> <PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<AdditionalFiles Include="../stylecop.json" /> <AdditionalFiles Include="../stylecop.json" />
<AdditionalFiles Include="Properties/launchSettings.json" /> <AdditionalFiles Include="Properties/launchSettings.json" />

2
README.md
View File

@@ -48,7 +48,7 @@ Check our [Playing the Game](https://github.com/OpenRA/OpenRA/wiki/Playing-the-g
## License ## License
Copyright 2007-2020 The OpenRA Developers (see [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS)) Copyright 2007-2020 The OpenRA Developers (see [AUTHORS](https://github.com/OpenRA/OpenRA/blob/bleed/AUTHORS))
This file is part of OpenRA, which is free software. It is made This file is part of OpenRA, which is free software. It is made
available to you under the terms of the GNU General Public License available to you under the terms of the GNU General Public License
as published by the Free Software Foundation, either version 3 of as published by the Free Software Foundation, either version 3 of
the License, or (at your option) any later version. For more the License, or (at your option) any later version. For more

2
glsl/combined.frag
View File

@@ -179,7 +179,7 @@ void main()
// Offset the sampling point to simulate bilinear intepolation in window coordinates instead of texture coordinates // Offset the sampling point to simulate bilinear intepolation in window coordinates instead of texture coordinates
// https://csantosbh.wordpress.com/2014/01/25/manual-texture-filtering-for-pixelated-games-in-webgl/ // https://csantosbh.wordpress.com/2014/01/25/manual-texture-filtering-for-pixelated-games-in-webgl/
// https://csantosbh.wordpress.com/2014/02/05/automatically-detecting-the-texture-filter-threshold-for-pixelated-magnifications/ // https://csantosbh.wordpress.com/2014/02/05/automatically-detecting-the-texture-filter-threshold-for-pixelated-magnifications/
// ik is defined as 1/k from the articles, set to 1/0.7 because it looks good // ik is defined as 1/k from the articles, set to 1/0.7 because it looks good
float ik = 1.43; float ik = 1.43;
vec2 interp = clamp(offset * ik * AntialiasPixelsPerTexel, 0.0, .5) + clamp((offset - 1.0) * ik * AntialiasPixelsPerTexel + .5, 0.0, .5); vec2 interp = clamp(offset * ik * AntialiasPixelsPerTexel, 0.0, .5) + clamp((offset - 1.0) * ik * AntialiasPixelsPerTexel + .5, 0.0, .5);
coords = (floor(coords.st * textureSize) + interp) / textureSize; coords = (floor(coords.st * textureSize) + interp) / textureSize;

6
glsl/combined.vert
View File

@@ -61,7 +61,7 @@ vec4 UnpackChannelAttributes(float x)
if (x >= 32.0) { x -= 32.0; secondaryChannel += 4.0; } if (x >= 32.0) { x -= 32.0; secondaryChannel += 4.0; }
if (x >= 16.0) { x -= 16.0; secondaryChannel += 2.0; } if (x >= 16.0) { x -= 16.0; secondaryChannel += 2.0; }
if (x >= 8.0) { x -= 8.0; secondaryChannel += 1.0; } if (x >= 8.0) { x -= 8.0; secondaryChannel += 1.0; }
float primaryChannel = 0.0; float primaryChannel = 0.0;
if (x >= 4.0) { x -= 4.0; primaryChannel += 4.0; } if (x >= 4.0) { x -= 4.0; primaryChannel += 4.0; }
if (x >= 2.0) { x -= 2.0; primaryChannel += 2.0; } if (x >= 2.0) { x -= 2.0; primaryChannel += 2.0; }
@@ -115,7 +115,7 @@ void main()
gl_Position = vec4((aVertexPosition.xyz - Scroll.xyz) * r1 + r2, 1); gl_Position = vec4((aVertexPosition.xyz - Scroll.xyz) * r1 + r2, 1);
vTexCoord = aVertexTexCoord; vTexCoord = aVertexTexCoord;
vTexMetadata = aVertexTexMetadata; vTexMetadata = aVertexTexMetadata;
vec4 attrib = UnpackChannelAttributes(aVertexTexMetadata.t); vec4 attrib = UnpackChannelAttributes(aVertexTexMetadata.t);
vChannelMask = SelectChannelMask(attrib.s); vChannelMask = SelectChannelMask(attrib.s);
vColorFraction = SelectColorFraction(attrib.s); vColorFraction = SelectColorFraction(attrib.s);
@@ -123,4 +123,4 @@ void main()
vPalettedFraction = SelectPalettedFraction(attrib.s); vPalettedFraction = SelectPalettedFraction(attrib.s);
vDepthMask = SelectChannelMask(attrib.t); vDepthMask = SelectChannelMask(attrib.t);
vTexSampler = attrib.pq; vTexSampler = attrib.pq;
} }

4
launch-game.cmd
View File

@@ -5,7 +5,7 @@ for %%x in (%*) do (
) )
:choosemod :choosemod
set /P mod=Select mod (ra, cnc, d2k, ts) or --exit: set /P mod=Select mod (ra, cnc, d2k, ts) or --exit:
if /I "%mod%" EQU "--exit" (exit /b) if /I "%mod%" EQU "--exit" (exit /b)
if "%mod%" EQU "ra" (goto launchmod) if "%mod%" EQU "ra" (goto launchmod)
if "%mod%" EQU "cnc" (goto launchmod) if "%mod%" EQU "cnc" (goto launchmod)
@@ -31,4 +31,4 @@ echo OpenRA has encountered a fatal error.
echo * Log Files are available in Documents\OpenRA\Logs echo * Log Files are available in Documents\OpenRA\Logs
echo * FAQ is available at https://github.com/OpenRA/OpenRA/wiki/FAQ echo * FAQ is available at https://github.com/OpenRA/OpenRA/wiki/FAQ
echo ---------------------------------------- echo ----------------------------------------
pause pause

14
make.ps1
View File

@@ -3,7 +3,7 @@
############################################################### ###############################################################
########################## FUNCTIONS ########################## ########################## FUNCTIONS ##########################
############################################################### ###############################################################
function All-Command function All-Command
{ {
if ((CheckForDotnet) -eq 1) if ((CheckForDotnet) -eq 1)
{ {
@@ -28,7 +28,7 @@ function All-Command
} }
} }
function Clean-Command function Clean-Command
{ {
if ((CheckForDotnet) -eq 1) if ((CheckForDotnet) -eq 1)
{ {
@@ -51,7 +51,7 @@ function Clean-Command
Write-Host "Clean complete." -ForegroundColor Green Write-Host "Clean complete." -ForegroundColor Green
} }
function Version-Command function Version-Command
{ {
if ($command.Length -gt 1) if ($command.Length -gt 1)
{ {
@@ -74,10 +74,10 @@ function Version-Command
} }
} }
else else
{ {
Write-Host "Unable to locate Git. The version will remain unchanged." -ForegroundColor Red Write-Host "Unable to locate Git. The version will remain unchanged." -ForegroundColor Red
} }
if ($version -ne $null) if ($version -ne $null)
{ {
$version | out-file ".\VERSION" $version | out-file ".\VERSION"
@@ -184,7 +184,7 @@ function CheckForUtility
function CheckForDotnet function CheckForDotnet
{ {
if ((Get-Command "dotnet" -ErrorAction SilentlyContinue) -eq $null) if ((Get-Command "dotnet" -ErrorAction SilentlyContinue) -eq $null)
{ {
Write-Host "The 'dotnet' tool is required to compile OpenRA. Please install the .NET Core SDK or Visual Studio and try again. https://dotnet.microsoft.com/download" -ForegroundColor Red Write-Host "The 'dotnet' tool is required to compile OpenRA. Please install the .NET Core SDK or Visual Studio and try again. https://dotnet.microsoft.com/download" -ForegroundColor Red
return 1 return 1
@@ -255,7 +255,7 @@ switch ($execute)
Default { Write-Host ("Invalid command '{0}'" -f $command) } Default { Write-Host ("Invalid command '{0}'" -f $command) }
} }
#In case the script was called without any parameters we keep the window open #In case the script was called without any parameters we keep the window open
if ($args.Length -eq 0) if ($args.Length -eq 0)
{ {
WaitForInput WaitForInput

2
packaging/linux/buildpackage.sh
View File

@@ -142,7 +142,7 @@ build_appimage() {
# travis-ci doesn't support mounting FUSE filesystems so extract and run the contents manually # travis-ci doesn't support mounting FUSE filesystems so extract and run the contents manually
./appimagetool-x86_64.AppImage --appimage-extract ./appimagetool-x86_64.AppImage --appimage-extract
# Embed update metadata if (and only if) compiled on travis # Embed update metadata if (and only if) compiled on travis
if [ ! -z "${TRAVIS_REPO_SLUG}" ]; then if [ ! -z "${TRAVIS_REPO_SLUG}" ]; then
ARCH=x86_64 ./squashfs-root/AppRun --no-appstream -u "zsync|https://master.openra.net/appimagecheck?mod=${MOD_ID}&channel=${UPDATE_CHANNEL}" "${APPDIR}" "${OUTPUTDIR}/${APPIMAGE}" ARCH=x86_64 ./squashfs-root/AppRun --no-appstream -u "zsync|https://master.openra.net/appimagecheck?mod=${MOD_ID}&channel=${UPDATE_CHANNEL}" "${APPDIR}" "${OUTPUTDIR}/${APPIMAGE}"

2
packaging/linux/openra.appdata.xml.in
View File

@@ -21,7 +21,7 @@
<li>Units gain experience as they fight and improve when they earn new ranks</li> <li>Units gain experience as they fight and improve when they earn new ranks</li>
</ul> </ul>
<p> <p>
OpenRA is 100% free, and comes bundled with three distinct mods. When you run a mod for the first time the game can automatically download the original game assets, or you can use the original game disks. OpenRA is 100% free, and comes bundled with three distinct mods. When you run a mod for the first time the game can automatically download the original game assets, or you can use the original game disks.
</p> </p>
</description> </description>
<screenshots> <screenshots>

2
packaging/windows/WindowsLauncher.cs.in
View File

@@ -43,7 +43,7 @@ namespace OpenRA
var launcherPath = Assembly.GetExecutingAssembly().Location; var launcherPath = Assembly.GetExecutingAssembly().Location;
var directory = Path.GetDirectoryName(launcherPath); var directory = Path.GetDirectoryName(launcherPath);
Directory.SetCurrentDirectory(directory); Directory.SetCurrentDirectory(directory);
AppDomain.CurrentDomain.UnhandledException += (_, e) => ExceptionHandler.HandleFatalError((Exception)e.ExceptionObject); AppDomain.CurrentDomain.UnhandledException += (_, e) => ExceptionHandler.HandleFatalError((Exception)e.ExceptionObject);
try try

2
packaging/windows/buildpackage.sh
View File

@@ -35,7 +35,7 @@ function makelauncher()
if [ "$5" = "x86" ]; then if [ "$5" = "x86" ]; then
# Enable the full 4GB address space for the 32 bit game executable # Enable the full 4GB address space for the 32 bit game executable
# The server and utility do not use enough memory to need this # The server and utility do not use enough memory to need this
csc MakeLAA.cs -warn:4 -warnaserror -out:"MakeLAA.exe" csc MakeLAA.cs -warn:4 -warnaserror -out:"MakeLAA.exe"
mono "MakeLAA.exe" "$1" mono "MakeLAA.exe" "$1"
rm MakeLAA.exe rm MakeLAA.exe

6
utility.cmd
View File

@@ -5,7 +5,7 @@ echo ----------------------------------------
echo. echo.
call OpenRA.Utility.exe call OpenRA.Utility.exe
echo Enter --exit to exit echo Enter --exit to exit
set /P mod=Please enter a modname: OpenRA.Utility.exe set /P mod=Please enter a modname: OpenRA.Utility.exe
if /I "%mod%" EQU "--exit" (exit /b) if /I "%mod%" EQU "--exit" (exit /b)
if /I "%mod%" EQU "ra" (goto help) if /I "%mod%" EQU "ra" (goto help)
if /I "%mod%" EQU "cnc" (goto help) if /I "%mod%" EQU "cnc" (goto help)
@@ -30,7 +30,7 @@ echo --exit to exit
echo --help to view the help echo --help to view the help
echo --mod to choose a new mod echo --mod to choose a new mod
echo. echo.
set /P command=Please enter a command: OpenRA.Utility.exe %mod% set /P command=Please enter a command: OpenRA.Utility.exe %mod%
if /I "%command%" EQU "--exit" (exit /b) if /I "%command%" EQU "--exit" (exit /b)
if /I "%command%" EQU "--help" (goto help) if /I "%command%" EQU "--help" (goto help)
if /I "%command%" EQU "--mod" (goto choosemod) if /I "%command%" EQU "--mod" (goto choosemod)
@@ -39,4 +39,4 @@ echo ----------------------------------------
echo. echo.
echo OpenRA.Utility.exe %mod% %command% echo OpenRA.Utility.exe %mod% %command%
call OpenRA.Utility.exe %mod% %command% call OpenRA.Utility.exe %mod% %command%
goto start goto start