RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-19 12:06:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,236 Commits 41 Branches 9 Tags 324 MiB
865c5dfcfc
Commit Graph

511 Commits

Author SHA1 Message Date
Rudolf Polzer
1e68844d51 ./all: drop into gdb if a crash happened and gdb is available (otherwise keep using catchsegv) 2010-10-01 07:16:04 +02:00
Rudolf Polzer
da6463044d use http for accessing github, not git:// 2010-09-28 17:33:59 +02:00
Rudolf Polzer
56a7f50cbe fix another syntax error 2010-09-26 13:52:57 +02:00
merlijn
a7242c720e change a comma to a semicolon to make all work again, thanks MrBougo 2010-09-26 10:11:23 +02:00
Rudolf Polzer
edfab30a9f ./all run: use catchsegv if available 2010-09-26 08:51:27 +02:00
Rudolf Polzer
b020f3b152 also remote prune origin when using --reclone 2010-09-25 11:06:44 +02:00
Rudolf Polzer
13b1970d48 fix admin-merge test compile 2010-09-25 10:23:10 +02:00
Rudolf Polzer
f29b3346e0 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-25 10:16:25 +02:00
Rudolf Polzer
0e67555016 reordered the repos in ./all in a better order (more in order of priority) 2010-09-25 10:15:37 +02:00
Rudolf Polzer
e98e758c0c turn D3D off again in release builds (and build without C++) 2010-09-24 22:12:08 +02:00
Rudolf Polzer
3b4e66d1b5 compile SDL with the C compiler again 2010-09-24 13:05:56 +02:00
Rudolf Polzer
6826e88c31 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	misc/builddeps/dp.win64/include/d3dtypes.h
	misc/builddeps/dp.win64/include/dsound.h
 2010-09-24 12:50:35 +02:00
Rudolf Polzer
11c90ccf2d properly build as C++ 2010-09-24 12:41:18 +02:00
Rudolf Polzer
2359da7f5c win32: enable D3D9 (win64 not yet, have no working win64 C++ compiler here) 2010-09-24 12:05:38 +02:00
Rudolf Polzer
b656acffe4 better distribute source code 2010-09-24 06:50:10 +02:00
Rudolf Polzer
849728118c fix a stupid find command :) 2010-09-19 21:35:03 +02:00
Rudolf Polzer
24275ffedd Merge remote branch 'origin/master' into divVerent/crypto2 2010-09-19 21:03:03 +02:00
Rudolf Polzer
f3b98d2546 fix ./all clean -f -m 2010-09-18 16:58:48 +02:00
Rudolf Polzer
bd9d5d9962 fix -fU parsing 2010-09-18 13:25:55 +02:00
Rudolf Polzer
2a67f42c77 update help in ./all 2010-09-18 13:24:27 +02:00
Rudolf Polzer
45604a50d9 by default, rm untracked files 2010-09-18 13:17:46 +02:00
Rudolf Polzer
ff0fe7591e reclone: also fetch upstream, this then even can recover from upstream changes 2010-09-18 13:13:43 +02:00
Rudolf Polzer
20c8db330f ./all clean --reclone 2010-09-18 13:09:46 +02:00
Rudolf Polzer
da36e2366a be more verbose 2010-09-18 13:07:46 +02:00
Rudolf Polzer
8fa18b2570 ./all branches: more concise display; ./all clean: allow resetting the repo into pristine state (-m -fu -r -D, meaning "master, force upstream, remove untracked, delete other branches") 2010-09-18 13:03:28 +02:00
Rudolf Polzer
5cc9692968 rename win64 binaries for consistency 2010-09-18 00:08:35 +02:00
Rudolf Polzer
c24f0eb359 Merge branch 'master' into divVerent/crypto2 2010-09-18 00:08:06 +02:00
Rudolf Polzer
0f40d475de we CAN continue to keep these libs in git, we just need to disable them in releases 2010-09-18 00:01:51 +02:00
Rudolf Polzer
25713752e3 Revert "separate out the rijndael libraries", instead doing this PROPERLY in a next commit 
This reverts commit 75241b8410.
 2010-09-18 00:01:03 +02:00
