Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove pips #122

Closed
wants to merge 32 commits into from
Closed

Remove pips #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3c4ae07
Remove disabled palette for powerdown
evgeniysergeev May 18, 2019
55f8b9b
Remove pips for Refinery, Silo and Harvester
evgeniysergeev May 18, 2019
b170a51
Remove pips for Frigate, Infantry and Vechicle. Remove unused pips se…
evgeniysergeev May 18, 2019
c122ca2
Merge pull request #121 from evgeniysergeev/t1
evgeniysergeev May 19, 2019
f21b316
add wall_explosion: section in sequences/explosion.yaml
evgeniysergeev May 14, 2019
8932073
Add AUTHORS
evgeniysergeev May 19, 2019
3600a2c
Restore 'disabled' palete
evgeniysergeev May 19, 2019
43e0659
Merge pull request #127 from evgeniysergeev/t126
evgeniysergeev May 19, 2019
68b08f2
Automatically download d2k content on first run
evgeniysergeev Jun 4, 2019
92614a2
Import Original maps from SCENARIO.PAK
evgeniysergeev May 27, 2019
e76dd2d
Move smooth tile edges on map function to reusable class
evgeniysergeev May 30, 2019
e463715
Smooth imported maps
evgeniysergeev May 30, 2019
90dabfe
Add resources to imported map
evgeniysergeev May 30, 2019
37cf96c
Add Additional Spice Fields to imported map
evgeniysergeev Jun 3, 2019
21a0475
Add Spice Blooms to imported map
evgeniysergeev Jun 3, 2019
9068aff
Add Spawn Points to imported maps
evgeniysergeev Jun 3, 2019
c54f3ef
Update csproject, rules and ModSDK to use bleed and new engine toolchain
evgeniysergeev Jun 6, 2019
c465265
Fix typo in D2Concrete
evgeniysergeev Jun 29, 2019
391e905
Merge pull request #137 from evgeniysergeev/fix-d2concrete
abcdefg30 Jun 29, 2019
f077555
Remove D2VocLoader and use VocLoader from OpenRA engine
evgeniysergeev Jun 29, 2019
f104eed
Add D2BuildingPlacementRenerable and D2PlaceBuildingPreview
evgeniysergeev Jun 12, 2019
2b37e35
Merge pull request #136 from evgeniysergeev/buildings-placement-3
abcdefg30 Jul 2, 2019
04a1630
add D2Selection
evgeniysergeev Jul 3, 2019
d51d587
Add sidebar panel with Actor info #124
evgeniysergeev May 19, 2019
0a74333
Merge pull request #143 from evgeniysergeev/t124
abcdefg30 Jul 17, 2019
f213467
Update to playtest-20190825 OpenRA engine (#146)
evgeniysergeev Sep 26, 2019
1ebd800
Remove pips for Refinery, Silo and Harvester
evgeniysergeev May 18, 2019
3a2338b
Remove pips for Frigate, Infantry and Vechicle. Remove unused pips se…
evgeniysergeev May 18, 2019
c4e294d
Merge branch 't2' of https://github.com/evgeniysergeev/d2 into t2
evgeniysergeev Sep 26, 2019
372149e
Remove pips for Refinery, Silo and Harvester
evgeniysergeev May 18, 2019
46da357
Remove pips for Frigate, Infantry and Vechicle. Remove unused pips se…
evgeniysergeev May 18, 2019
1c91a1c
Merge branch 't2' of https://github.com/evgeniysergeev/d2 into t2
evgeniysergeev Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../d2/mods/d2/AUTHORS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This path is funky.
I suspect you want ./mods/d2/AUTHORS if you're going to put a path in this file.

57 changes: 39 additions & 18 deletions D2Mod.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,57 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.D2", "OpenRA.Mods.D2\OpenRA.Mods.D2.csproj", "{3B845E07-4689-47BC-90F4-27217B0A2DF6}"
# Visual Studio 15
VisualStudioVersion = 15.0.28307.539
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.D2", "OpenRA.Mods.D2\OpenRA.Mods.D2.csproj", "{3B845E07-4689-47BC-90F4-27217B0A2DF6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Game", "engine\OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Game", "engine\OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Common", "engine\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.Common", "engine\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dune 2 Lua scripts", "Dune 2 Lua scripts", "{B35D533F-BEB6-4674-A466-324EEFD97259}"
ProjectSection(SolutionItems) = preProject
mods\d2\maps\scena001\scena001.lua = mods\d2\maps\scena001\scena001.lua
mods\d2\maps\scena002\scena002.lua = mods\d2\maps\scena002\scena002.lua
mods\d2\maps\scena002\scena002-AI.lua = mods\d2\maps\scena002\scena002-AI.lua
mods\d2\maps\scena002\scena002.lua = mods\d2\maps\scena002\scena002.lua
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Debug|x86.ActiveCfg = Debug|x86
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Debug|x86.Build.0 = Debug|x86
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Release|x86.ActiveCfg = Release|x86
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Release|x86.Build.0 = Release|x86
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.ActiveCfg = Debug|x86
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.Build.0 = Debug|x86
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.ActiveCfg = Release|x86
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.Build.0 = Release|x86
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.ActiveCfg = Debug|x86
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.Build.0 = Debug|x86
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.ActiveCfg = Release|x86
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.Build.0 = Release|x86
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Debug|x64.ActiveCfg = Debug|x64
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Debug|x64.Build.0 = Debug|x64
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Debug|x86.ActiveCfg = Debug|Any CPU
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Debug|x86.Build.0 = Debug|Any CPU
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Release|x64.ActiveCfg = Release|x64
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Release|x64.Build.0 = Release|x64
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Release|x86.ActiveCfg = Release|Any CPU
{3B845E07-4689-47BC-90F4-27217B0A2DF6}.Release|x86.Build.0 = Release|Any CPU
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x64.ActiveCfg = Release-x86|x64
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x64.Build.0 = Release-x86|x64
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.ActiveCfg = Debug|Any CPU
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.Build.0 = Debug|Any CPU
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x64.ActiveCfg = Release|x64
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x64.Build.0 = Release|x64
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.ActiveCfg = Release|Any CPU
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.Build.0 = Release|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x64.ActiveCfg = Debug|x64
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x64.Build.0 = Debug|x64
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.ActiveCfg = Debug|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.Build.0 = Debug|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x64.ActiveCfg = Release|x64
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x64.Build.0 = Release|x64
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.ActiveCfg = Release|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6AE199B6-DCE0-42CF-B020-A9C3A861AFB5}
EndGlobalSection
EndGlobal
60 changes: 36 additions & 24 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,26 @@
# make check-packaging-scripts

.PHONY: utility stylecheck build clean engine version check check-scripts check-sdk-scripts check-packaging-scripts check-variables
.DEFAULT_GOAL := build
.DEFAULT_GOAL := all

VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
MOD_ID = $(shell cat user.config mod.config 2> /dev/null | awk -F= '/MOD_ID/ { print $$2; exit }')
ENGINE_DIRECTORY = $(shell cat user.config mod.config 2> /dev/null | awk -F= '/ENGINE_DIRECTORY/ { print $$2; exit }')
MOD_SEARCH_PATHS = "$(shell python -c "import os; print(os.path.realpath('.'))")/mods,./mods"

MANIFEST_PATH = "mods/$(MOD_ID)/mod.yaml"
WHITELISTED_OPENRA_ASSEMBLIES = "$(shell cat user.config mod.config 2> /dev/null | awk -F= '/WHITELISTED_OPENRA_ASSEMBLIES/ { print $$2; exit }')"
WHITELISTED_THIRDPARTY_ASSEMBLIES = "$(shell cat user.config mod.config 2> /dev/null | awk -F= '/WHITELISTED_THIRDPARTY_ASSEMBLIES/ { print $$2; exit }')"
WHITELISTED_CORE_ASSEMBLIES = "$(shell cat user.config mod.config 2> /dev/null | awk -F= '/WHITELISTED_CORE_ASSEMBLIES/ { print $$2; exit }')"
WHITELISTED_MOD_ASSEMBLIES = "$(shell cat user.config mod.config 2> /dev/null | awk -F= '/WHITELISTED_MOD_ASSEMBLIES/ { print $$2; exit }')"

HAS_MSBUILD = $(shell command -v msbuild 2> /dev/null)
MANIFEST_PATH = "mods/$(MOD_ID)/mod.yaml"
HAS_LUAC = $(shell command -v luac 2> /dev/null)
LUA_FILES = $(shell find mods/*/maps/* -iname '*.lua')
PROJECT_DIRS = $(shell dirname $$(find . -iname "*.csproj" -not -path "$(ENGINE_DIRECTORY)/*"))
LUA_FILES = $(shell find mods/*/maps/* -iname '*.lua' 2> /dev/null)

MSBUILD = msbuild -verbosity:m -nologo

# Enable 32 bit builds while generating the windows installer
WIN32 = false

check-sdk-scripts:
@awk '/\r$$/ { exit(1); }' mod.config || (printf "Invalid mod.config format: file must be saved using unix-style (CR, not CRLF) line endings.\n"; exit 1)
Expand Down Expand Up @@ -94,29 +101,32 @@ check-variables:
exit 1; \
fi

engine-dependencies: check-variables check-sdk-scripts
@./fetch-engine.sh || (printf "Unable to continue without engine files\n"; exit 1)
@cd $(ENGINE_DIRECTORY) && make dependencies WIN32=$(WIN32)

engine: check-variables check-sdk-scripts
@./fetch-engine.sh || (printf "Unable to continue without engine files\n"; exit 1)
@cd $(ENGINE_DIRECTORY) && make core
@cd $(ENGINE_DIRECTORY) && make core WIN32=$(WIN32)

utility: engine
utility: engine-dependencies engine
@test -f "$(ENGINE_DIRECTORY)/OpenRA.Utility.exe" || (printf "OpenRA.Utility.exe not found!\n"; exit 1)

stylecheck: engine
@test -f "$(ENGINE_DIRECTORY)/OpenRA.StyleCheck.exe" || (cd $(ENGINE_DIRECTORY) && make stylecheck)

build: engine
ifeq ("$(HAS_MSBUILD)","")
@find . -maxdepth 1 -name '*.sln' -exec xbuild /nologo /verbosity:quiet /p:TreatWarningsAsErrors=true \;
core:
@command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1)
@find . -maxdepth 1 -name '*.sln' -exec $(MSBUILD) -t:restore \;
ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
@find . -maxdepth 1 -name '*.sln' -exec $(MSBUILD) -t:build -p:Configuration="Release-x86" \;
else
@find . -maxdepth 1 -name '*.sln' -exec msbuild /t:Rebuild /nr:false \;
@$(MSBUILD) -t:build -p:Configuration=Release
@find . -maxdepth 1 -name '*.sln' -exec $(MSBUILD) -t:build -p:Configuration=Release \;
endif

all: engine-dependencies engine core

clean: engine
ifeq ("$(HAS_MSBUILD)","")
@find . -maxdepth 1 -name '*.sln' -exec xbuild /nologo /verbosity:quiet /p:TreatWarningsAsErrors=true /t:Clean \;
else
@find . -maxdepth 1 -name '*.sln' -exec msbuild /t:Clean /nr:false \;
endif
@command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1)
@find . -maxdepth 1 -name '*.sln' -exec $(MSBUILD) -t:clean \;
@cd $(ENGINE_DIRECTORY) && make clean
@printf "The engine has been cleaned.\n"

Expand All @@ -136,13 +146,15 @@ ifneq ("$(LUA_FILES)","")
@luac -p $(LUA_FILES)
endif

check: utility stylecheck
check: utility
@echo "Compiling in debug mode..."
@$(MSBUILD) -t:build -p:Configuration=Debug
@echo "Checking runtime assemblies..."
@MOD_SEARCH_PATHS="$(MOD_SEARCH_PATHS)" mono --debug "$(ENGINE_DIRECTORY)/OpenRA.Utility.exe" $(MOD_ID) --check-runtime-assemblies $(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES) $(WHITELISTED_CORE_ASSEMBLIES) $(WHITELISTED_MOD_ASSEMBLIES)
@echo "Checking for explicit interface violations..."
@MOD_SEARCH_PATHS="$(MOD_SEARCH_PATHS)" mono --debug "$(ENGINE_DIRECTORY)/OpenRA.Utility.exe" $(MOD_ID) --check-explicit-interfaces
@for i in $(PROJECT_DIRS) ; do \
echo "Checking for code style violations in $${i}...";\
mono --debug "$(ENGINE_DIRECTORY)/OpenRA.StyleCheck.exe" $${i};\
done
@echo "Checking for incorrect conditional trait interface overrides..."
@MOD_SEARCH_PATHS="$(MOD_SEARCH_PATHS)" mono --debug "$(ENGINE_DIRECTORY)/OpenRA.Utility.exe" $(MOD_ID) --check-conditional-trait-interface-overrides

test: utility
@echo "Testing $(MOD_ID) mod MiniYAML..."
Expand Down
Loading