Commit Graph

142 Commits

Author SHA1 Message Date
Merlijn Hofstra
3891992d54 new libraries for OSX 2010-06-13 20:14:29 +02:00
Rudolf Polzer
49a0174894 remove two occurrences of "havoc" ;) 2010-06-12 21:52:56 +02:00
Merlijn Hofstra
472fe105a6 use correct DYLD_LIBRARY_PATH 2010-06-07 21:41:11 +02:00
Merlijn Hofstra
647c4c0e58 rebrand OSX buildfiles 2010-06-06 22:00:41 +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
1de9183d89 find the original shaderlist properly 2010-05-27 16:04:53 +02:00
Rudolf Polzer
458169edbb do not use -noshaderlist. If it fails, I'll fix it. 2010-05-27 16:01:29 +02:00
Rudolf Polzer
5aae182769 no longer need -x 2010-05-27 15:31:54 +02:00
Rudolf Polzer
b2f2de5b99 another blobhash typo 2010-05-27 15:31:36 +02:00
Rudolf Polzer
2cb95ff3d7 now the script can "download" the maps, and also "download-latest" from the "latest" subdir 2010-05-27 15:29:43 +02:00
Rudolf Polzer
da509672ee fix a typo 2010-05-27 15:17:50 +02:00
Rudolf Polzer
5d9e30e806 add my autobuild script 2010-05-27 13:17:13 +02: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
3ee270c251 shaderlist.txt must be in THIS repo for Radiant to find it 2010-05-08 19:26:21 +02:00
Rudolf Polzer
f6a5811614 move mediasource out to an extra repo 2010-05-08 18:45:50 +02:00
Rudolf Polzer
4a97ea27c1 Merge remote branch 'origin/fruitiex/sev-skin' 2010-05-08 14:51:54 +02:00
Rudolf Polzer
5349707ed0 Merge remote branch 'origin/merlijn/finished/rcon2irc-fix' 2010-05-08 14:50:38 +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
Merlijn Hofstra
5074d54a78 actually base of most recent version 2010-05-08 14:23:06 +02:00
Rudolf Polzer
7ef2094c74 try setting DYLD_LIBRARY_PATH for OSX 2010-05-07 09:40:03 +02:00
Rudolf Polzer
623a131a55 Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic 2010-05-06 20:17: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
ff5aed83eb if we got one, also pack the .lin file (leak line) with the autobuilds ;) 2010-05-06 17:01:58 +02:00
Rudolf Polzer
6087e1d7ba autobuild fixes 2010-05-06 17:00:41 +02:00
Rudolf Polzer
ce515788e5 autobuild script ;) 2010-05-06 16:58:03 +02:00
Rudolf Polzer
c035255f5a nexuiz-map-compiler -> xonotic-map-compiler 2010-05-04 21:49:58 +02:00