RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-16 11:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
665 Commits 36 Branches 9 Tags 258 MiB
22579d1d9f
Commit Graph

332 Commits

Author SHA1 Message Date
Rudolf Polzer
22579d1d9f Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-10-13 21:40:52 +02:00
Rudolf Polzer
b7d048cfcd 32bit builds: optimize for i686 instruction set (why not...) 2010-10-13 21:40:13 +02:00
Rudolf Polzer
6b0de8c456 don't need the rev-parse output either 2010-10-13 11:47:59 +02:00
Rudolf Polzer
93444cba48 don't show a stupid error message 2010-10-13 11:46:58 +02:00
Rudolf Polzer
03fda54bbc clean --reclone: never delete master or the repo-branch 2010-10-13 11:44:10 +02:00
Rudolf Polzer
54d203c9b1 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-10-08 21:45:54 +02:00
Rudolf Polzer
868efd45a1 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-10-07 14:17:54 +02:00
Rudolf Polzer
82bf17bb85 ./all compile: flag -r to make a release (not debug) build 2010-10-07 14:16:55 +02:00
Rudolf Polzer
93a1909151 make sure fix_config always works 2010-10-06 12:10:42 +02:00
Rudolf Polzer
aace29890d improve cleaning 2010-10-04 15:30:03 +02:00
Rudolf Polzer
8259e681c1 fix pushurl handling 2010-10-04 15:05:47 +02:00
rpolzer
928c8a26c2 support pushurl 2010-10-04 12:14:12 +02:00
rpolzer
a68da1f03c support a separate push URL 2010-10-04 12:13:01 +02:00
Rudolf Polzer
49b3b2f91c really enable v6 2010-10-03 15:00:38 +02:00
Rudolf Polzer
2e181ded77 Merge branch 'master' into divVerent/crypto2 2010-10-03 14:57:04 +02:00
Rudolf Polzer
153389c6d4 enable v6 in all compile 2010-10-03 14:56:22 +02:00
Rudolf Polzer
87a39db1a5 Merge branch 'master' into divVerent/crypto2 
Conflicts:
	all
 2010-10-02 21:25:02 +02:00
Rudolf Polzer
1a5f864472 experimentally enable compilation with v6 support 2010-10-02 21:24:02 +02:00
Rudolf Polzer
83086c512e use -xonotic now 2010-10-02 20:00:23 +02:00
Rudolf Polzer
47a07537c4 don't return "bad" exit code 2010-10-01 23:36:03 +02:00
Rudolf Polzer
7886382bfb be more user friendly on crash 2010-10-01 07:23:11 +02:00
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