Rudolf Polzer
bcfe4e93fb enable win64 SDL build 2010-09-17 21:20:05 +02:00
Rudolf Polzer
75241b8410 separate out the rijndael libraries 2010-09-17 11:55:38 +02:00
Rudolf Polzer
0241e4415b Merge remote branch 'origin/master' into divVerent/crypto2 2010-09-17 07:37:59 +02:00
Rudolf Polzer
c445176a36 fix another typo 2010-09-17 06:54:31 +02:00
Rudolf Polzer
a1904f5972 work around another problem in 7z's exclude logic 2010-09-16 12:42:38 +02:00
Rudolf Polzer
03cd1c78db do not set +x on exe files 2010-09-16 11:42:48 +02:00
Rudolf Polzer
cda347b55a fix a path error when release building 2010-09-16 10:48:26 +02:00
Rudolf Polzer
ad9d4b2c72 fix 7z/zip decision again :( 2010-09-16 09:04:52 +02:00
Rudolf Polzer
39b629c021 properly distinguish between 7za and zip 2010-09-16 08:41:57 +02:00
Rudolf Polzer
30c8b094e7 use 7zip instead of infozip where possible 2010-09-16 08:30:29 +02:00
Rudolf Polzer
38d6d573ab release build script: run sub-compiles with niceness of calling process 2010-09-15 21:27:23 +02:00
Rudolf Polzer
027aa5398b enable debugging during builds 2010-09-15 13:21:13 +02:00
Rudolf Polzer
08712962ad fix typo 2010-09-15 13:19:50 +02:00
Rudolf Polzer
28a97ea2af new var HOSTS_THAT_ARE_DISABLED 2010-09-15 13:14:23 +02:00
Rudolf Polzer
0a49b6cf7f Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-09-14 06:00:59 +02:00
Rudolf Polzer
ce362bfaad embed versionbuilder into the release build procedure 2010-09-14 05:59:21 +02:00
Rudolf Polzer
5766d4c05a Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-13 10:34:50 +02:00
Rudolf Polzer
4399289d77 -Wl,--hash-style=sysv not needed or supported on debian etch 
Conflicts:

	all
 2010-09-13 10:28:36 +02:00
Rudolf Polzer
51bbe2c026 release build script: put the dependencies in a better place on the build hosts 
Conflicts:

	all
 2010-09-13 10:27:21 +02:00
Rudolf Polzer
e18fe2ec47 release build script: put the dependencies in a better place on the build hosts 2010-09-13 09:59:12 +02:00
Rudolf Polzer
6e84b60868 make div0-stable compile again 2010-09-11 02:23:41 +02:00
Rudolf Polzer
45bc3de646 Merge branch 'master' into divVerent/crypto2 2010-09-11 02:04:45 +02:00
Rudolf Polzer
7af6dea8b5 enable D3D compilation when running with master 2010-09-11 01:53:37 +02:00
Rudolf Polzer
13a74ed2c1 Merge remote branch 'origin/master' into divVerent/crypto2 2010-09-07 09:34:00 +02:00
Rudolf Polzer
713fc53d88 release compile: fix hash-object logic; do all compiles in background processes and wait for them 2010-09-06 11:45:39 +02:00
Rudolf Polzer
fc00291a3c skip expensive hash-object calls where not needed 2010-09-06 09:11:34 +02:00
Rudolf Polzer
2003f97c2a Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-04 18:02:00 +02:00
Rudolf Polzer
4baa56d315 also make an engine-only zip 2010-09-04 18:01:13 +02:00
Rudolf Polzer
fe3f4d5aea no longer use a rebranded DP engine 2010-09-04 16:56:33 +02:00
Rudolf Polzer
7063351ef7 Revert "use a different name for mingw64 binaries", as the new compiler does not run 
This reverts commit 54fd63ab64.
 2010-09-03 12:42:52 +02:00
Rudolf Polzer
54fd63ab64 use a different name for mingw64 binaries 2010-09-03 12:39:46 +02:00
Rudolf Polzer
cb2a4b93c1 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-03 09:08:18 +02:00
Rudolf Polzer
6a6224ed32 honor RELEASEDATE env var 2010-09-03 09:07:26 +02:00
Rudolf Polzer
0ddd32bcd7 add key_0.d0pk to releases 2010-09-03 09:06:50 +02:00
Rudolf Polzer
53277300e7 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-09-02 12:30:19 +02:00
Rudolf Polzer
0c1da75a8e ./all compile: don't clean QC by default 2010-09-01 21:19:03 +02:00
Rudolf Polzer
82f7254763 fix a minor typo 2010-08-27 17:04:02 +02:00
Rudolf Polzer
0183f87e4e fix paths 2010-08-27 11:43:14 +02:00
Rudolf Polzer
12fe42d7f5 Merge branch 'master' into divVerent/crypto2 2010-08-27 10:35:06 +02:00
Rudolf Polzer
8fa0fcb4cb ./all clean: also back out of merge conflicts 2010-08-27 09:44:58 +02:00
Rudolf Polzer
23e1d5f0c0 add the crypto lib to linux release builds 2010-08-26 05:43:30 +02:00
Rudolf Polzer
2d39fadc6c Merge branch 'master' into divVerent/crypto2 2010-08-26 05:41:36 +02:00
Rudolf Polzer
1ae12fed4b add a missing default case 2010-08-25 07:56:00 +02:00
Rudolf Polzer
c4af07662d set push.default to current in these repos, to prevent accidental pushes 2010-08-25 07:02:39 +02:00
Rudolf Polzer
3a59f6382c 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.
 2010-08-25 06:59:52 +02:00
Rudolf Polzer
cf445ff6ef put osx dedicated binary into the right folder 2010-08-21 16:38:36 +02:00
Rudolf Polzer
6cac5de987 allow the path to xonotic.brand to come from XONOTIC_BRANDFILE 2010-08-21 15:20:07 +02:00
Rudolf Polzer
35a0d303e7 split up OS X engine release target to also support agl without 64bit 2010-08-21 13:57:53 +02:00
Rudolf Polzer
85a76f687b no longer need to disable JPEG linking on osx 2010-08-21 13:47:55 +02:00
Rudolf Polzer
5050382ea2 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-08-20 14:23:54 +02:00
Rudolf Polzer
c3b65641f6 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-20 14:23:07 +02:00
Rudolf Polzer
a675524294 ./all: support DP's new jpeg lib handling 2010-08-20 14:22:56 +02:00
Rudolf Polzer
1432395f15 admin-merge: fix merge conflict detection 2010-08-19 06:17:10 +02:00
Rudolf Polzer
bac383da44 remove win64 DLLs from PATH, as this does not work 2010-08-17 11:48:36 +02:00
Rudolf Polzer
3376e87101 win64: no WSPIAPI 2010-08-15 22:32:09 +02:00
Rudolf Polzer
a16e49898f try enabling win64 again 2010-08-15 21:08:35 +02:00
Rudolf Polzer
344cbae797 remove -nexcompat pk3 from Xonotic-low.zip and Xonotic-lowdds.zip (useless baggage in these) 2010-08-14 21:54:59 +02:00
Rudolf Polzer
6832c25d27 checkout -f 2010-08-14 02:46:07 +02:00
Rudolf Polzer
2d7a35e2b2 wtf, but I had fixed this bug before 2010-08-13 14:55:00 +02:00
Rudolf Polzer
27274683e3 we don't need misc/pki in releases 2010-08-12 16:22:53 +02:00
Rudolf Polzer
02d4ca6d4b also add the public key to releases 2010-08-12 16:22:33 +02:00
Rudolf Polzer
7a8e91cdc3 Merge branch 'master' into divVerent/crypto2 2010-08-12 06:33:49 +02:00
Rudolf Polzer
10899a62b9 -mmacosx-version-min=10.4 2010-08-11 09:17:59 +02:00
Rudolf Polzer
e78c56a21d this way to use the OSX frameworks does not work 2010-08-11 08:47:07 +02:00
Rudolf Polzer
730c21b90d quote error 2010-08-11 07:45:45 +02:00
Rudolf Polzer
96899d108f add -fno-reorder-blocks to OSX compile to fix gcc hang 2010-08-11 07:42:23 +02:00
Rudolf Polzer
ae243f12c5 add back missing -g option 2010-08-11 06:43:02 +02:00
Rudolf Polzer
bd767b4ed0 rsync calls: remove options that OSX rsync does not support 2010-08-11 06:41:02 +02:00
Rudolf Polzer
6d3df10f5b enable osx and win64 build 2010-08-11 06:36:32 +02:00
Rudolf Polzer
f8ee1d30e3 improve naming of win64 binareis 2010-08-09 15:23:19 +02:00
Rudolf Polzer
50397e1d8f be more verbose 2010-08-09 14:01:51 +02:00
Rudolf Polzer
816c025b12 ./all clean -f 2010-08-09 14:01:18 +02:00
Rudolf Polzer
29bfed504a ./all clean 2010-08-09 13:59:42 +02:00
Rudolf Polzer
65d4aac3df name xonotic download zip files properly too 2010-08-09 10:10:25 +02:00
Rudolf Polzer
324e8f3f9b we no longer need this dds_load workaround, as menuqc will fix it 2010-08-06 16:48:09 +02:00
Rudolf Polzer
9d67fdb532 get progs.dat from the right place 2010-08-06 12:19:30 +02:00
Rudolf Polzer
bf6b1f4370 set XON_BUILDSYSTEM 2010-08-06 12:00:40 +02:00
Rudolf Polzer
ffe894651b check RELEASETYPE var 2010-08-06 11:49:18 +02:00
Rudolf Polzer
575a420d4f be more verbose 2010-08-06 11:48:00 +02:00
Rudolf Polzer
f0f3950fd3 unparallelize and simplify build for now 2010-08-06 09:31:38 +02:00
Rudolf Polzer
68d15718f4 put qcsrc in the right place 2010-08-06 09:27:05 +02:00
Rudolf Polzer
57b4f2c2a7 store symlinks properly 2010-08-06 09:19:39 +02:00
Rudolf Polzer
3d2fe34d87 oh, I forgot xonotic.exe 2010-08-06 08:45:34 +02:00
Rudolf Polzer
e17b0dab5c properly rebrand the DP binaries 2010-08-06 08:36:25 +02:00
Rudolf Polzer
01e631a5e9 more bugfixes... 2010-08-06 06:30:26 +02:00
Rudolf Polzer
32a3364b39 fix a syntax FAIL 2010-08-05 20:54:32 +02:00
Rudolf Polzer
cef3ad9b2e simplify build 2010-08-05 20:19:44 +02:00
Rudolf Polzer
0f35bb74b6 release build: also delete stale zip files 2010-08-05 20:15:24 +02:00
Rudolf Polzer
dec726774f edit the config to adjust the version number 2010-08-05 20:12:49 +02:00
Rudolf Polzer
40ce12279a more release build stuff 2010-08-05 20:01:27 +02:00
Rudolf Polzer
6579006248 also compress lightmaps 2010-08-05 17:24:24 +02:00
Rudolf Polzer
51b3492646 make +x again 2010-08-05 17:11:07 +02:00
Rudolf Polzer
bf768a38b2 fix loading of the compiled maps 2010-08-05 17:10:00 +02:00
Rudolf Polzer
95b7af2aca music only uses 2 variants 2010-08-05 15:39:01 +02:00
Rudolf Polzer
7d367871cf allow ALL sounds to be oggenc'd down 2010-08-05 15:37:28 +02:00
Rudolf Polzer
f51b93c9f4 a "lowdds" transform: keep ONLY dds textures 2010-08-05 15:16:29 +02:00
Rudolf Polzer
836750e433 "low" transform: 85% jpeg, 95% for alpha channels 2010-08-05 15:05:49 +02:00
Rudolf Polzer
f06f3fcd11 also compress textures in models/ 2010-08-05 14:59:05 +02:00
Rudolf Polzer
0981696b60 fix compressonator usage 2010-08-05 13:48:24 +02:00
Rudolf Polzer
9ce5096de4 oops, forgot to use Xvfb here 2010-08-05 11:01:18 +02:00
Rudolf Polzer
3501f1c4f3 start X11 as compressonator needs it 2010-08-05 10:59:22 +02:00
Rudolf Polzer
d8d1cd7183 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-05 10:41:38 +02:00
Rudolf Polzer
8d86e11354 make build dirs "clean" of DP and FTEQCC 2010-08-05 10:41:10 +02:00
Rudolf Polzer
11f523efd2 Merge branch 'master' into divVerent/crypto2 2010-08-05 06:57:01 +02:00
Rudolf Polzer
cdadd017b3 fix paths 2010-08-05 06:16:14 +02:00
Rudolf Polzer
6df5df1c44 be more verbose 2010-08-05 06:14:48 +02:00
Rudolf Polzer
c7e738c547 add and update SDL for Win32; make Win32 build work 2010-08-05 06:11:40 +02:00
Rudolf Polzer
c21069392b Merge branch 'master' into divVerent/crypto2 2010-08-05 05:47:06 +02:00
Rudolf Polzer
a5ed01ace9 fix name typo 2010-08-04 21:33:55 +02:00
Rudolf Polzer
47c4128537 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-04 21:32:21 +02:00
Rudolf Polzer
1c83a8a756 use div0-gittools from xonotic git server 2010-08-04 21:32:11 +02:00
Rudolf Polzer
b1b1178130 parallelize something 2010-08-04 16:20:09 +02:00
Rudolf Polzer
3300a7a4e6 release building: new toys 2010-08-04 16:19:08 +02:00
Rudolf Polzer
64e26c2fba properly ignore merges in upstream rebase detection 2010-08-04 12:40:57 +02:00
Rudolf Polzer
bc28716f92 more typo fixing :) 2010-08-04 12:39:44 +02:00
Rudolf Polzer
1b5a7dcd16 fix a typo ;) 2010-08-04 12:34:36 +02:00
Rudolf Polzer
f7f0db1033 try to autodetect and fix upstream rebase 2010-08-04 12:31:23 +02:00
Rudolf Polzer
3dc917baad new var in release building: $HOSTS_THAT_ARE_MYSELF - hosts on which no SSH is to be used 2010-08-02 16:46:16 +02:00
Rudolf Polzer
17ee74dbb9 more typo fix 2010-08-02 16:05:32 +02:00
Rudolf Polzer
47d563ed1d avoid more rsync 2010-08-02 16:04:48 +02:00
Rudolf Polzer
4387290823 Merge branch 'master' into divVerent/crypto2 2010-08-02 16:02:19 +02:00
Rudolf Polzer
e66dbf5971 mingw64 build fix 2010-08-02 16:02:04 +02:00
Rudolf Polzer
19088887af ./all release: more fixes 2010-08-02 16:01:58 +02:00
Rudolf Polzer
59fb45116f mingw64 build fix 2010-08-02 15:46:06 +02:00
Rudolf Polzer
8640529781 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-07-26 14:34:39 +02:00
Rudolf Polzer
cfb1bdfa33 buildfiles: rename dir from w32 to win32 2010-07-26 13:35:34 +02:00
Rudolf Polzer
97cb7ae4fd fix some typos in ./all 2010-07-26 13:22:52 +02:00
Rudolf Polzer
39e60744ad Merge remote branch 'origin/master' into divVerent/crypto2 2010-07-23 08:44:40 +02:00
Rudolf Polzer
5df4279b76 fix admin-merge :P 2010-07-21 20:13:54 +02:00
Rudolf Polzer
f665e3c467 small syntax fix 2010-07-21 20:01:32 +02:00
Rudolf Polzer
c6ea9d406d Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes' 2010-07-21 20:01:03 +02:00
Rudolf Polzer
7a079c940d add back the autocrlf config option in ./all - yes, had to 
At least .gitattributes turns it off again on non-text files.
 2010-07-21 11:04:49 +02:00
