1028 commits

Author	SHA1	Message	Date
Botanic	8ec1ee4d45	Merge	2013-11-02 16:35:26 -07:00
sfb	2220c593f5	Bad merge resolution, fixed a couple source files which merged poorly.	2013-10-28 11:24:31 -05:00
sfb	e9b8e2edba	merge from default	2013-10-23 12:08:09 -05:00
Matt Raykowski	8c046cf4c0	Merged in DJanssens/quitta-ryzomcore (pull request #25) ... Ryzom AMS - GSOC Project	2013-10-19 16:02:52 -05:00
kaetemi	08a4d9eb11	Fix #67 bad NELID in vertex program parser	2013-10-06 20:06:53 +02:00
kervala	88b2a1a38d	Fixed: Use multiarch library path under Linux	2013-09-30 09:11:35 +02:00
kervala	2becb762f8	Fixed: Some warnings	2013-09-29 16:26:24 +02:00
kervala	713e7b75b3	Changed: Detect Windows 8 and Windows Server 2012	2013-09-29 13:41:42 +02:00
kervala	9889049239	Fixed: Some warnings	2013-09-27 16:30:55 +02:00
kaetemi	185709734d	Fix warnings	2013-09-27 01:32:01 +02:00
Quitta	3d7a7dc191	Merge with quitta-gsoc-2013	2013-09-23 00:49:16 +02:00
kervala	4b6ca1e628	Fixed: Wrong variable used to compute array length	2013-09-22 13:23:03 +02:00
kervala	4f1897208c	Fixed: OpenGL ES driver compilation	2013-09-22 13:20:53 +02:00
kervala	26370c962d	Fixed: Warnings with GCC	2013-09-22 13:20:19 +02:00
kervala	df8c6e9b08	Changed: Created NELID macro to fix warning "multi-character character constant"	2013-09-22 13:10:57 +02:00
kaetemi	64d8faddd0	Fix typo	2013-09-14 19:05:54 +02:00
kaetemi	adcb3e032b	Fix regression from stereo branch in wind tree	2013-09-14 18:58:23 +02:00
kaetemi	60cd1f6116	Fix compile error in vertex program	2013-09-14 17:53:47 +02:00
kaetemi	4adbfd4e4e	Update supportVertexProgram calls	2013-09-14 16:43:36 +02:00
kaetemi	102f0080af	Cleanup unused code	2013-09-14 16:23:11 +02:00
kaetemi	0386673d13	Rename	2013-09-14 00:46:10 +02:00
kaetemi	08f37643b7	Cleanup	2013-09-14 00:36:06 +02:00
kaetemi	93b5536036	Merge with default	2013-09-13 23:24:13 +02:00
kaetemi	4f193231a1	Fix compile errors caused by missing includes	2013-09-13 23:23:19 +02:00
kaetemi	7d0a84b2d1	Merge with default	2013-09-13 23:07:49 +02:00
kaetemi	291c5d6012	Cleanup	2013-09-13 23:02:35 +02:00
kaetemi	881949a5d7	Use named indices with wind tree program	2013-09-13 22:20:52 +02:00
kaetemi	7176cbc0af	Use named indices for per pixel light vertex program	2013-09-13 21:47:42 +02:00
kaetemi	edec14807f	Use named uniform indices for lighted vertex program	2013-09-13 21:31:47 +02:00
kaetemi	a0fbb152ee	Updated wind tree program container	2013-09-13 20:45:06 +02:00
kaetemi	ba945f30a8	Use lighted vertex program container for per pixel light program	2013-09-13 20:00:20 +02:00
kaetemi	482c13fd1a	Add container for lighted vertex program	2013-09-13 19:03:05 +02:00
kaetemi	f7e80187ad	Adjust order for meshvp	2013-09-13 18:25:52 +02:00
kaetemi	ce7357ffa4	Do not use old interface here	2013-09-13 17:17:11 +02:00
kaetemi	7d854d54d1	Modify calls in bloom effect	2013-09-13 17:11:42 +02:00
kaetemi	2f384d9789	Update veget implementation	2013-09-13 17:09:05 +02:00
kaetemi	2ee6843cd9	Fixes for d3d	2013-09-13 17:08:56 +02:00
kaetemi	b77101cdd4	Update d3d implementation and add some debugging code	2013-09-11 01:12:37 +02:00
kaetemi	f0177268b4	Rename of a d3d specific class	2013-09-10 19:53:41 +02:00
kaetemi	a798aecd71	Partial update of veget vp	2013-09-10 19:52:14 +02:00
kaetemi	776f198df3	Update some test code	2013-09-10 16:42:51 +02:00
kaetemi	7462d731f1	Small adjustment to landscape vp parameter setting	2013-09-10 16:24:45 +02:00
kaetemi	26f4073ad7	Simplify	2013-09-10 15:59:31 +02:00
kaetemi	4de5eeb586	Adjust landscape vertex program to use new interface	2013-09-10 15:42:42 +02:00
kaetemi	32288eabe8	Use new program interface for water vertex program	2013-09-10 02:07:16 +02:00
kaetemi	dd490a0cc4	Set driver parameters	2013-09-10 02:01:57 +02:00
kaetemi	c9a2f9dbfc	Some fixes	2013-09-10 01:29:53 +02:00
kaetemi	680f260803	Use CSmartPtr for vertex program	2013-09-10 00:31:26 +02:00
kaetemi	14026e6f08	Set params from storage	2013-09-09 23:39:18 +02:00
kaetemi	1447e2f2d8	Replace temporary CMaterial code	2013-09-09 21:44:14 +02:00