Commit Graph

779 Commits (6d946081e371c8024d141d65f3894102e0ece522)

Author SHA1 Message Date
kaetemi cc32c24f23 Revert branch unrelated change
--HG--
branch : opengl3
11 years ago
kaetemi 3738aa71ce Fix EOL
--HG--
branch : opengl3
11 years ago
dfighter1985 2ca40f10eb Merging default.
--HG--
branch : gsoc2013-dfighter
11 years ago
StudioEtrange 0b8db2399c CMAKE TARGET : SHARED and MODULE
About Shared Library (shared) and Module Library (module) type of cmake target
INSTALL command has different behaviour for ARCHIVE LIBRARY RUNTIME depending on the platform
11 years ago
kaetemi b1c485fde0 Cleanup 11 years ago
kaetemi 451a82e59e Cleanup 11 years ago
kaetemi 4f2a1b7db2 Fix the bug that caused the shape exporter to crash 11 years ago
kaetemi 90c9028170 Cleanup 11 years ago
kaetemi ada9e8da5d Fix export of NeL Flare 11 years ago
kaetemi 680dfbd738 Remove duplicate tool
--HG--
branch : build_pipeline_py
11 years ago
kaetemi 1a0ee41780 Improve debug message
--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
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
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