131 Commits

Author	SHA1	Message	Date
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