Commit Graph

2771 Commits (12df2fd71c7a83ead0fe7328ef08860ae5465a10)

Author SHA1 Message Date
dfighter1985 e44b663bdb Even more OpenGL ES cleanup.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 2b5eddbe95 More OpenGL ES cleanup.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 64335ae0b8 NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked 12 years ago
kaetemi f5a8bd2785 Missed one 12 years ago
kaetemi 692dafacfb Fix a typo 12 years ago
kaetemi 343cc325b2 Merge 12 years ago
kaetemi 72fabe141e Fix another compile error 12 years ago
kaetemi 2670e34621 Can't include this here. A light header with all of these maximum constants might be handy 12 years ago
kaetemi cf42b3473f Fix a compile error 12 years ago
kaetemi 0163a508c2 Merge 12 years ago
kaetemi 32082e854a Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:DIRECTION"")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 16783449a7 Avoid redundant per-frame calls to getDbProp in outpost.xml and outpost.lua
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 70ea479714 Make _ShowReticleLeaf static
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi ed912ab3ae Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:CDB_INIT_IN_PROGRESS")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 1fc4277cf4 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:MK_MOVE")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi cc2465199c Avoid redundant per-frame calls to getDbProp("UI:SAVE:USER_CHAR_FADE")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 23ac008cf1 Avoid redundant per-frame calls to getDbProp("SERVER:WEATHER:VALUE")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 171faa31fb Avoid redundant calls to getDbProp("UI:SAVE:INSCENE:...")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 477e9e8ef1 Avoid redundant calls to getDbProp in CEntityCL
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi aeb9f4d945 Avoid redundant per-frame calls to getDbProp("UI:ENTITY:GUILD:#:ICON")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 13fc6ffb58 Avoid per-frame 'set' action handler in map.xml when opening the respawn map
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 22710e12bd Avoid per-frame 'set' action handler in config.xml for blending day and night color
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 5a9537dfcc Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 19a8b48355 Avoid redundant per-frame calls to getDbProp("SERVER:USER:DEFAULT_WEIGHT_HANDS")
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi a75bd5d23a Avoid redundant per-frame calls to getDbProp in CNetManager
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 7bb8dec40c Parse action handler condition for interface link in advance
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi d5308215aa Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi fb00acf329 Avoid redundant per-frame calls to getDbValue32(toString("SERVER:CHARACTER_INFO:CHARACTERISTICS%d:VALUE", i))
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 5f80a90a1c Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:FPS", false)
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 2a57f6c647 Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false)
--HG--
branch : kaetemi-optimize
12 years ago
kaetemi 0897092fe3 Avoid redundant per-frame calls to getDbProp("UI:SAVE:SHOW_RETICLE")
--HG--
branch : kaetemi-optimize
12 years ago
dfighter1985 879f2f3a85 More GLES stuff removed.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 40da205b59 Removed some GLES related code.
--HG--
branch : gsoc2013-dfighter
12 years ago
kervala 8577277bfd Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method) 12 years ago
Cédric OCHS 1a83892ec6 Merged in StudioEtrange/ryzomcore/StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398 (pull request #19)
Fix some problems with space char in path on windows
12 years ago
kaetemi 55a00fd518 Don't do EOL changes for database.xml and msg.xml, causes checksum difference 12 years ago
dfighter1985 296083ba61 First batch of renames.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d5e5775f29 "Forked" the OpenGL driver.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 dddd531249 Moved back the unix event emitter to the OpenGL driver. It was a bad idea to move it out ( this way ) originally.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 1c0d74fc00 Unix build fixes.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 78595ec0e6 Silently sneaking in a nicer splash image for ovqt 12 years ago
dfighter1985 dcf3ba2785 Move unix event emitter out of the driver, to NL3D.
--HG--
branch : gsoc2013-dfighter
12 years ago
StudioEtrange 0efa7c8aee PCHSupport.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
12 years ago
StudioEtrange 744267c63b Fix some probleme with spaces in path on windows
PCHSupport.cmake edited online with Bitbucket

--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
12 years ago
StudioEtrange f18dd1f351 Error passing wrong version number to msvc linker
ENV: WinSDK8 VS2012 Compilation in 64 Bits
ERROR: error when linking client

CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/error-passing-wrong-version-number-to-ms-1374694351376
12 years ago
StudioEtrange 885a39ad7e nel.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640
12 years ago
StudioEtrange cc30e3b8f8 ENV:
WinSDK8
VS2012
Compilation in 64 Bits

ERROR:
error when linking client

CAUSE:
msvc link support only major and minor version number.
Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537
see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/env-winsdk8-vs2012-compilation-in-64-bit-1374693753244
12 years ago
kaetemi e435a07bb6 Fix bug #45 crash in zone lighter with large number of CPU cores 12 years ago
kaetemi e9c274c135 Use tags for pacs prim export 12 years ago
kaetemi 179669116c EOL 12 years ago
kervala aeddda3e19 Fixed: lua_open() doesn't exist with Lua 5.2 12 years ago
kervala 296b4384a8 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 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 7a9ae41fd5 Missing a letter e here
--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
dfighter1985 80bcf2026a If dynamic material already exists, simply just reinitialize it.
--HG--
branch : gsoc2013-dfighter
12 years ago
kaetemi 347d4e0940 Some necessary ryzom tools did not build when client and server were unchecked 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 c8147b301c Oups. Wrong copypaste of my own code.
--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 a113c81db3 Added a Variant type ( for holding variable type values ) to NLMISC
--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
dfighter1985 00b47d6a50 Implemented the Shader widget, more or less.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 128c2a3270 Changed the Shader widget a little.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 a57bb57c58 Missed these.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 a71e4bc3ed Added some Shader related classes. They are not yet complete.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 6d79a2cf6f Use the color editor for color properties. Also don't crash if property type is not supported by the property browser.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 2e6b1a834f We don't want duplicate property names and labels either.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9294cdc644 We don't want duplicate passes.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ea06a2c656 Property values can now be changed.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 9ee24b3b93 Property browser will now show the properties.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ed267a6587 Probably we don't want the default first pass to be stuck with us if we're loading a material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 fa3ad050de It's not a bad idea to always have at least 1 pass.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d96b7e2d66 Added a new class, MaterialSpliter, it holds the Material widget, and the Material properties Qt property tree widget, and acts as a proxy / message router for them.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 c9605dde57 Little bit of refactoring.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 832178a83f Adding / Removing properties will now work.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 94fe455a1a Material widget now retrieves the passes when loading a material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 067676c049 Changing passes should now show up on the material widget too!
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 02e61b1e1b Implemented the functionality of the Render Passes widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 30f8c9f9e1 Added a Nel3D proxy class.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 8c35946010 Material properties widget is now linked to the right button.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 85e885f274 Worked a bit more on dynamic material. Also started to rework the material and pass widgets since I've realized I messed it up. Eg.: passes should have properties, not the material itself.
--HG--
branch : gsoc2013-dfighter
12 years ago