Commit graph

2370 commits

Author SHA1 Message Date
SmileTheory
28e14c4546 Add sunlight/lightmap merging by multiply (r_sunlightMode 1)
Merge additive sunlight and map lighting into one GLSL shader (r_sunlightMode 2)
Change single lightmap blends to use lightall
2013-04-02 00:17:24 -07:00
Tim Angus
efaa87de10 Fix typo preventing OSX native compiles 2013-03-28 11:13:58 +00:00
Tim Angus
0183f3978a Fix OSX app/ub scripts 2013-03-28 09:56:29 +00:00
Zack Middleton
59061e853e Change missionpack QVM build order in Makefile
Now it matches native libs and baseq3 QVMs.
2013-03-27 14:26:34 -05:00
Tim Angus
2b3c5492c7 Add option to create archive of build product 2013-03-27 14:35:11 +00:00
Tim Angus
838fcf45cb Make the build summary more pretty 2013-03-26 23:12:17 +00:00
Tim Angus
946c89b5f1 Fix 'make -jX clean release' 2013-03-26 20:58:55 +00:00
Tim Angus
12115c28cd Fix the warning caused by fixing the warnings 2013-03-26 18:32:36 +00:00
Tim Angus
98360bcd57 Fix some of the things clang --analyze flagged 2013-03-26 16:50:03 +00:00
SmileTheory
66acde6d60 Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest 2013-03-25 21:05:27 -07:00
Tim Angus
352cd151e0 Cross compiling for OS X 2013-03-25 22:41:45 +00:00
Zachary Slater
01efc26654 s/enum/typedef enum/g on uniform_t for glorious fix of mac build. h/t MAN-AT-ARMS 2013-03-25 14:28:01 -07:00
Tim Angus
4f452fcfed Enable building QVMs when cross-compiling 2013-03-24 22:06:45 +00:00
Tim Angus
cae7ae9ce6 (bug #5904) Fix OpenBSD and Solaris builds 2013-03-23 12:14:03 +00:00
Tim Angus
d50338fb57 Use distclean for jenkins builds 2013-03-22 16:53:29 +00:00
Tim Angus
5d862d222e Make travis silent 2013-03-22 16:41:47 +00:00
Tim Angus
02a625a1b3 Fix it more 2013-03-22 14:47:37 +00:00
Tim Angus
6155816672 (Hopefully) fix the Jenkins build 2013-03-22 14:26:29 +00:00
Tim Angus
95da547711 Fix travis build 2013-03-22 14:05:50 +00:00
Tim Angus
b720b60295 Move cross-make-mingw.sh's functionality to the Makefile and remove it 2013-03-22 13:49:50 +00:00
Tim Angus
e4151c1d55 Add DEBUG_MAKEFILE to... debug the Makefile 2013-03-22 13:42:11 +00:00
Tim Angus
8d70929d12 Ditch 'historical compatibility' and use 'logic' instead 2013-03-22 11:33:27 +00:00
Tim Angus
bba199e795 Fix comment grammar (and test jenkins) 2013-03-21 22:37:44 +00:00
Tim Angus
ef0364e5c9 Fix cross-make-mingw.sh when no ARCH is supplied 2013-03-21 21:17:52 +00:00
Tim Angus
3ffefb663c Add jenkins-ci-build.sh 2013-03-21 18:00:27 +00:00
Tim Angus
e2f520e001 Merge mingw build scripts 2013-03-21 18:00:21 +00:00
Tim Angus
2c8e751130 Consolidate architecture names
amd64, x64, x86_64 -> x86_64
i386, i86pc, x86 -> x86
powerpc, ppc -> ppc
powerpc64, ppc64 -> ppc64
axp -> alpha

Some exceptions are made for the actual build product names
2013-03-21 18:00:17 +00:00
SmileTheory
8b23985358 Make all GLSL shaders use the same set of uniforms. 2013-03-20 22:53:30 -07:00
Zack Middleton
9bfff1363e Fix NET_IPSocket and NET_IP6Socket return type
It was causing a warning on Windows x64.
2013-03-18 16:04:53 -05:00
Zack Middleton
98dda7758f Always initialize joint_names in R_LoadIQM
Reported by MAN-AT-ARMS
2013-03-18 15:55:25 -05:00
Ensiform
9a752ce8cd Use PATH_SEP for a debug message in FS_FOpenFileReadDir 2013-03-18 14:44:34 -05:00
Zack Middleton
bf962c516d Fix loading and rendering IQMs with no joints 2013-03-18 14:13:09 -05:00
Tim Angus
ecd50f01c2 Remove RAVENMD4 #define 2013-03-18 19:05:51 +00:00
SmileTheory
e14a814ba2 Support more tcgens in lightall shader. 2013-03-14 23:11:27 -07:00
SmileTheory
369956eb63 Fix compilation in VS2008. 2013-03-14 21:36:44 -07:00
SmileTheory
9eef320c91 Remove some more automatic sRGB image flags. 2013-03-12 22:00:51 -07:00
Zack Middleton
71632ea291 Disable freetype and vorbis for mingw travis build
Libs are missing.
2013-03-12 18:52:36 -05:00
Zack Middleton
3698df37ef Fix mingw gcc name in build-test.sh 2013-03-12 17:18:55 -05:00
Tim Angus
dfbad1360f Fix some clang warnings 2013-03-12 21:50:59 +00:00
Zack Middleton
a2dc160359 Move mingw to separate build job on travis-ci 2013-03-12 16:33:49 -05:00
Tim Angus
bf25c27105 Oops missed a bit 2013-03-12 21:20:33 +00:00
Tim Angus
3e92679100 Fix USE_FREETYPE breakage 2013-03-12 19:41:52 +00:00
Tim Angus
37c69a8009 Move renderers a bit closer together 2013-03-12 17:52:29 +00:00
SmileTheory
41985945f6 Always reset vertex attrib pointers with animated meshes. 2013-03-11 22:46:21 -07:00
Tim Angus
ce9d0e8595 Remove README note about USE_OLD_VM64 2013-03-11 22:23:28 +00:00
Tim Angus
78132cf829 Remove old x86_64 JIT compiler 2013-03-11 22:20:10 +00:00
Zack Middleton
b009528e6a Fix displaying demo name when loading demo 2013-03-09 15:58:35 -06:00
Zack Middleton
89ee8b050f Fix size reserved for IQM jointMats (allocated more than used) 2013-03-08 15:28:27 -06:00
Zack Middleton
fd937a47ac Merge branch 'master' of https://github.com/ioquake/ioq3 2013-03-08 14:00:09 -06:00
Zack Middleton
8aa6efe7b6 Fix origin returned by IQM's LerpTag
It use to return pose joint's offset from base at the lerped frame, now it returns the joint's origin at the lerped frame.

Patch by Axel Isouard and Zack Middleton.
2013-03-08 13:47:16 -06:00