Commit Graph

510 Commits

Author SHA1 Message Date
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
ae2d59dfe6 Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Conflicts:
	data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
2010-09-10 23:34:27 +02:00
Rudolf Polzer
898ec1745e Merge remote branch 'refs/remotes/origin/mrbougo/rcon2irc_fix' 2010-09-10 23:23:17 +02:00
Rudolf Polzer
f3922b7a08 Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent/crypto2 2010-09-07 19:50:14 +02:00
Rudolf Polzer
2038538b00 work around more OS X breakage Steve Jobs must have caused 2010-09-07 19:49:58 +02:00
Rudolf Polzer
5e879f31dd use vera-sans as fallback font again, not conchars 2010-09-07 17:43:41 +02:00
MrBougo
6e389d8b93 merge two join triggers; use nick from store instead of config
The second one had a slightly wrong regex, and didn't get a match anyway because of the previous one returning before.
2010-09-07 16:55:25 +02:00
MrBougo
ee5be7230f get a nick before pinging, servers don't seem to like it otherwise and return 451 (ERR_NOTREGISTERED) instead of a PONG 2010-09-07 16:46:44 +02:00
Rudolf Polzer
e4dbbe2f30 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-09-07 15:36:39 +02:00
Rudolf Polzer
287edd6542 crlf suckage? 2010-09-07 15:36:23 +02:00
Rudolf Polzer
fce519513c new zlib dll for win64, untested 2010-09-07 15:36:11 +02:00
Rudolf Polzer
13a74ed2c1 Merge remote branch 'origin/master' into divVerent/crypto2 2010-09-07 09:34:00 +02:00
Rudolf Polzer
3844977e05 adapt to the interface change 2010-09-06 16:06:48 +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
5fa6c64546 fix hash-object logic of cached converter 2010-09-06 10:44:27 +02:00
Rudolf Polzer
fc00291a3c skip expensive hash-object calls where not needed 2010-09-06 09:11:34 +02:00
terencehill
eb71bbf8fe Use correct alias/cvar names in fonts cfgs
BTW I think r_font_hinting should be set in font-dejavu.cfg too, not only in font-nimbussansl.cfg
2010-09-05 11:42:58 +02:00
Rudolf Polzer
f85978ecbd Merge branch 'master' into divVerent/crypto2 2010-09-04 18:41:13 +02:00
Rudolf Polzer
d1f465f3ec set +x on xonotic-osx-* 2010-09-04 18:41:02 +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
8380d4924b add an icon changer script 2010-09-04 16:51:46 +02:00
Rudolf Polzer
dcd912a0c5 remove gl_lockarrays 0 on OS X (option no longer exists for ages) 2010-09-04 16:48:37 +02:00
Rudolf Polzer
1f5efe160c update Xonotic.icns 2010-09-04 16:47:42 +02:00
Rudolf Polzer
e22610be3b also use -mygames in new xonotic binaries 2010-09-03 14:37:24 +02:00
Rudolf Polzer
9991fcb647 dp.win64 build dependencies beginning (lacks SDL still) 2010-09-03 13:44:01 +02:00
Rudolf Polzer
df9e5d8700 win64 dlls for blind_id! 2010-09-03 13:43:01 +02:00
Rudolf Polzer
72ab7cb162 Merge branch 'master' into divVerent/crypto2 2010-09-03 13:41:53 +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
161af70f07 add crypto libraries for OSX 2010-09-02 12:32:12 +02:00
Rudolf Polzer
53277300e7 Merge branch 'master' into divVerent/crypto2
Conflicts:
	all
2010-09-02 12:30:19 +02:00
Rudolf Polzer
fc39a0cfdb add some untested info.plist keys 2010-09-02 06:10:52 +02:00
Rudolf Polzer
0c1da75a8e ./all compile: don't clean QC by default 2010-09-01 21:19:03 +02:00
Rudolf Polzer
1d695ed74f use -maxarea mode in -bsp 2010-09-01 08:35:30 +02:00
Rudolf Polzer
51daeceaac Merge remote branch 'refs/remotes/origin/merlijn/download-script-fix' 2010-08-31 08:35:03 +02:00
Rudolf Polzer
3187b39433 restrict the lightmapsearch for better batching (slightly more fps) 2010-08-30 10:12:18 +02:00
Rudolf Polzer
7247fd0164 better gmp compile for linux64 (does not crash on a GMP function we do not use) 2010-08-28 22:40:01 +02:00
Rudolf Polzer
aa9677f5b9 do not write zero alpha values 2010-08-28 11:29:36 +02:00
Rudolf Polzer
443b4bfa9f use Scharr operator instead of Sobel operator for edge detection 2010-08-28 11:20:59 +02:00
Rudolf Polzer
db5c45ff17 bring back oversized icons because we can 2010-08-27 21:37:04 +02:00
Rudolf Polzer
7ca0452514 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-27 21:33:30 +02:00
Rudolf Polzer
4278e9e08c update brand file for .ico 2010-08-27 21:33:12 +02:00
Rudolf Polzer
bc210b54e1 ico: make a combined icon resource of all resolutions 2010-08-27 21:32:34 +02:00
Rudolf Polzer
82f7254763 fix a minor typo 2010-08-27 17:04:02 +02:00