Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity
2,830 Commits
110 Branches
68 Tags
272 MiB
fix-linux-multi-monitor
core4
add-toggle-free-look-ah
main/yubo-dev
fix-media-player-playlist-limit
feature/change-sound-driver-ingame
10-use-item-shortcut-client
53-setting-to-change-tooltip-opacity
47-hide-quality-indicator-on-item-if-equal-to-1
18-enchant-icon-does-not-properly-update-on-weapon
feature/quick-start-py
23-sort-inventory-by-type-weight-bulk-quantity-quality-2
51-shift-enter-at-merchant-no-longer-sells-to-merchant
52-add-escape-shortcut-to-open-quit-menu
60-weapon-does-not-show-in-both-hands-on-load-in
main/atys-live
main/gingo-test
feature/split-action-bar-1-and-2
55-remove-chat-replies-shortcuts
46-rework-item-buff-icon-placement
43-crafting-items-are-not-sorted
40-dragging-from-player-trade-to-inventory-takes-two-tries
38-add-smooth-resizing-of-entitie-when-vpb-are-changed
36-add-ability-to-have-translated-titles-with-untraslated-fields
35-allow-drag-and-drop-between-zig-and-guild
feature/compatibility-old-gcc
26-encoding-issues-in-client-beta-after-core4-merge
fix-viewtext-localized-text
main/atys-pre-live
21-fix-nopatch-without-argument-crash
30-changes-for-silan-refactoring
fixes
27-fixed-crash-with-html-image-downloads
feature/hunter
16-drag-drop-to-player-trade-window-from-all-inventories
23-sort-inventory-by-type-weight-bulk-quantity-quality
25-remove-lock-option-from-item-menu-in-guild-inventory
feature/colissions-stairs
feature/core4-atys
feature/hunter-dxsdk-download
merge/2021-11-19
fix-area-effect-flying-text
add-screenshot-dir-to-config
feature/develop-atys
self-kill
inventory-fixes
develop
13-inventory-fixes
20-add-equip-option-to-right-click-dialog-in-all-inventories
6-animal-status-innacurate-when-zig-is-in-bag
atys
use-item-macro
ryzomclassic-develop
ryzom/silan_refactoring
feature/prepare-cross-merge
storyline/s2e0
feature/bonusmalus-timers
ryzom/ark/features
ryzom/op_refactoring
feature/css-lang-var
ryzom/ui/improvements
fx
feature/hires-textures
feature/cdb-packed-ryzomclassic
feature/cdb-packed
feature/opengl3
ryzom/patch-changes
fix_opengl_on_mac
ryzom/deepl
ryzom/lua-features
fix-media-player
feature/code-to-root
feature/post-code-move
feature/pre-code-move
fix-menu-scroll
storyline/s2e1
webig-fixes
ryzom/sheets
feature/streamed-package
hg/develop
hg/hotfix/patches-from-atys
hg/yubo
hg/atys
hg/ark
hg/feature/html-improvements
undelete-develop
hg/feature/menu-navi
hg/compatibility-develop
kaetemi-develop
feature/nel-dll
feature/version-resources
feature/clean-deprecated
feature/3ds-max-2020
feature/pipeline-tools
feature/build-pipeline-v3
hg/feature/material-editor
hg/feature/opengl3
hg/feature/qt5
hg/feature/cef3
hg/feature/streamed-package
hg/feature/light_cycle
hg/compatibility
hg/feature/gsoc2012-fabien
hg/feature/build_pipeline_v3
hg/feature/cdb-packed
hg/feature/game-device
hg/feature/sdl2
hg/feature/sse2
hg/feature/gsoc2013-dfighter
hg/feature/sound
3.3.0
Live-746
Live-791
Live-803
Live-813
Live-831
Live-832
Live-834
compatibility-merge
latest-default-graft
latest-graft-to-default
latest-merge-from-default
live/837
live/893
live/895
ryzom-patch-3.0.0
ryzom-patch-3.0.1
ryzom-patch-3.0.2
ryzom-patch-3.1.0
ryzom-patch-3.1.0-april_patch
ryzom-patch-3.1.0-hotfix
ryzom-patch-3.2.0
ryzom-patch-3.2.1
ryzom-patch-3.3.0
ryzom-patch-3.3.1
ryzom-patch-3.4.0
ryzom-patch-3.4.0_Atysmas
ryzom-patch-3.4.0_Steam_Fix
ryzom-patch-3.5.0
ryzom-patch-3.5.0.9637
ryzom/3.0.0
ryzom/3.0.1
ryzom/3.0.2
ryzom/3.1.0
ryzom/3.1.0-april_patch
ryzom/3.1.0-hotfix
ryzom/3.2.0
ryzom/3.2.1
ryzom/3.3.0
ryzom/3.3.1
ryzom/3.4.0
ryzom/3.4.0-atysmas
ryzom/3.4.0-steam_fix
ryzom/3.5.0
ryzom/3.5.0.9637
ryzomcore/v0.10.0
ryzomcore/v0.11.0
ryzomcore/v0.11.1
ryzomcore/v0.11.2
ryzomcore/v0.11.3
ryzomcore/v0.12.0
ryzomcore/v0.8.0
ryzomcore/v0.9.0
ryzomcore/v0.9.1
ryzomcore/v1.0.0
ryzomcore/v1.0.1
ryzomcore_0_8_0
v0.10.0
v0.11.0
v0.11.1
v0.11.2
v0.11.3
v0.12.0
v0.8.0
v0.9.0
v0.9.1
v1.0.0
v1.0.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '90595b5bb6'
${ noResults }
Commit Graph

2830 Commits (90595b5bb679367f4477857710d847d14aaf8950)
 

Author SHA1 Message Date
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
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 8fa5067506 Created my GSOC2013 branch. 
--HG--
branch : gsoc2013-dfighter
 12 years ago
dfighter1985 81df0aae27 Merged client_config_qt. 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