Commit Graph

2788 Commits (888812e72dae65e3e8a45caf646026cc3153286a)

Author SHA1 Message Date
kervala 8577277bfd Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method) 11 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
11 years ago
kaetemi 55a00fd518 Don't do EOL changes for database.xml and msg.xml, causes checksum difference 11 years ago
dfighter1985 296083ba61 First batch of renames.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 d5e5775f29 "Forked" the OpenGL driver.
--HG--
branch : gsoc2013-dfighter
11 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
11 years ago
dfighter1985 1c0d74fc00 Unix build fixes.
--HG--
branch : gsoc2013-dfighter
11 years ago
kaetemi 78595ec0e6 Silently sneaking in a nicer splash image for ovqt 11 years ago
dfighter1985 dcf3ba2785 Move unix event emitter out of the driver, to NL3D.
--HG--
branch : gsoc2013-dfighter
11 years ago
StudioEtrange 0efa7c8aee PCHSupport.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
11 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
11 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
11 years ago
StudioEtrange 885a39ad7e nel.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640
11 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
11 years ago
kaetemi e435a07bb6 Fix bug #45 crash in zone lighter with large number of CPU cores 11 years ago
kaetemi e9c274c135 Use tags for pacs prim export 11 years ago
kaetemi 179669116c EOL 11 years ago
kervala aeddda3e19 Fixed: lua_open() doesn't exist with Lua 5.2 11 years ago
kervala 296b4384a8 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 11 years ago
dfighter1985 0c64261e22 The 3dsmax exporter will now use the material file specified in the Nel material.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 f94960dffe Added the Nel material file selection possibility to the Nel material 3dsmax startup script.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 3ff8613205 Merging default.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 7a9ae41fd5 Missing a letter e here
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 ac98c00088 The prototype of the material exporter. It's only called when exporting a mesh, for now.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 80bcf2026a If dynamic material already exists, simply just reinitialize it.
--HG--
branch : gsoc2013-dfighter
11 years ago
kaetemi 347d4e0940 Some necessary ryzom tools did not build when client and server were unchecked 11 years ago
kaetemi 02dc3c1cfe Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 11 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
11 years ago
dfighter1985 b776409cc8 More material properties are converted now.
--HG--
branch : gsoc2013-dfighter
11 years ago
dfighter1985 6ad18a88f5 Shouldn't reset the material properties, when editing them.
--HG--
branch : gsoc2013-dfighter
11 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
11 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
dfighter1985 26fab0c173 Forgot to add these to CMakeLists.txt
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 32071d9053 Added skeleton for CDynMaterial. This class will be the new material.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 40c95e82ff Changed the shader editor widget into a dialog. Implemented some of the button functions of Shader widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 abbc09e19c Added ShaderWidget, and restructured the material related menu items.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 d46944f258 More GUI skeleton work. Added Shader Editor widget.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 e87e265c42 Implemented some of the buttons of the GUI skeleton.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 5aec012c5f Added some more widget skeletons.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 ca52a76e5d Added the skeleton of the OVQT Material Editor plugin.
--HG--
branch : gsoc2013-dfighter
12 years ago
dfighter1985 301077c93d Merged default
--HG--
branch : client_config_qt
12 years ago
dfighter1985 d2a7c66e9f Use to .toUTF8() instead of .toStdString().
--HG--
branch : client_config_qt
12 years ago
dfighter1985 e950834079 Merged default
--HG--
branch : client_config_qt
12 years ago
Dzmitry Kamiahin 68fe576f01 Fixed self-comparsion in ps. 12 years ago
sfb 1bfba35cd0 merge 12 years ago
kaetemi 76a7df820b This should fix #41. It was creating the unknown for the new type and then returning a new sheet for the requested unknown 12 years ago
sfb 2bf56882f8 merge 12 years ago
sfb 8fe6eee93c fixed #40 with an explicit static_cast. 12 years ago
dfighter1985 bdfa7dbc37 Don't build GUI Editor when not building the GUI library. 12 years ago
kervala 2aea567fe2 Changed: Moved Ryzom detailed version in client 12 years ago
kervala f68cda5cd2 Changed: Process EventCloseWindowId by client 12 years ago
kervala 0624da9c82 Changed: Added a new event EventCloseWindowId when system reports window should be closed 12 years ago
kervala 67c93a1238 Changed: Warning 12 years ago
kervala d85e4f9ec7 Changed: EOL fixes 12 years ago
kervala 381eeaef8a Fixed: Virtual destructor warning 12 years ago
kervala 920cbf55ca Fixed: Assign instead of a comparison 12 years ago
kervala b0e717728b Changed: French comments translated to English 12 years ago
kervala 9aff9ae939 Fixed: PCH compilation 12 years ago
kervala d505b181f9 Changed: Define CMAKE_OSX_DEPLOYMENT_TARGET if not specified on command line 12 years ago
kervala 33c73f3f16 fixes #33 build failure/error using clang 12 years ago
kervala 0c2e2d3e8f fixes #32 build failure/error using clang 12 years ago
kervala 3aee7c3ac8 fixes a warning 12 years ago
kervala ab454f3d92 fixes #31 Luabind can't be found
Added PCH support to NeL GUI
12 years ago
kervala a5806126b4 Fixed: Compilation under Mac OS X (CMAKE_OSX_DEPLOYMENT_TARGET and CMAKE_OSX_SYSROOT must be set on CMake command-line if needed) 12 years ago
dfighter1985 526da8ddf8 MODIFIED: no more action handler spam. 12 years ago
dfighter1985 fb4875570e Merging dangling default branch. 12 years ago
mattraykowski b90737e365 changes #6 - updated the NL_VERSION_MINOR version from 8 to 9. 12 years ago
dfighter1985 2bdceaecda Resolved some build errors occuring after previous commit. 12 years ago
dfighter1985 fe456d91b6 GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 12 years ago
dfighter1985 ea8d82cfa6 MODIFIED: #20 Resolved build errors with stlport. 12 years ago
dfighter1985 d106260646 Merged in dfighter1985/ryzomcore (pull request #3)
GCC build error fixes for #20
12 years ago
dfighter1985 df7cf9704f Merged some changes. 12 years ago
dfighter1985 f7962597bd MODIFIED: #20 Resolved some GCC build in the GUI Editor. 12 years ago
mattraykowski 6e309fee7a changed #20 - moved the libwww package discovery and fixed include paths in library project. 12 years ago
dfighter1985 8d54b6f77d MODIFIED: Resolved build error with FINAL_VERSION set. 12 years ago
dfighter1985 ecbcdf388f MODIFIED: Resolved some GCC build errors. 12 years ago
SirCotare 44681d3663 #1470 re-added api
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 3cf378c5e7 merge from default
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 12db371ce0 merge from upstream
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare b7d56fc85e #1470 damn that merging... trying to remove malicious api
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 64aa976411 #1470 removed old parser
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 1dbd080eda #1470 added missing summary image
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 51cc279942 #1470 updated API & achievements tracker to latest live version
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 2d73e89682 #1470 database structure updated
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 6017025058 #1470 updated achievements app to latest live version
--HG--
branch : gsoc2012-achievements
12 years ago
SirCotare 598adb8489 #1470 updated admin tool to latest live version
--HG--
branch : gsoc2012-achievements
12 years ago
mattraykowski e7e51f01e0 merging gui editor repo. 12 years ago
mattraykowski 0eeeaa401f removed line from a bad merge of the character achievement code, sorry 12 years ago
mattraykowski 3f97c5afbd Added another path for x86_64 Ubuntu 12.10 for libwww 12 years ago
dfighter1985 a920c7e261 another merge from mainline 12 years ago
dfighter1985 96a5f00dbf CHANGED: Somehow lost this code part during development.
--HG--
branch : gsoc2012-gui-editor
12 years ago
dfighter1985 fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
12 years ago
kervala 6eec6cb861 Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 12 years ago
kervala f5dec3c1ca Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 12 years ago
mattraykowski de3371cae9 merging 12 years ago
sfb 9343d45e22 fixes #16 - forces tool to create an empty file in the root tool directory as a basis for initial patch generation 12 years ago
kervala 4f8b62acb4 Changed: Typo fixes (Thanks to DuDraig!) 12 years ago
mattraykowski cd2134e671 merging 12 years ago
mattraykowski 8ced186cfd merge from default
--HG--
branch : gsoc2012-achievements
12 years ago
mattraykowski 643fcadc27 merge changes in remote repo
--HG--
branch : gsoc2012-achievements
12 years ago
mattraykowski c87d8a7fe0 fixes #18 - adds the create script for the webig and app_test databases. 12 years ago
kervala e53d42ea0e Changed: Typo fixes (Thanks to DuDraig!) 12 years ago
kervala fc0f58e99b Changed: Typo fixes (Thanks to DuDraig!) 12 years ago
kervala 671827225d Changed: French comments translated to English 12 years ago
kervala 6e498aefad Changed: Typo fixes (thanks to Vagrant!) 12 years ago
kervala 3416ec2824 Changed: Warnings with clang 12 years ago
kervala 1582ae9dbf Changed: Preliminary memory leaks detection under Windows 12 years ago
kervala c71e6e82f1 Changed: Typo fixes (thanks to Vagrant!) 12 years ago
kervala 45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 12 years ago
kervala be0cd80674 Changed: Use OpenGL by default with an ATI card and without a warning dialog 12 years ago
mattraykowski f370f767ef fixes issue #9 - deleted the 'highres' graphvars from config files. 12 years ago
mattraykowski 6f64abe84a fixes issue #8 - checks for RYZOM_PATH env var, starts in build folder and turns on status line display in screen. 12 years ago
mattraykowski af14e1e591 merge, fixed inconsistent newlines 12 years ago
mattraykowski 971c2ba4a3 Fixed: #5 Applied check to validate parent skeleton is valid, patch provided by Vinicius Arroya. 12 years ago
kervala c53d1fb301 Changed: OpenGL headers not being found by PCH 12 years ago