xonotic/xonotic.git
10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Fri, 27 Aug 2010 08:35:06 +0000 (10:35 +0200)]
Merge branch 'master' into divVerent/crypto2

10 years agoupdate blind_id lib
Rudolf Polzer [Fri, 27 Aug 2010 08:34:44 +0000 (10:34 +0200)]
update blind_id lib

10 years ago./all clean: also back out of merge conflicts
Rudolf Polzer [Fri, 27 Aug 2010 07:44:58 +0000 (09:44 +0200)]
./all clean: also back out of merge conflicts

10 years agorebrand: also add TGA icons (possibly converted from png)
Rudolf Polzer [Fri, 27 Aug 2010 05:41:32 +0000 (07:41 +0200)]
rebrand: also add TGA icons (possibly converted from png)

10 years agoalso an OSX icon (untested, created by png2icns)
Rudolf Polzer [Fri, 27 Aug 2010 04:35:58 +0000 (06:35 +0200)]
also an OSX icon (untested, created by png2icns)

10 years agoNew icon version by sev, should work better at low res
Rudolf Polzer [Fri, 27 Aug 2010 04:31:59 +0000 (06:31 +0200)]
New icon version by sev, should work better at low res

10 years agoexplain more
Rudolf Polzer [Thu, 26 Aug 2010 04:09:40 +0000 (06:09 +0200)]
explain more

10 years agomake the algorithm a bit more customizable
Rudolf Polzer [Thu, 26 Aug 2010 04:05:04 +0000 (06:05 +0200)]
make the algorithm a bit more customizable

10 years agofix issues with non-square images
Rudolf Polzer [Thu, 26 Aug 2010 04:00:49 +0000 (06:00 +0200)]
fix issues with non-square images

10 years agoalso exclude models/sprites from DDS
Rudolf Polzer [Thu, 26 Aug 2010 03:53:12 +0000 (05:53 +0200)]
also exclude models/sprites from DDS

10 years agoadd the crypto lib to linux release builds
Rudolf Polzer [Thu, 26 Aug 2010 03:43:30 +0000 (05:43 +0200)]
add the crypto lib to linux release builds

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Thu, 26 Aug 2010 03:41:36 +0000 (05:41 +0200)]
Merge branch 'master' into divVerent/crypto2

10 years agoadd a missing default case
Rudolf Polzer [Wed, 25 Aug 2010 05:56:00 +0000 (07:56 +0200)]
add a missing default case

10 years agoset push.default to current in these repos, to prevent accidental pushes
Rudolf Polzer [Wed, 25 Aug 2010 05:02:39 +0000 (07:02 +0200)]
set push.default to current in these repos, to prevent accidental pushes

10 years agodisable div0-gittools, mediasource, data/xonotic-nexcompat.pk3 repository download...
Rudolf Polzer [Wed, 25 Aug 2010 04:59:52 +0000 (06:59 +0200)]
disable div0-gittools, mediasource, data/xonotic-nexcompat.pk3 repository download by default.
To disable them, just delete your checkout of them.
New users who want to enable them, create a .yes file of that name.

10 years agoMerge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix'
Rudolf Polzer [Tue, 24 Aug 2010 03:30:51 +0000 (05:30 +0200)]
Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix'

10 years agomore verbose output please
Rudolf Polzer [Mon, 23 Aug 2010 10:54:48 +0000 (12:54 +0200)]
more verbose output please

10 years agonormal2heightmap: more fixes
Rudolf Polzer [Mon, 23 Aug 2010 09:26:24 +0000 (11:26 +0200)]
normal2heightmap: more fixes

10 years agosupport a "reference" image that predefines height for the input textures at given...
Rudolf Polzer [Mon, 23 Aug 2010 08:46:29 +0000 (10:46 +0200)]
support a "reference" image that predefines height for the input textures at given locations

10 years agoB, G, R, A
Rudolf Polzer [Sun, 22 Aug 2010 17:47:25 +0000 (19:47 +0200)]
B, G, R, A

