147 Commits

Author	SHA1	Message	Date
Rudolf Polzer	14253bf229	Merge remote branch 'origin/master' into divVerent/crypto2 ... Conflicts: all	2010-07-17 17:05:09 +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