Commit Graph

914 Commits (6d946081e371c8024d141d65f3894102e0ece522)

Author SHA1 Message Date
kaetemi 0d0907aa08 Add build shadow skin to shape process 11 years ago
kaetemi 3fa19d91a5 Generate correct client.cfg data path for dev client 11 years ago
kaetemi 2619033972 Replace shard install script 11 years ago
kaetemi 680dfbd738 Remove duplicate tool
--HG--
branch : build_pipeline_py
11 years ago
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 ca31e78f7c Remove georges4cvs feature 11 years ago
kaetemi bcb2f48940 Remove georges4cvs feature 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
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
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 6b3b85962a Changed: EOL 11 years ago
kervala 36a537a88e Changed: Replaced atof by fromString 11 years ago
dfighter1985 eb9b3e4f0f Implemented light controls.
--HG--
branch : gsoc2013-dfighter
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
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
dfighter1985 982b99d8d0 Merged the GPU program stuff from mainline.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 32e814ecb6 Use separate shaders in the OpenGL3 driver.
--HG--
branch : gsoc2013-dfighter
11 years ago
kervala de43ea8d86 Fixed: Some warnings 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
kaetemi 85365fd7bb Fix line endings 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 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 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
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 0ab68ef25f Added point light support.
--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 4ba9d815d4 Colors are now set from the light setup, rather than being hardcoded.
--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 8d57eac3d4 Some basic fog.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 16290f7ff9 Merging default.
--HG--
branch : gsoc2013-dfighter
11 years ago
kervala 0b9092a547 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 11 years ago
kervala 86dfd0350b Fixed: Integer 32 bits conversion to 64 bits pointer 11 years ago
dfighter1985 7307d748ea Sometimes shapes have 0 materials?!
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 14aea7acc9 Removed the debug triangle from the material editor plugin.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 d67198580a Implemented uniform querying, setting. Also updated the test triangle.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 3ca6a98aec Made the triangle debug program a bit more complicated, now using interpolated color.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9dc91a6ed1 Abstract program objects, vertex, and pixel programs can now be created using the driver, so the user can now feed shaders to it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f5358f712c Rendering the debug triangle with GLSL now works.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f387256984 Added triangle drawing for debug purposes.
--HG--
branch : gsoc2013-dfighter
12 years ago
kervala 2c7f848c83 Changed: Tabulations to spaces 12 years ago
dfighter1985 6fba0c094a Merging default
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 8f45e49fa0 GL3 driver can now be instantiated.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 5ad6373f61 Build ligo outside the database
--HG--
branch : build_pipeline_py
12 years ago
kaetemi 78595ec0e6 Silently sneaking in a nicer splash image for ovqt 12 years ago
kaetemi e9c274c135 Use tags for pacs prim export 12 years ago
dfighter1985 0c64261e22 The 3dsmax exporter will now use the material file specified in the Nel material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 f94960dffe Added the Nel material file selection possibility to the Nel material 3dsmax startup script.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 3ff8613205 Merging default.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ac98c00088 The prototype of the material exporter. It's only called when exporting a mesh, for now.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 02dc3c1cfe Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 12 years ago
dfighter1985 e99c1e2785 Clear the properties when clearing the scene, and also deactivate the buttons and comboboxes of the material widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 b776409cc8 More material properties are converted now.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 6ad18a88f5 Shouldn't reset the material properties, when editing them.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 37fb2cfcda Started work on converting the old material to new one. Some colors are already out. Also made some modifications to the editor so it can deal with it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 fb3f069a38 Should be able to save QColor based QVariant too.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 192e9c058a More work on the Variant type. Also modified material editor to use it.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9306bd71e6 Added GUI code for multi/sub-material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c2296a2a93 It's not a terrible idea to remember the last used directory in the file open dialogs.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 04dcad32e7 Added support for adding basic primitives cube, sphere, cylinder, teapot.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 a2ccb7e796 The main window takes ownership of ViewPortWidget because of setCentralWidget, so no need to delete it here.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 6d31a50f5d I'll give up, I don't know why wheel events are not passed over to this widget as native events. Fortunately they are not needed, since the Nel style 3d mouse listener doesn't use them.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 42bf13dcfd Implemented shape moving/rotating/zooming. Used parts of Dnk's code from object viewer for setting the camera up properly. NOTE: for some reason the ViewPortWidget doesn't receive native mouse wheel events. An investigation is in order.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 66fb3c1284 Shapes can now be loaded and rendered to ViewPortWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 8408ddd552 Added ViewPortWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 96eb64ecbe Shader can now be set for the rendering pass, using the shader combo box in MaterialWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 cc86cdd3ef ShaderEditorWidget will now load/save it's content.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c9cd9cdd3c Shaders will now show up in the shader combobox of MaterialWidget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 1f2ff5721e Shaders are now loaded/saved/deleted from the disk.
--HG--
branch : gsoc2013-dfighter
12 years ago