Rudolf Polzer
b730d3b2c8 hard exit 1 if a "cd" failed :( 2010-07-18 17:18:15 +02:00
terencehill
91bab28ba3 Show "(no_branch)" instead of "(no" in the output of the command branches (for example when you are in a remote branch) 2010-07-17 17:26:28 +02:00
Rudolf Polzer
14253bf229 Merge remote branch 'origin/master' into divVerent/crypto2 
Conflicts:
	all
 2010-07-17 17:05:09 +02:00
terencehill
305f923b43 Fix compile command to handle correctly the optional argument <client> 
In case the first arg (eventually after -c|-n):
- it's an empty string "" just skip it (default clients will be used).
- doesn't contain any valid client, then assume it's not a client option but a generic option.
- contains at least one valid client, then compile valid ones and warn about invalid ones.

Now finally
./all compile -n FTEQCCFLAGS_WATERMARK=
works :)
 2010-07-17 17:02:06 +02:00
Rudolf Polzer
94ce252c0a autobuild: improve messages, detect exit status 2010-07-17 15:18:14 +02:00
Rudolf Polzer
6cc00fffaf admin-merge: use --no-ff 2010-07-16 23:44:35 +02:00
Rudolf Polzer
3e7a4ac5cd include d0_blind_id in ./all compile and run 2010-07-14 09:08:52 +02:00
Rudolf Polzer
f217d0db49 Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx' 2010-07-09 23:08:38 +02:00
Rudolf Polzer
6bd227f5ac properly identify upstream 2010-07-09 22:54:58 +02:00
merlijn
bfe3e801b0 add cleaner OSX version filter 2010-07-09 22:48:47 +02:00
Merlijn Hofstra
347996194d compile against shipped SDL 2010-07-08 22:12:54 +02:00
MrBougo
f3e2327008 Remove weird 'tname=' line in the windows script duplication 2010-07-07 13:32:29 +02:00
MrBougo
bcb9893f31 Use the -mygames switch for DP 
This only affects the game in windows, it makes the user data
directory my documents\my games\xonotic\data instead of storing
everything in the git working copy. Consistent with unix .xonotic.
 2010-07-06 22:49:11 +02:00
