2238 Commits (09db5b352ccb213ad3dd6910156307c91729a923)

Author	SHA1	Message	Date
kaetemi	5144770d9d	Backed out changeset: de1de16eef3b ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	7219073bdc	Include world editor files directory in prim export ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	1a0ee41780	Improve debug message ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	31d5b54e74	Let prim checker only open files with ig extension ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	240576ab9c	Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?) ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	f5c30593c8	Merge with default ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	2c4ca0d915	Include world editor files in rbank process, part of what caused water not to build ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	32ca8d61fe	Add more paths to the build gamedata configuration ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	439ba0713e	Build pacs prim list txt outside repository ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	dfb2815bcd	Add separate target directory for shard data ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	6f7e5e7c72	Update default paths ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	11c9f6a91b	Merge with default ... --HG-- branch : build_pipeline_py	11 years ago
kaetemi	48d2c22639	Merge with default ... --HG-- branch : kaetemi-cleanup	11 years ago
kaetemi	89a2a2ce99	Do not select stereo display debugger when HMD is set to Auto in Snowballs	11 years ago
kaetemi	ca31e78f7c	Remove georges4cvs feature	11 years ago
kaetemi	bcb2f48940	Remove georges4cvs feature	11 years ago
kervala	c9a9839ce6	Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1)	11 years ago
kervala	1c50b1f943	Fixed: Compilation under Mac OS X 10.9	11 years ago
botanic	e995784886	Fixed typo issue 60	11 years ago
botanic	71b0f9ae92	Issue #60 ... does seem to work better when latency is high	11 years ago
botanic	60495f79ac	Merge	11 years ago
botanic	b6441edf2d	Fix for Issue #94	11 years ago
kervala	a5a9532a13	Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h)	11 years ago
kervala	09e3471f1b	Fixed: Compilation with freetype	11 years ago
kervala	43c48ad36a	Changed: Enable ig_elevation everywhere (patch by Liria)	11 years ago
liria	41a475b8f3	Merged default into ig_elevaton_port_to_linux ... --HG-- branch : ig_elevaton_port_to_linux	11 years ago
liria	ac48221c8b	CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche ... --HG-- branch : ig_elevaton_port_to_linux	11 years ago
kaetemi	207d7323ce	Fix Qt build on Windows	11 years ago
Nimetu	ea5a36b105	Remove tooltip debug message from logs ... --HG-- branch : misc-patches	11 years ago
Nimetu	4c2531474a	Fix typo (issue #70) ... --HG-- branch : misc-patches	11 years ago
Nimetu	3cd6ecdb82	Add deadlock counter to prevent endless loop (issue #73) ... --HG-- branch : misc-patches	11 years ago
botanic	935ea04c58	dont force null driver, doesnt work on all cards and disable maximising max while running pipeline	11 years ago
botanic	db3a789ab4	un kaetemi'd the pipeline	11 years ago
botanic	2c0d64e8ff	added single bat file to run whole pipeline	11 years ago
dfighter1985	3a84270a84	Textures with DSDT/DUDV format will now be uploaded as RG8. Ryzom will now not crash while entering world. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	fb38a7a0a7	Disable lights when the material isn't lighted. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	2a158e76e1	Lights should now be turned off even when enableLightInternal is called directly. This also fixes the dark background on the character selection screen. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	9c69e1bf84	Material colors ( ambient, diffuse, specular ) should now be used when there's no texture available. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kervala	6196077160	Changed: #85 Compilation with STLport + EOL	11 years ago
kervala	986edb216f	Fixed: #85 Compilation with STLport	11 years ago
kervala	c718ff693a	Fixed: Assign instead of comparison	11 years ago
kervala	b219623129	Fixed: Verbose warning	11 years ago
kervala	b96ad682f5	Fixed: Compilation under Mac OS X	11 years ago
kervala	a45bbd96c5	Fixed: Warning with clang	11 years ago
kervala	af1721a0a4	Changed: Don't need to change _PolygonSmooth if value is the same	11 years ago
kervala	166607f644	Changed: Implement VSync under Mac OS X	11 years ago
kervala	73196fe7fe	Changed: Replace strlwr by toLower	11 years ago
kervala	b46c316940	Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)	11 years ago
kervala	dda2215ed8	Fixed: Wrong algorithm	11 years ago
kervala	6b3b85962a	Changed: EOL	11 years ago
kervala	d8a6c9f966	Fixed: Warning with clang	11 years ago
kervala	36a537a88e	Changed: Replaced atof by fromString	11 years ago
kervala	b7082644f0	Changed: Updated OpenGL registry	11 years ago
dfighter1985	a119d3e1a0	Use the view matrix instead of modelview to transform the light stuff. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	8f2e75415c	Set up the normalmatrix in the driver and feed it to the shaders, instead of calculating it in the shaders. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	9c0e1c2449	Tattos ( and other multitextured stuff ) will now show up again, even if there's only one texture coordinate set. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	7f7a3e159b	Reverse directional light direction as it is done in the old OpenGL driver. Also normalize normal. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	90dc025fd8	Fixed: Some uniforms names were wrong after the merge, which led to rendering issues. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	eb9b3e4f0f	Implemented light controls. ... --HG-- branch : gsoc2013-dfighter	11 years ago
Botanic	6dfafa7ae1	Merge	11 years ago
dfighter1985	1cc71457eb	Implemented a basic fog control widget. ... --HG-- branch : gsoc2013-dfighter	11 years ago
sfb	59abfb8a1d	Bad logging, content is unsigned const char*, fixed it to use %s and not cast. ... --HG-- branch : gsoc2011-worldeditorqt	11 years ago
sfb	df7110d2d6	Bad merge resolution, fixed a couple source files which merged poorly. ... --HG-- branch : gsoc2011-worldeditorqt	11 years ago
sfb	d86f150caa	Bad merge resolution, fixed the build files that merged poorly. ... --HG-- branch : gsoc2011-worldeditorqt	11 years ago
Botanic	7381de073e	fixed bad merge	11 years ago
Botanic	057fe3e0f7	Merge	11 years ago
dfighter1985	ed885d3df6	Replaced ARB VertexAttribArray stuff with the core calls. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	d37b004372	Removed some more deprecated stuff. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	a9a9768872	Removed ARB fragment shader stuff. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	f768704cbf	Removed some ATI stuff. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	6947a58ba1	Removed fixed embm stuff. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	8276cb0140	We shouldn't set up a generated or newly compiled shader program if we already have one ( set up from outside the driver for example ). ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	82a7237e7d	Forgot to actually add the driver infos to the list, which caused the driver to hang on deletion. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	c105164eeb	Getting rid of z-order assignment warning. ... --HG-- branch : gsoc2013-dfighter	11 years ago
sfb	892ed1ed3d	merge from default ... --HG-- branch : gsoc2011-worldeditorqt	11 years ago
Matt Raykowski	0001719d99	Merged in DJanssens/quitta-ryzomcore (pull request #25) ... Ryzom AMS - GSOC Project	11 years ago
dfighter1985	982b99d8d0	Merged the GPU program stuff from mainline. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	563afd027c	Fix #67 bad NELID in vertex program parser	11 years ago
dfighter1985	3b16f096cc	Merge with rename commit. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	32e814ecb6	Use separate shaders in the OpenGL3 driver. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kervala	eb3c58cce9	Fixed: Use multiarch library path under Linux	11 years ago
kervala	de43ea8d86	Fixed: Some warnings	11 years ago
kervala	f2ee0e99d8	Changed: Detect Windows 8 and Windows Server 2012	11 years ago
kervala	c7899841d3	Fixed: Compilation under Linux	11 years ago
kervala	eebe74066e	Changed: Include Lua headers directory for GUI Editor	11 years ago
kervala	43bbfe3da7	Fixed: Some warnings	11 years ago
kaetemi	3b4730c890	Fix warnings	11 years ago
kaetemi	85365fd7bb	Fix line endings	11 years ago
dfighter1985	b70ce1eb09	Renamed OpenGL3 to opengl3 ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	ace1b5386b	Check GL_ARB_separate_shader_objects extension on startup, and load related functions. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	cf6d2a88bc	Removed some now unused methods. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	afb56ea660	Moved the rendering methods into a new file. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	b0613e334c	Removed a now unused file. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	9d3e3a6a73	GL_VERTEX_PROGRAM_TWO_SIDED_ARB isn't used in the GL3 driver. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	7b5aaf7e0f	Some cleanup, most of the old OpenGL stuff should be gone. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kervala	c8c296f484	Changed: Created NELID macro to fix warning "multi-character character constant"	11 years ago
dfighter1985	5326324b56	Some comments. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	69a4a9f9a5	Two sided rendering, while using dynmat. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	390d1bb156	Don't call newMaterial() every time we load a (sub)material. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	dbd5185de1	Only use the shader combo box for the user shaders. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	586c25f864	When clearing the dynmat, should clear all of them. Also fixes a crash. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	3949c210f6	OpenGL should be fed a clamped color value. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	76204a844d	When changing a shader in the editor, reload it in the driver too. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	b775237215	It's now possible to render using the user shaders and dynmat. ... --HG-- branch : gsoc2013-dfighter	11 years ago
Quitta	a484de5b3f	Merge with quitta-gsoc-2013	11 years ago
kervala	bb7297f260	Fixed: Wrong variable used to compute array length	11 years ago
kervala	b7ddc2c0d2	Fixed: OpenGL ES driver compilation	11 years ago
kervala	82904232d2	Fixed: Warnings with GCC	11 years ago
kervala	6695a9064e	Changed: Created NELID macro to fix warning "multi-character character constant"	11 years ago
dfighter1985	c3c3f154b1	Instead of auto-generating the dynmaterial added a menu item in the material editor that will trigger it if needed. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	8269ec7be5	Wrong direction, wrong lighting! ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	11fe86e552	Forgot to actually pass the direction in the previous commit... ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	72e7d09113	Don't calculate these more than once. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	69c41a31ae	These positions and directions were supposed to be in eye coords. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	0453f30582	Added lighting to the specular shader. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	f194704a28	Refactored directional lighting a little. No need to calculate things more than once. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	0ab68ef25f	Added point light support. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	9a647a893c	Specular shader should compile even when there's no fog added. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	2e4b6bb6ae	Don't try to edit stock shaders. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	a9a1d17c4f	Added the stock shader names to the material editor, so it will now be able to select them when loading a shape. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	1d71a540ba	Apparently QColor::set[color]f takes colors as floats clamped to the [0,1] range. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	c6bb6ec2a9	Renamed a bunch of shader related classes in NL3D to contain the word Usr, since they are user shader related. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	6c58856ed7	Shininess is now loaded from the material as a uniform instead of being hardcoded. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	4ba9d815d4	Colors are now set from the light setup, rather than being hardcoded. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	6f396aa8f7	Added the directional light(s) to the lightmap shader too. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	01ef7fd973	The specular calculation is probably faster this way. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	4ec92d2f06	Simplified the directional light shader generator functions. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	28c4b5b157	Added specular term to the directional lights. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	354d2b8c65	Added ambient term support for directional light. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	43817746ec	Renamed light[n]Col to light[n]ColDiff. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	0def5caf54	Added diffuse directional light support to the normal shader. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	3c99323ada	Apparently typos and redundantly setting uniforms can totally ruin rendering :D ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	5fbfe7b17f	Since now we have fog support, this doesn't need to be disabled anymore. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	1a669307da	Fix typo	11 years ago
kaetemi	ce9e0a397b	Fix regression from stereo branch in wind tree	11 years ago
kaetemi	046e3c92da	Fix compile error in vertex program	11 years ago
kaetemi	3c099397d8	Update supportVertexProgram calls	11 years ago
kaetemi	e99bc7ba69	Remove old interface	11 years ago
kaetemi	256f7ff06c	Cleanup unused code	11 years ago
dfighter1985	8d57eac3d4	Some basic fog. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	6dfc8d0a00	Rename ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	973215e1d0	Cleanup ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	96dc139ddd	Merge with default ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	df123d6b89	Fix compile errors caused by missing includes	11 years ago
kaetemi	d2bc32e598	Merge with default ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	cd9baf8f89	Cleanup ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	74cff50842	Use named indices with wind tree program ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	c766940e75	Use named indices for per pixel light vertex program ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	f9c9c1836a	Use named uniform indices for lighted vertex program ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	61af565bf9	Updated wind tree program container ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	c353121771	Use lighted vertex program container for per pixel light program ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	a72f25e763	Add container for lighted vertex program ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	ab231ea700	Adjust order for meshvp ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	278e19743c	Do not use old interface here ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	d5c2a0527d	Modify calls in bloom effect ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	5e14dc4458	Update veget implementation ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	9d93ae51a3	Fixes for d3d ... --HG-- branch : multipass-stereo	11 years ago
dfighter1985	c6b714299a	Instead of their own bool, store enabled features in the features variable as a flag. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	bbb4762b77	Move shader description generation to it's own method. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	06d7bd9c74	Added alpha test to generated shaders. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	d6558b5b0d	Fixed some typos with shader generation. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	21a70b4211	Update d3d implementation and add some debugging code ... --HG-- branch : multipass-stereo	11 years ago
dfighter1985	300cd284d1	Generate samplers for Lightmap shader, based on the number of lightmaps. This fixes the weird display of some lightmapped shapes. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	e8d77e23e0	Rename of a d3d specific class ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	c6139419ac	Partial update of veget vp ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	5fbb220795	Update some test code ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	c53aa6958e	Small adjustment to landscape vp parameter setting ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	88cbc2f82b	Simplify ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	abafc9b1ef	Adjust landscape vertex program to use new interface ... --HG-- branch : multipass-stereo	11 years ago
dfighter1985	36a30e83a0	Don't try to render if can't set program up. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	1acccdb5ef	Uniform index caching. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	5ad617efb6	Use new program interface for water vertex program ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	32809d646a	Set driver parameters ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	64643e564b	Some fixes ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	0429e67903	Use CSmartPtr for vertex program ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	8f4fe87b7b	Set params from storage ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	484a946c60	Fix incorrectly removed line ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	b03895f5f3	Missed file in last commit ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	e3dead19e4	Replace temporary CMaterial code ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	e9444ce36a	Implement param storage copy ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	bb625c33bd	Flag some TODO's ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	87b24bc4ab	Add glsl pixel program for stereo distortion ... --HG-- branch : multipass-stereo	11 years ago
dfighter1985	16290f7ff9	Merging default. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	ac2e087fbf	Cleanup abstract gpu program interface ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	0d743d7f37	Implement new driver interface in Direct3D driver ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	81876009d3	Implement new driver interface in OpenGL driver ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	d1b93ac3d6	Expand parameter interface ... --HG-- branch : multipass-stereo	11 years ago
dfighter1985	882118612d	Moved some constants to uniforms. ... --HG-- branch : gsoc2013-dfighter	11 years ago
dfighter1985	77ae38e452	Added a very primitive shader caching scheme. ... --HG-- branch : gsoc2013-dfighter	11 years ago
kaetemi	e84e08b0f6	Reduce function duplication ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	4d1b5d90c0	Builtin parameter set functions ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	afe6c16bf3	Separate count and size ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	05583d134a	Cleanup driver interface ... --HG-- branch : multipass-stereo	11 years ago
kervala	0b9092a547	Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)	11 years ago
kervala	0ccec811d6	Changed: Updated Freetype libraries variable	11 years ago
kervala	87ee7fa8d2	Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt	11 years ago
kaetemi	235bfcfd94	Add additional set functions ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	f0af3326e6	Add gpu program params storage structure ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	ee0396bd6f	Implement new gpu program interface in direct3d driver ... --HG-- branch : multipass-stereo	11 years ago
kaetemi	350b580085	Implement new gpu program interface in opengl driver ... --HG-- branch : multipass-stereo	11 years ago