10 years agofix a few minor bugs
merlijn [Sun, 22 Aug 2010 17:45:10 +0000 (19:45 +0200)]
fix a few minor bugs

10 years agofix scale factors; allow nice parameters for two different normal algorithms
Rudolf Polzer [Sun, 22 Aug 2010 17:43:18 +0000 (19:43 +0200)]
fix scale factors; allow nice parameters for two different normal algorithms

10 years agoalso add normalmap to heightmap, but this way is bad :P better use gimp-normalmap...
Rudolf Polzer [Sun, 22 Aug 2010 16:54:24 +0000 (18:54 +0200)]
also add normalmap to heightmap, but this way is bad :P better use gimp-normalmap plugin

10 years agoadd a normalmap to heightmap tool by me
Rudolf Polzer [Sun, 22 Aug 2010 15:59:41 +0000 (17:59 +0200)]
add a normalmap to heightmap tool by me

10 years ago-bouncegrid is nice
Rudolf Polzer [Sun, 22 Aug 2010 12:18:48 +0000 (14:18 +0200)]
-bouncegrid is nice

10 years agoput osx dedicated binary into the right folder
Rudolf Polzer [Sat, 21 Aug 2010 14:38:36 +0000 (16:38 +0200)]
put osx dedicated binary into the right folder

10 years agoalso support --help
Rudolf Polzer [Sat, 21 Aug 2010 13:44:52 +0000 (15:44 +0200)]
also support --help

10 years agoallow the path to xonotic.brand to come from XONOTIC_BRANDFILE
Rudolf Polzer [Sat, 21 Aug 2010 13:20:07 +0000 (15:20 +0200)]
allow the path to xonotic.brand to come from XONOTIC_BRANDFILE

10 years agosplit up OS X engine release target to also support agl without 64bit
Rudolf Polzer [Sat, 21 Aug 2010 11:57:53 +0000 (13:57 +0200)]
split up OS X engine release target to also support agl without 64bit

10 years agono longer need to disable JPEG linking on osx
Rudolf Polzer [Sat, 21 Aug 2010 11:47:55 +0000 (13:47 +0200)]
no longer need to disable JPEG linking on osx

