Commit 0e7ed909 authored by xonotic's avatar xonotic

initial checkin from nexuiz svn r8756

parents

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
FTEQCC ?= fteqcc
PERL ?= perl
PK3NAME ?= `date +../data%Y%m%d.pk3`
ZIP ?= 7za a -tzip -mx=9
ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
DIFF ?= diff
FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
FTEQCCFLAGS_PROGS ?=
FTEQCCFLAGS_MENU ?=
# NOTE: use -DUSE_FTE instead of -TFTE here!
# It will automagically add an engine check with -TID and then change back to -TFTE
FTEQCCFLAGS_CSPROGS ?=
# nexuiz svn build system overrides this by command line argument
NEX_BUILDSYSTEM =
all: qc
.PHONY: update-cvarcount
update-cvarcount:
[ "$(NEX_BUILDSYSTEM)" = "" ] || [ "$(NEX_BUILDSYSTEM)" = "1" ]
[ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || $(DIFF) scripts/entities.def ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; }; }
[ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
.PHONY: qc
qc: update-cvarcount
$(MAKE) qc-recursive
.PHONY: qc-recursive
qc-recursive: menu.dat progs.dat csprogs.dat
.PHONY: skin
skin: gfx/menu/default/skinvalues.txt
.PHONY: pk3
pk3: $(PK3NAME)
.PHONY: pk3here
pk3here: qc
$(RM) $(PK3NAME); \
set -ex; \
ABSPK3NAME=$(PK3NAME); \
case $$ABSPK3NAME in \
/*) \
;; \
*) \
ABSPK3NAME=$$PWD/$$ABSPK3NAME; \
;; \
esac; \
$(ZIP) $(ZIPEXCLUDE) $$ABSPK3NAME .
.PHONY: clean
clean:
rm -f progs.dat menu.dat csprogs.dat
csprogs.dat: qcsrc/client/*.* qcsrc/common/*.* qcsrc/warpzonelib/*.*
cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS)
progs.dat: qcsrc/server/*.* qcsrc/common/*.* qcsrc/server/*/*.* qcsrc/server/*/*/*.* qcsrc/warpzonelib/*.*
cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_PROGS)
menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.*
cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)
gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
$(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
$(PK3NAME): qc
$(RM) $(PK3NAME)
set -ex; \
ABSPK3NAME=$(PK3NAME); \
case $$ABSPK3NAME in \
/*) \
;; \
*) \
ABSPK3NAME=$$PWD/$$ABSPK3NAME; \
;; \
esac; \
TDIR=`mktemp -d -t nexuizpk3.XXXXXX`; \
cp -v progs.dat csprogs.dat menu.dat $$TDIR/; \
svn export --force . $$TDIR; \
cd $$TDIR; \
$(ZIP) $$ABSPK3NAME .
.PHONY: testcase
testcase:
cd qcsrc/testcase && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) -DTESTCASE="$$TESTCASE"
.PHONY: update commit diff log logv logupdate logvupdate revert
update: $(SCM)-update
commit: $(SCM)-commit
diff: $(SCM)-diff
log: $(SCM)-log
logv: $(SCM)-logv
revert: $(SCM)-revert
logupdate: log update
logvupdate: logv update
.PHONY: svn-update
svn-update:
cd .. && svn update
.PHONY: svn-commit
svn-commit:
cd .. && svn commit
.PHONY: svn-diff
svn-diff:
cd .. && svn diff
.PHONY: svn-log
svn-log:
cd .. && svn log -r HEAD:BASE
.PHONY: svn-logv
svn-logv:
cd .. && svn log -r HEAD:BASE -v
.PHONY: svn-revert
svn-revert:
svn revert -- $(FILE)
.PHONY: git-update
git-update:
git pull origin
.PHONY: git-commit
git-commit:
git commit -a || true
if echo -n 'Also send to server? Hit Enter for yes, ^C for no. '; read -r L; then \
git config svn-remote.svn.url svn://svn.icculus.org/nexuiz; \
git config svn-remote.svn.fetch trunk:refs/remotes/origin/master; \
git svn dcommit; \
fi
.PHONY: git-diff
git-diff:
git diff; git diff origin/master..HEAD; true
.PHONY: git-log
git-log:
git fetch && git log HEAD..origin/master
.PHONY: git-logv
git-logv:
git fetch && git log -v HEAD..origin/master
.PHONY: git-revert
git-revert:
git checkout -- $(FILE)
#!/bin/sh
while read -r EXT EOLSTYLE; do
echo "Fixing $EXT..."
find . -name .svn -prune -o -type f \( -name "*.$EXT" -o -name "$EXT" \) -print0 | \
case "$EOLSTYLE" in
1)
xargs -0 svn propset svn:eol-style native
;;
0)
xargs -0 svn propdel svn:eol-style
;;
esac
done <eol-style.txt
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
//bot configuration: name model skin shirt pants team keyboard use moving dodging ping weapon use aggressivity range aiming calmhand mouse fightthink aithink
//default team values (team-override): 1 = red, 2 = blue, 3 = yellow, 4 = pink
//use -1 for shirt-color or pants-color to get random colors
Hellfire carni 0 4 0 0 0 0 -0.5 -1 1 1 -0.5 -1 -1 2 0.5 -1
Toxic carni 1 14 7 0 -1 -1.5 -0.5 0 1 0 0 0 2 -0.5 -0.5 1
Discovery crash 0 2 6 0 0 -1 -0.5 -0.5 1 -0.5 0.5 1.5 -0.5 -1 1 0.5
Pegasus grunt 0 13 11 0 1 1 1 1 -1 0 0.5 0 -2 0 -1 0
Eureka headhunter 0 12 7 0 0 0 -1.5 -0.5 -0.5 0 0 0 0 -0.5 1.5 1.5
Airhead insurrectionist 0 11 1 0 -1 -1.5 -1 -0.5 1 1 -1 1 -0.5 1 0.5 0
Gator lurk 0 3 10 0 0 1 0 0.5 -0.5 0.5 -0.5 -1 0 0 -0.5 0
Delirium lurk 1 8 12 0 0 -1 -1 -1 0 2 0 1 0 2 -1 -1
Death lycanthrope 0 4 11 0 -0.5 0 0 1 -0.5 0 1 0 0 0 0 0
Scorcher marine 0 13 13 0 0 -1 0 -0.5 0.5 1 0 1 -2 1 0 0
Necrotic nexus 0 12 14 0 0 0 0 1 0 -1 -0.5 -1 1 0 0 0
Dominator nexus 1 3 9 0 0 0 0 2 -1 0 0 0 -1 0 0 0
Thunderstorm nexus 2 13 6 0 0 0 0 -0.5 -1 1 0.5 0.5 -0.5 0 0.5 0
Mystery pyria 0 9 14 0 1 1 1 1 -1 -1 0 1 1 -2 -1 -1
Lion shock 0 0 4 0 1 1.5 2 -1 -1 -1 1 0 1 -0.5 -1 -1
Sensible skadi 0 9 9 0 0 0 0.5 -1 0 -1 0 -1 2.5 -1.5 1 0.5
Shadow specop 0 4 8 0 -0.5 2 1 0 0 -1 0 -1 0 1 -1 -0.5
Resurrection visitant 0 1 1 0 0 -0.5 -0.5 0 2 -1 -1 -1 0 -1 1 1
This diff is collapsed.
#!/bin/sh
allidentifiers=`grep "^ _VOICEMSG" qcsrc/server/defs.qh | sed "s/.*(//; s/).*//;"`
allsounds=`find sound -name .svn -prune -o \( -name \*.ogg -o -name \*.wav \) -print`
for S in $allsounds; do
SND=${S#sound/}
SND=${SND%.*}
if [ -f "sound/$SND.ogg" ] && [ -f "sound/$SND.wav" ]; then
echo "$SND exists twice"
fi
case "$SND" in
player/*/*)
# verified by .sounds file check
;;
ambient/*)
# maps can use them always
;;
weather/*)
# maps can use them always
;;
cdtracks/*)
# maps can use them always
;;
misc/footstep*)
;;
misc/metalfootstep*)
;;
misc/hitground*)
;;
misc/metalhitground*)
;;
misc/talk*) # engine
;;
*)
if ! grep -Er '"'$SND'\.(ogg|wav)"' qcsrc/server >/dev/null; then
echo "$S ($SND) is unused by the code"
fi
;;
esac
done
LF="
"
allsounds="$LF`find sound/player -mindepth 2 -name .svn -prune -o \( -name \*.ogg -o -name \*.wav \) -print`$LF"
remainingsounds=$allsounds
psoundfile()
{
snd=$1
pat="$LF$snd$LF"
case "$allsounds" in
*$pat*)
case "$remainingsounds" in
*$pat*)
remainingsounds=${remainingsounds%%$pat*}$LF${remainingsounds#*$pat}
;;
esac
return 0
;;
*)