Rudolf Polzer
709364e1f3 add d0_blind_ip repo 2010-07-05 10:52:14 +02:00
Rudolf Polzer
58cc901f81 fix temp name overwrite in "all" 2010-07-04 21:37:09 +02:00
Rudolf Polzer
1214a3a778 fix the shifting 2010-07-04 21:28:51 +02:00
Rudolf Polzer
2856d02081 fix syntax of $HOME var use 2010-07-04 18:36:06 +02:00
Rudolf Polzer
c68423b1ef ./all compile "wgl sdl dedicated" (allow multiple targets to be given) 2010-07-04 18:28:02 +02:00
Rudolf Polzer
42e363f887 cleanup of release build compile lines 2010-07-02 14:51:03 +02:00
Rudolf Polzer
c1b23d70ee add DEP and ASLR flags 2010-07-02 14:47:06 +02:00
Rudolf Polzer
9d2449295f add a win64 target (untested) 2010-07-02 14:44:22 +02:00
Rudolf Polzer
165b5c3178 rev-list, not rev-parse 2010-07-02 14:04:00 +02:00
Rudolf Polzer
6b8ec4f290 use compile -n to speed up admin-merge 2010-07-02 14:01:59 +02:00
Rudolf Polzer
6c11bb6513 autodetect whether a branch is based on master or on div0-stable; flag ./all compile -n which doesn't make clean 2010-07-02 14:01:07 +02:00
Rudolf Polzer
0c0cb62b5c Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-06-28 14:27:41 +02:00
Rudolf Polzer
0c1347d0ec more release build script stuff 2010-06-28 14:27:27 +02:00
Rudolf Polzer
a8107a6553 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-06-25 20:52:31 +02:00
Rudolf Polzer
9fa81db686 Lots of improvements for admin-merge-2 2010-06-24 15:08:39 +02:00
Rudolf Polzer
df6c8dfa67 rename admin-merge-2 to admin-merge, give it a branch name argument 2010-06-23 21:27:43 +02:00
Rudolf Polzer
ae1d24262d and now without debug code 2010-06-22 17:35:05 +02:00
Rudolf Polzer
0e4764e9b2 now it even works 2010-06-22 17:34:51 +02:00
Rudolf Polzer
f49f350f05 even prettier 2010-06-22 17:33:56 +02:00
Rudolf Polzer
3024963186 nicer colors in ./all commit 2010-06-22 17:32:43 +02:00
Rudolf Polzer
dadfae2317 fix yet another ./all typo 2010-06-22 17:28:25 +02:00
Rudolf Polzer
edb422c26e remove another md5sum dep 2010-06-22 17:05:06 +02:00
Rudolf Polzer
b1235e18e3 new, better, greater data converter script 2010-06-21 16:08:19 +02:00
Rudolf Polzer
ae36557cf4 new OSX compile params 2010-06-18 21:30:06 +02:00
Rudolf Polzer
a9da16b191 if a file foo.pk3dir.no exists, do not download foo.pk3dir repo 2010-06-17 17:35:26 +02:00
Rudolf Polzer
cced3a9841 ./all release: try to build (no hosts set up for this yet) 2010-06-17 16:19:01 +02:00
Rudolf Polzer
0697dbc8ea more release build stuff 2010-06-17 15:23:22 +02:00
Rudolf Polzer
2516d0359c more release building stuff 2010-06-17 15:20:57 +02:00
Rudolf Polzer
06a486bda5 start of a release build system (doesn't do much yet) 2010-06-17 14:54:45 +02:00
Rudolf Polzer
61260f1659 ./all each: new option -k "keep going" 2010-06-17 14:28:54 +02:00
Rudolf Polzer
c09ceab676 ./all: better "branches" display 2010-06-17 14:26:24 +02:00
Rudolf Polzer
a543153ec5 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-06-17 14:08:52 +02:00
Rudolf Polzer
f1c468e0b2 autodownload compiled maps on "compile" 2010-06-17 14:08:38 +02:00
Rudolf Polzer
7e147c7e32 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-06-17 09:20:48 +02:00
Rudolf Polzer
18313a24ad fix the ./all script again ;) this time: missing div0-stable 2010-06-17 09:20:26 +02:00
Rudolf Polzer
05f449b907 admin-merge-2: do not ask if changes are trivial 2010-06-15 09:16:27 +02:00
Rudolf Polzer
175a62ed4a forgot one command 2010-06-15 09:05:21 +02:00
Rudolf Polzer
8f7e6f1f69 for some reason "git notes" syntax changed. Support new syntax. 2010-06-15 09:04:29 +02:00
Merlijn Hofstra
472fe105a6 use correct DYLD_LIBRARY_PATH 2010-06-07 21:41:11 +02:00
Merlijn Hofstra
af1227666f default to SDL if it is available 2010-06-06 16:33:31 +02:00
Merlijn Hofstra
ec1cee87d1 OSX does not use pulseaudio 2010-06-06 16:07:50 +02:00
Rudolf Polzer
3963936a96 as SDL is default on OSX, also use SDL's buildfiles for finding the DLLs 2010-06-05 15:31:48 +02:00
Rudolf Polzer
beeb2a3c59 fix a bug in the ./all script when checking out the DP repo 2010-06-05 15:08:10 +02:00
Rudolf Polzer
8dcc13e685 CC=gcc fix for mingw32 2010-06-04 20:40:49 +02:00
Jānis Rūcis
06b6f98b2f ./all: do not touch autocrlf/safecrlf 2010-05-29 16:37:00 +03:00
Rudolf Polzer
8a38d76f69 use the correct branch source in admin-merge-2 and branch ops 2010-05-25 16:28:12 +02:00
Rudolf Polzer
99b2d0ac99 fix another bug in ./all branch 2010-05-25 13:01:32 +02:00
Rudolf Polzer
5ca7282426 ./all admin-merge-2: show proper merge preview in the DP repo 2010-05-23 17:05:21 +02:00
Rudolf Polzer
ba9bdae30b try fixing ./all branch 2010-05-23 14:51:44 +02:00
Rudolf Polzer
68454eab14 ./all branch: fetch origin before creating a branch, to make sure new branches start at the CURRENT master 2010-05-23 14:12:54 +02:00
Rudolf Polzer
0c42904f58 fix useless warning on pulseaudio check on Windows :P 2010-05-20 09:30:32 +02:00
Rudolf Polzer
fdc1b70ed7 color-words was bad 2010-05-18 21:23:13 +02:00
Rudolf Polzer
1b78e522ee admin-merge-2: more colors 2010-05-18 21:20:42 +02:00
Rudolf Polzer
b01ac246fe admin-merge-2: color words in the diff 2010-05-18 21:18:35 +02:00
Rudolf Polzer
94fd858c89 ./all: checkout with no arg checks out the default branch 2010-05-15 22:59:07 +02:00
Rudolf Polzer
faea52905a admin-merge-2: upload report to http://rm.endoftheinternet.org/~nexuiz/xonotic-merge-notes.txt 2010-05-15 22:53:45 +02:00
Rudolf Polzer
d96a84b1b3 more admin-merge-2 stuff ;) 2010-05-15 22:24:38 +02:00
Rudolf Polzer
0df1d199c8 some fixes for ./all admin-merge-2 2010-05-15 20:11:23 +02:00
Rudolf Polzer
8469bee7c0 build watermark too 2010-05-14 20:29:58 +02:00
Rudolf Polzer
01ac8add25 ./all run: use pulseaudio if present 2010-05-10 21:16:23 +02:00
Rudolf Polzer
84d30a1eb1 work around the bug Chryyz got 2010-05-10 08:39:45 +02:00
Rudolf Polzer
c45ae11217 admin-merge-2 attempt 2010-05-09 19:53:34 +02:00
Rudolf Polzer
55bbcbfc9e "all": new command ./all update -N (only gets NEW repos), and let ./all each continue on "cd" error 2010-05-09 15:46:17 +02:00
Rudolf Polzer
a43bab8422 try forcing the mingw target on win32 2010-05-08 20:54:22 +02:00
Rudolf Polzer
f6a5811614 move mediasource out to an extra repo 2010-05-08 18:45:50 +02:00
Rudolf Polzer
21a4047395 adminmerge real fix ;) 2010-05-08 14:50:05 +02:00
Rudolf Polzer
ff786842ab make adminmerge more covnenient 2010-05-08 14:49:01 +02:00
Rudolf Polzer
7ef2094c74 try setting DYLD_LIBRARY_PATH for OSX 2010-05-07 09:40:03 +02:00
Rudolf Polzer
7bb1263341 new all function: ./all -c compile, does "make clean" too 2010-05-06 20:16:46 +02:00
Rudolf Polzer
ed7a928da7 small change to ./all, not done yet (command branches_short) 2010-05-04 07:31:37 +02:00
Rudolf Polzer
2493ceb76c all script: use div0-stable branch for DP 2010-05-02 13:06:36 +02:00
Rudolf Polzer
a0e309ae13 try to handle the case if the branch has been remotely deleted in "push" 2010-04-28 16:30:51 +02:00
Rudolf Polzer
8f10e29d65 Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic 2010-04-26 22:48:32 +02:00
Rudolf Polzer
c53177ca96 targets targets targets targets ;) ./all compile wgl 2010-04-26 22:48:14 +02:00
Rudolf Polzer
2498e2b602 try helping windoze in finding the DLLs 2010-04-26 15:34:12 +02:00
Rudolf Polzer
169208535f Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic 2010-04-26 14:11:23 +02:00