10 years agohopefully the last fix to that alpha channel stupidity...
Rudolf Polzer [Fri, 20 Aug 2010 16:01:58 +0000 (18:01 +0200)]
hopefully the last fix to that alpha channel stupidity...

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Fri, 20 Aug 2010 15:54:39 +0000 (17:54 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agofix generated alpha channel
Rudolf Polzer [Fri, 20 Aug 2010 15:52:39 +0000 (17:52 +0200)]
fix generated alpha channel

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Fri, 20 Aug 2010 12:23:54 +0000 (14:23 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
all

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Fri, 20 Aug 2010 12:23:07 +0000 (14:23 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years ago./all: support DP's new jpeg lib handling
Rudolf Polzer [Fri, 20 Aug 2010 12:22:56 +0000 (14:22 +0200)]
./all: support DP's new jpeg lib handling

10 years agoadd a heightsource option so one can "regenerate" normalmaps
Rudolf Polzer [Fri, 20 Aug 2010 05:11:32 +0000 (07:11 +0200)]
add a heightsource option so one can "regenerate" normalmaps

10 years agodisable DDS for foo_bump.tga as it won't work anyway
Rudolf Polzer [Fri, 20 Aug 2010 04:59:27 +0000 (06:59 +0200)]
disable DDS for foo_bump.tga as it won't work anyway

10 years agoadd a shell script to run the gimp-normalmap filter
Rudolf Polzer [Fri, 20 Aug 2010 04:57:53 +0000 (06:57 +0200)]
add a shell script to run the gimp-normalmap filter

10 years agoadmin-merge: fix merge conflict detection
Rudolf Polzer [Thu, 19 Aug 2010 04:17:10 +0000 (06:17 +0200)]
admin-merge: fix merge conflict detection

10 years agoMerge remote branch 'refs/remotes/origin/parasti/import-pk3'
Rudolf Polzer [Thu, 19 Aug 2010 03:57:06 +0000 (05:57 +0200)]
Merge remote branch 'refs/remotes/origin/parasti/import-pk3'

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Tue, 17 Aug 2010 20:04:31 +0000 (22:04 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agonexcompat update script
Rudolf Polzer [Tue, 17 Aug 2010 20:04:03 +0000 (22:04 +0200)]
nexcompat update script

10 years agoremove win64 DLLs from PATH, as this does not work
Rudolf Polzer [Tue, 17 Aug 2010 09:48:36 +0000 (11:48 +0200)]
remove win64 DLLs from PATH, as this does not work

10 years agoAdd a script for merging master to a map branch in a bare repo
Jānis Rūcis [Mon, 16 Aug 2010 16:55:23 +0000 (19:55 +0300)]
Add a script for merging master to a map branch in a bare repo

10 years agos/import-pk3/pk3-import/
Jānis Rūcis [Mon, 16 Aug 2010 17:01:50 +0000 (20:01 +0300)]
s/import-pk3/pk3-import/

10 years agoimport-pk3: force reading of .gitignore from index
Jānis Rūcis [Mon, 16 Aug 2010 14:33:53 +0000 (17:33 +0300)]
import-pk3: force reading of .gitignore from index

10 years agoimport-pk3: use a separate index file
Jānis Rūcis [Mon, 16 Aug 2010 12:36:19 +0000 (15:36 +0300)]
import-pk3: use a separate index file

10 years agoimport-pk3: init index with merge base, not always master
Jānis Rūcis [Mon, 16 Aug 2010 12:32:45 +0000 (15:32 +0300)]
import-pk3: init index with merge base, not always master

Otherwise the commit history gets lost.

10 years agoAdd a script for importing a PK3 into a bare repo
Jānis Rūcis [Mon, 16 Aug 2010 10:02:02 +0000 (13:02 +0300)]
Add a script for importing a PK3 into a bare repo

10 years agonew FT
Rudolf Polzer [Sun, 15 Aug 2010 20:32:27 +0000 (22:32 +0200)]
new FT

10 years agowin64: no WSPIAPI
Rudolf Polzer [Sun, 15 Aug 2010 20:32:09 +0000 (22:32 +0200)]
win64: no WSPIAPI

10 years agotry enabling win64 again
Rudolf Polzer [Sun, 15 Aug 2010 19:08:35 +0000 (21:08 +0200)]
try enabling win64 again

10 years agoadd win64 builds of libraries made by Willis
Rudolf Polzer [Sun, 15 Aug 2010 19:04:24 +0000 (21:04 +0200)]
add win64 builds of libraries made by Willis

10 years agopreserve vorbis comments when downsampling
Rudolf Polzer [Sat, 14 Aug 2010 20:00:27 +0000 (22:00 +0200)]
preserve vorbis comments when downsampling

10 years agoremove -nexcompat pk3 from Xonotic-low.zip and Xonotic-lowdds.zip (useless baggage...
Rudolf Polzer [Sat, 14 Aug 2010 19:54:59 +0000 (21:54 +0200)]
remove -nexcompat pk3 from Xonotic-low.zip and Xonotic-lowdds.zip (useless baggage in these)

10 years agoalso checkout -f here
Rudolf Polzer [Sat, 14 Aug 2010 00:47:43 +0000 (02:47 +0200)]
also checkout -f here

10 years agocheckout -f
Rudolf Polzer [Sat, 14 Aug 2010 00:46:07 +0000 (02:46 +0200)]
checkout -f

10 years agowtf, but I had fixed this bug before
Rudolf Polzer [Fri, 13 Aug 2010 12:55:00 +0000 (14:55 +0200)]
wtf, but I had fixed this bug before

10 years agonew Win32 DLLs
Rudolf Polzer [Thu, 12 Aug 2010 17:41:12 +0000 (19:41 +0200)]
new Win32 DLLs

10 years agorecompiled linux64 libs
Rudolf Polzer [Thu, 12 Aug 2010 17:36:47 +0000 (19:36 +0200)]
recompiled linux64 libs

10 years agowe don't need misc/pki in releases
Rudolf Polzer [Thu, 12 Aug 2010 14:22:53 +0000 (16:22 +0200)]
we don't need misc/pki in releases

10 years agoalso add the public key to releases
Rudolf Polzer [Thu, 12 Aug 2010 14:22:33 +0000 (16:22 +0200)]
also add the public key to releases

10 years agoreplace d0_blind_id lib by current one (linux32)
Rudolf Polzer [Thu, 12 Aug 2010 14:20:33 +0000 (16:20 +0200)]
replace d0_blind_id lib by current one (linux32)

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Thu, 12 Aug 2010 04:33:49 +0000 (06:33 +0200)]
Merge branch 'master' into divVerent/crypto2

10 years ago-mmacosx-version-min=10.4
Rudolf Polzer [Wed, 11 Aug 2010 07:17:59 +0000 (09:17 +0200)]
-mmacosx-version-min=10.4

10 years agothis way to use the OSX frameworks does not work
Rudolf Polzer [Wed, 11 Aug 2010 06:47:07 +0000 (08:47 +0200)]
this way to use the OSX frameworks does not work

10 years agoquote error
Rudolf Polzer [Wed, 11 Aug 2010 05:45:45 +0000 (07:45 +0200)]
quote error

10 years agoadd -fno-reorder-blocks to OSX compile to fix gcc hang
Rudolf Polzer [Wed, 11 Aug 2010 05:42:23 +0000 (07:42 +0200)]
add -fno-reorder-blocks to OSX compile to fix gcc hang

10 years agoadd back missing -g option
Rudolf Polzer [Wed, 11 Aug 2010 04:43:02 +0000 (06:43 +0200)]
add back missing -g option

10 years agorebranding: skip OSX icon if there is no Resources dir
Rudolf Polzer [Wed, 11 Aug 2010 04:41:59 +0000 (06:41 +0200)]
rebranding: skip OSX icon if there is no Resources dir

10 years agorsync calls: remove options that OSX rsync does not support
Rudolf Polzer [Wed, 11 Aug 2010 04:41:02 +0000 (06:41 +0200)]
rsync calls: remove options that OSX rsync does not support

10 years agoenable osx and win64 build
Rudolf Polzer [Wed, 11 Aug 2010 04:36:32 +0000 (06:36 +0200)]
enable osx and win64 build

10 years agoimprove naming of win64 binareis
Rudolf Polzer [Mon, 9 Aug 2010 13:23:19 +0000 (15:23 +0200)]
improve naming of win64 binareis

10 years agoproperly remove the tempdir at the end
Rudolf Polzer [Mon, 9 Aug 2010 12:09:15 +0000 (14:09 +0200)]
properly remove the tempdir at the end

10 years agouse wine paths relative to c:
Rudolf Polzer [Mon, 9 Aug 2010 12:03:34 +0000 (14:03 +0200)]
use wine paths relative to c:

10 years agobe more verbose
Rudolf Polzer [Mon, 9 Aug 2010 12:01:51 +0000 (14:01 +0200)]
be more verbose

10 years ago./all clean -f
Rudolf Polzer [Mon, 9 Aug 2010 12:01:18 +0000 (14:01 +0200)]
./all clean -f

10 years ago./all clean
Rudolf Polzer [Mon, 9 Aug 2010 11:59:42 +0000 (13:59 +0200)]
./all clean

10 years agorebranding: use no tempfiles other than in a special temp dir
Rudolf Polzer [Mon, 9 Aug 2010 11:55:28 +0000 (13:55 +0200)]
rebranding: use no tempfiles other than in a special temp dir

10 years agorebranding: enable icon changing again, using ResEdit.exe
Rudolf Polzer [Mon, 9 Aug 2010 11:46:23 +0000 (13:46 +0200)]
rebranding: enable icon changing again, using ResEdit.exe

10 years agoname xonotic download zip files properly too
Rudolf Polzer [Mon, 9 Aug 2010 08:10:25 +0000 (10:10 +0200)]
name xonotic download zip files properly too

10 years agoMerge remote branch 'refs/remotes/origin/merlijn/osx-logo'
Rudolf Polzer [Sun, 8 Aug 2010 19:32:46 +0000 (21:32 +0200)]
Merge remote branch 'refs/remotes/origin/merlijn/osx-logo'

10 years agoUpdate logos for OSX with higher resolution icns and fix the buildfiles
Merlijn Hofstra [Sun, 8 Aug 2010 18:57:11 +0000 (20:57 +0200)]
Update logos for OSX with higher resolution icns and fix the buildfiles

10 years agoxonotic-map-compiler: forbid "evil" dirs too
Rudolf Polzer [Sat, 7 Aug 2010 15:40:47 +0000 (17:40 +0200)]
xonotic-map-compiler: forbid "evil" dirs too

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Fri, 6 Aug 2010 20:47:18 +0000 (22:47 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agodo NOT use Win32::Exe to exchange icon for now, the EXE it writes does not run any...
Rudolf Polzer [Fri, 6 Aug 2010 20:46:58 +0000 (22:46 +0200)]
do NOT use Win32::Exe to exchange icon for now, the EXE it writes does not run any more

10 years agofilter out lightmaps and model previews from DDS
Rudolf Polzer [Fri, 6 Aug 2010 15:31:40 +0000 (17:31 +0200)]
filter out lightmaps and model previews from DDS

10 years agowe no longer need this dds_load workaround, as menuqc will fix it
Rudolf Polzer [Fri, 6 Aug 2010 14:48:09 +0000 (16:48 +0200)]
we no longer need this dds_load workaround, as menuqc will fix it

10 years agofix launcher for now (but do we want to keep it?)
Rudolf Polzer [Fri, 6 Aug 2010 12:24:24 +0000 (14:24 +0200)]
fix launcher for now (but do we want to keep it?)

10 years agofix the rebranding script option to specify the userdir name
Rudolf Polzer [Fri, 6 Aug 2010 12:11:45 +0000 (14:11 +0200)]
fix the rebranding script option to specify the userdir name

10 years agoget progs.dat from the right place
Rudolf Polzer [Fri, 6 Aug 2010 10:19:30 +0000 (12:19 +0200)]
get progs.dat from the right place

10 years agoset XON_BUILDSYSTEM
Rudolf Polzer [Fri, 6 Aug 2010 10:00:40 +0000 (12:00 +0200)]
set XON_BUILDSYSTEM

10 years agocheck RELEASETYPE var
Rudolf Polzer [Fri, 6 Aug 2010 09:49:18 +0000 (11:49 +0200)]
check RELEASETYPE var

10 years agobe more verbose
Rudolf Polzer [Fri, 6 Aug 2010 09:48:00 +0000 (11:48 +0200)]
be more verbose

10 years agounparallelize and simplify build for now
Rudolf Polzer [Fri, 6 Aug 2010 07:31:38 +0000 (09:31 +0200)]
unparallelize and simplify build for now

10 years agoput qcsrc in the right place
Rudolf Polzer [Fri, 6 Aug 2010 07:27:05 +0000 (09:27 +0200)]
put qcsrc in the right place

10 years agostore symlinks properly
Rudolf Polzer [Fri, 6 Aug 2010 07:19:39 +0000 (09:19 +0200)]
store symlinks properly

10 years agoargh, syntax fail
Rudolf Polzer [Fri, 6 Aug 2010 06:50:00 +0000 (08:50 +0200)]
argh, syntax fail

10 years agooh, I forgot xonotic.exe
Rudolf Polzer [Fri, 6 Aug 2010 06:45:34 +0000 (08:45 +0200)]
oh, I forgot xonotic.exe