Commit graph

929 commits

Author SHA1 Message Date
kaetemi
ea7942b093 Be helpful
--HG--
branch : feature-export-assimp
2015-09-22 16:18:00 +02:00
kaetemi
6edff36476 Apply uv channel and transform
--HG--
branch : feature-export-assimp
2015-09-22 16:00:07 +02:00
kaetemi
7f31e640da Initial work on UV
--HG--
branch : feature-export-assimp
2015-09-21 23:47:19 +02:00
kaetemi
27e7095db9 Import material texture
--HG--
branch : feature-export-assimp
2015-09-21 18:11:35 +02:00
kaetemi
f8bb35c449 Adjust material import
--HG--
branch : feature-export-assimp
2015-09-21 15:53:12 +02:00
kaetemi
5fe1f2c711 Fix typo
--HG--
branch : feature-export-assimp
2015-09-20 21:47:26 +02:00
kaetemi
efccbdd3af Export shape
--HG--
branch : feature-export-assimp
2015-09-20 21:41:53 +02:00
kaetemi
c9aef7b5a4 Import basic material options
--HG--
branch : feature-export-assimp
2015-09-20 21:08:30 +02:00
kaetemi
ac5d9272f1 Adjust
--HG--
branch : feature-export-assimp
2015-09-20 19:12:33 +02:00
kaetemi
3a7b5c6a46 Note
--HG--
branch : feature-export-assimp
2015-09-20 19:06:07 +02:00
kaetemi
9e20f83e48 Shape import
--HG--
branch : feature-export-assimp
2015-09-20 19:03:05 +02:00
kaetemi
e60a9747b8 Restructure
--HG--
branch : feature-export-assimp
2015-09-20 17:22:24 +02:00
kaetemi
33dd77d516 Skeleton scan
--HG--
branch : feature-export-assimp
2015-09-20 17:03:44 +02:00
kaetemi
fec41ebda9 Scene meta data
--HG--
branch : feature-export-assimp
2015-09-20 16:44:56 +02:00
kaetemi
dec6c2d880 Centralized asset database configuration
--HG--
branch : feature-export-assimp
2015-09-20 15:23:27 +02:00
kaetemi
8036d53411 Add pipeline v3 tool logger
--HG--
branch : feature-export-assimp
2015-09-20 14:08:38 +02:00
kaetemi
875d7eaa7c Flag bones in scene for skel export
--HG--
branch : feature-export-assimp
2015-09-19 19:35:57 +02:00
kaetemi
7d502cc6bb Command line options
--HG--
branch : feature-export-assimp
2015-09-19 18:08:25 +02:00
kaetemi
d55124a6a9 Placeholder projects
--HG--
branch : feature-export-assimp
2015-09-19 17:14:35 +02:00
kaetemi
7d53552979 Fix object viewer include issue
--HG--
branch : develop
2015-07-10 07:54:34 +02:00
kaetemi
edebe18d6c MFC now requires XP or higher
--HG--
branch : develop
2015-07-10 06:24:17 +02:00
kaetemi
f578f0441a Add extra light groups for better lightmap control
--HG--
branch : develop
2015-04-16 17:39:47 +02:00
kaetemi
d9f3efc4e3 ryzomcore/v0.12.0
--HG--
branch : develop
2015-04-14 11:55:08 +02:00
kaetemi
2d74de8a36 Separate dither matrix per color channel
--HG--
branch : develop
2015-03-30 12:04:35 +02:00
kaetemi
2da42040ef Apply bayer dither to TGA16 export for smoother lightmaps
--HG--
branch : develop
2015-03-30 11:22:25 +02:00
kaetemi
9d36ac8cb0 Merge with hotfix
--HG--
branch : develop
2015-03-07 00:01:02 +01:00
kaetemi
621a9e8f7c ryzomcore/v0.11.3
--HG--
branch : hotfix
2015-03-06 23:53:34 +01:00
kaetemi
2d297efc2a Merge with hotfix
--HG--
branch : develop
2015-03-06 23:40:48 +01:00
kaetemi
846abf93c9 Synchronize versions
--HG--
branch : hotfix
2015-03-06 23:37:21 +01:00
kaetemi
5a297ddbe4 Flag max plugins as windowed
--HG--
branch : develop
2015-03-06 21:20:01 +01:00
kervala
e8b0765e7c Merge with hotfix
--HG--
branch : develop
2015-02-14 14:31:19 +01:00
kervala
b0937ec02b Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 12:47:03 +01:00
dfighter1985
972d270bfc Merged in hotfix (pull request #105)
Merge hotfix

--HG--
branch : develop
2015-02-02 23:32:08 +01:00
dfighter1985
2d308dc6e7 Fixed build of Object Viewer Widget Qt ( old, not part of Studio ).
--HG--
branch : hotfix
2015-02-02 22:01:16 +01:00
kaetemi
dade81e02e Lightmap debug message
--HG--
branch : develop
2015-01-13 13:21:56 +01:00
kaetemi
c03c0f532b Merge with default
--HG--
branch : develop
2014-12-22 14:26:26 +01:00
kaetemi
f9c81f3740 ryzomcore/v0.11.2
--HG--
branch : hotfix
2014-12-22 14:21:01 +01:00
kaetemi
7cb61f8796 Merge
--HG--
branch : develop
2014-12-09 23:07:58 +01:00
kaetemi
da166c81db Add zone snapshot script example
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
4c4b96bcfd Fix NeLLigoMakeSnapShot
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
6db29c375a Add script to generate zone names
--HG--
branch : develop
2014-12-09 23:06:07 +01:00
kaetemi
56339c6f93 Handle window close message in painter
--HG--
branch : develop
2014-12-09 23:06:07 +01:00
kaetemi
07286c14d1 Adjust patch orientation script
--HG--
branch : develop
2014-12-04 13:28:30 +01:00
kaetemi
90f1234ed0 Add key in patch painter to reset a patch mesh
--HG--
branch : develop
2014-12-04 13:21:45 +01:00
kaetemi
b762356a16 Merge with hotfix
--HG--
branch : develop
2014-12-04 13:21:40 +01:00
kaetemi
59a5cb7e6b Fix crash with patch mesh attach
--HG--
branch : hotfix
2014-12-04 13:21:12 +01:00
kaetemi
39c776ec30 Add script to orient zone patches automatically
--HG--
branch : develop
2014-12-03 15:16:39 +01:00
kaetemi
ff283f5070 Increase patch painter distance
--HG--
branch : develop
2014-12-03 15:16:39 +01:00
kaetemi
91a4207f93 Merge with hotfix
--HG--
branch : develop
2014-11-24 15:04:16 +01:00
kaetemi
6b1ea30f9c ryzomcore/v0.11.1
--HG--
branch : hotfix
2014-11-24 14:57:36 +01:00
kaetemi
f05c52aa0b Remove PIC library
--HG--
branch : develop
2014-11-19 16:20:14 +01:00
kaetemi
0c1ff0df2a ryzomcore/v0.11.0
--HG--
branch : develop
2014-11-10 23:34:41 +01:00
kaetemi
902a873e78 Add resave scripts
--HG--
branch : develop
2014-09-18 17:40:07 +02:00
kaetemi
5e9c3b82fc Add particle system path fixing script
--HG--
branch : develop
2014-09-18 14:10:03 +02:00
kaetemi
e347b2a97f ryzomcore/v0.10.0 2014-09-12 10:57:31 +02:00
dfighter1985
a810b29ec7 Merged default.
--HG--
branch : gsoc2014-dfighter
2014-08-19 00:33:03 +02:00
kaetemi
683a0adc60 Crashfix in case pacs_prim are exported into .ig 2014-08-18 20:23:27 +02:00
kaetemi
9a19f2041b Crashfix in case pacs_prim are exported into .ig 2014-08-17 19:37:20 +02:00
kaetemi
8f7931d6a8 Crashfix in case pacs_prim are exported into .ig 2014-08-17 16:41:09 +02:00
kaetemi
e0e1953f41 Crashfix in case pacs_prim are exported into .ig 2014-08-17 16:22:56 +02:00
kaetemi
75e2841519 Fix continent path bug 2014-08-17 15:58:42 +02:00
dfighter1985
0f7e1c022a Merge default
--HG--
branch : gsoc2014-dfighter
2014-08-07 00:03:09 +02:00
kervala
b71ec9e7d4 Fixed: build_interface currently only works with 32 bits bitmaps 2014-08-02 10:58:50 +02:00
kervala
ffb7df28ff Fixed: VC++ 2010 compiler bug in for loop variables reuse 2014-08-02 10:57:31 +02:00
kervala
a29f525c99 Fixed: Some NeL tools in 3d directory don't need NeL 3D 2014-08-01 17:17:53 +02:00
kaetemi
8e7a3b27d7 ryzomcore/v0.9.1 2014-07-29 19:21:25 +02:00
kaetemi
c8dcfe8d05 Crashfix for 3ds Max export 2014-07-30 20:56:28 +02:00
kaetemi
9061eb8389 Cleanup 2014-07-29 16:48:14 +02:00
kaetemi
f49e9c5df1 Fix Skin export interface issue, #169 2014-07-29 15:42:11 +02:00
kaetemi
a9e3804011 Add warning 2014-07-29 15:23:51 +02:00
kaetemi
7d8e803f7a Crashfix Physique export 2014-07-29 15:23:06 +02:00
kaetemi
9f19ade30c Bugfix 2014-07-29 14:25:28 +02:00
kaetemi
2b8e006981 Initialize object viewer viewport at correct size 2014-07-29 14:10:40 +02:00
kaetemi
617d1235d1 Compile fix 2014-07-29 14:09:08 +02:00
dfighter1985
8373118c7e Merged default.
--HG--
branch : gsoc2014-dfighter
2014-07-22 00:15:50 +02:00
kervala
23b73eff1d Changed: Minor change 2014-07-19 11:24:07 +02:00
kervala
3fb0dfe0c2 Changed: Some Big endian swaps (for PowerPC especially) 2014-07-19 11:23:49 +02:00
kervala
8d2db7bc85 Changed: Replaced atof by NLMISC::fromString 2014-07-19 11:14:38 +02:00
kaetemi
12aa02585f Fix self illumination color widget in NeL Material script 2014-07-28 18:32:05 +02:00
kaetemi
3b4e1a32cb Fix NeL Material script defaults, fix #166 2014-07-28 18:31:40 +02:00
kaetemi
6e3827928b Adjust 3ds Max plugin versioning info 2014-07-28 18:31:20 +02:00
kaetemi
401d4bc791 Fix NeL Tools compile under MinGW 2014-06-18 21:05:39 +02:00
kaetemi
0a41e6b3c4 Fix Windows compilation of lightmap_optimizer 2014-05-23 01:57:19 +02:00
liria
94b30c76fa Merged default into lightmap_optimizer_port_to_linux
--HG--
branch : lightmap_optimizer_port_to_linux
2014-05-15 16:36:59 +02:00
dfighter1985
91f859bc8a Moved ovqt to /code/studio
--HG--
branch : gsoc2014-dfighter
2014-05-06 01:30:28 +02:00
kaetemi
798d207d0d Fix EOL 2014-04-30 12:53:06 +02:00
dfighter1985
4f39a58e31 Tile Editor crash fixes.
--HG--
branch : gsoc2014-dfighter
2014-04-23 02:10:14 +02:00
dfighter1985
fd5d961ba7 Build fixes.
--HG--
branch : gsoc2014-dfighter
2014-04-23 00:49:17 +02:00
dfighter1985
f882abca07 Merged Georges Editor branch.
--HG--
branch : gsoc2014-dfighter
2014-04-22 21:12:26 +02:00
dfighter1985
4d3a472262 Merged default.
--HG--
branch : branch-tile-edit-ovqt-plugin
2014-04-22 21:10:19 +02:00
dfighter1985
f3b94d38d5 Merged default.
--HG--
branch : branch-features-geqt-plugin
2014-04-22 21:02:34 +02:00
dfighter1985
41f44b2aa6 Merge default.
--HG--
branch : gsoc2012-gui-editor
2014-04-19 21:53:29 +02:00
liria
12f63f3a6e Typo correction
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-05 13:49:14 +00:00
liria
30036d000c Merged default into lightmap_optimizer_port_to_linux
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-05 15:40:17 +02:00
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
2014-02-16 19:43:44 +01:00
kaetemi
b1c485fde0 Cleanup 2014-02-09 22:35:01 +01:00
kaetemi
451a82e59e Cleanup 2014-02-09 22:21:30 +01:00
kaetemi
4f2a1b7db2 Fix the bug that caused the shape exporter to crash 2014-02-09 22:12:44 +01:00
kaetemi
90c9028170 Cleanup 2014-02-09 21:53:49 +01:00
kaetemi
ada9e8da5d Fix export of NeL Flare 2014-02-09 17:26:26 +01:00
kaetemi
680dfbd738 Remove duplicate tool
--HG--
branch : build_pipeline_py
2014-02-07 02:17:42 +01:00
kaetemi
1a0ee41780 Improve debug message
--HG--
branch : build_pipeline_py
2014-02-07 01:49:01 +01:00
kaetemi
48d2c22639 Merge with default
--HG--
branch : kaetemi-cleanup
2014-02-06 19:54:15 +01:00
kaetemi
ca31e78f7c Remove georges4cvs feature 2014-02-03 01:25:02 +01:00
liria
16dbe48ed5 use NEL CFile function for file test
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 17:09:07 +01:00
liria
54c53255b1 make the programm compile on linux plateform
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 11:50:14 +01:00
kervala
43c48ad36a Changed: Enable ig_elevation everywhere (patch by Liria) 2014-01-23 13:08:11 +01:00
liria
41a475b8f3 Merged default into ig_elevaton_port_to_linux
--HG--
branch : ig_elevaton_port_to_linux
2014-01-23 00:49:56 +01:00
liria
ac48221c8b CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
--HG--
branch : ig_elevaton_port_to_linux
2014-01-22 23:49:11 +00:00
kaetemi
207d7323ce Fix Qt build on Windows 2014-01-21 12:50:23 +01:00
kervala
6196077160 Changed: #85 Compilation with STLport + EOL 2013-11-22 11:25:53 +01:00
kervala
986edb216f Fixed: #85 Compilation with STLport 2013-11-22 11:25:12 +01:00
kervala
c718ff693a Fixed: Assign instead of comparison 2013-11-22 11:20:07 +01:00
kervala
6b3b85962a Changed: EOL 2013-11-13 21:45:06 +01:00
kervala
36a537a88e Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
sfb
59abfb8a1d Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 12:58:08 -05:00
sfb
df7110d2d6 Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:31 -05:00
sfb
d86f150caa Bad merge resolution, fixed the build files that merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:02 -05:00
sfb
892ed1ed3d merge from default
--HG--
branch : gsoc2011-worldeditorqt
2013-10-23 12:08:09 -05:00
kervala
de43ea8d86 Fixed: Some warnings 2013-09-29 16:26:24 +02:00
kervala
c7899841d3 Fixed: Compilation under Linux 2013-09-28 10:18:35 +02:00
kervala
eebe74066e Changed: Include Lua headers directory for GUI Editor 2013-09-27 16:43:02 +02:00
kaetemi
85365fd7bb Fix line endings 2013-09-27 00:08:49 +02:00
kervala
c8c296f484 Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-24 21:33:59 +02:00
kervala
6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kervala
0b9092a547 Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI) 2013-09-08 12:57:34 +02:00
kervala
86dfd0350b Fixed: Integer 32 bits conversion to 64 bits pointer 2013-09-06 14:51:21 +02:00
kervala
2c7f848c83 Changed: Tabulations to spaces 2013-08-05 10:30:40 +02:00
kaetemi
78595ec0e6 Silently sneaking in a nicer splash image for ovqt 2013-07-25 02:39:07 +02:00
kaetemi
02dc3c1cfe Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 2013-07-19 15:37:25 +02:00
liria
487799cbf5 kervala's enhancements and fixes for the Windows compilation.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-09 15:55:59 +02:00
liria
6b750cf042 FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-08 16:15:41 +02:00
liria
46d99e4a6d FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows with using conditional compilation.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-08 15:38:04 +02:00
liria
99efdb2a23 FIXE: replace the WIN32 API for directories manipulation by the the POSIX API to compile with linux.
--HG--
branch : ig_elevaton_port_to_linux
2013-06-08 14:39:30 +02:00
dfighter1985
f382b97f74 Making GCC happy.
--HG--
branch : gsoc2012-gui-editor
2013-05-15 01:54:35 +02:00
dfighter1985
2faff4dfaa Inconsistent line ending style, according to VS. How it managed to do this is a mystery tho.
--HG--
branch : gsoc2012-gui-editor
2013-05-10 22:35:04 +02:00
dfighter1985
b49a6ca04d Added some defaults.
--HG--
branch : gsoc2012-gui-editor
2013-05-10 22:29:47 +02:00
dfighter1985
9042de4ab2 Make sure to apply the changes, when changing properties.
--HG--
branch : gsoc2012-gui-editor
2013-05-10 00:55:23 +02:00
dfighter1985
337f93a233 When adding a new widget, the correct widget is now instantiated. Also added some checks.
--HG--
branch : gsoc2012-gui-editor
2013-05-09 23:57:48 +02:00
dfighter1985
142bc623c9 Some more work for widget adding support. Basically the system works, just need to make sure the proper widget is instantiated, and the defaults are loaded ( so it shows up ).
--HG--
branch : gsoc2012-gui-editor
2013-05-09 05:53:14 +02:00
dfighter1985
45f5d6cc0d Added some more checks, signal and slots related to widget adding.
--HG--
branch : gsoc2012-gui-editor
2013-05-05 05:49:35 +02:00
dfighter1985
c91e7492bb Added GUI for widget adding.
--HG--
branch : gsoc2012-gui-editor
2013-05-05 04:58:15 +02:00
dfighter1985
a0af49fd40 Merged default.
--HG--
branch : gsoc2012-gui-editor
2013-05-04 22:28:31 +02:00
dfighter1985
67a24bb1b0 Merged default
--HG--
branch : gsoc2012-gui-editor
2013-05-03 02:07:38 +02:00
sfb
2bf56882f8 merge 2013-05-02 14:34:40 -05:00
sfb
8fe6eee93c fixed #40 with an explicit static_cast. 2013-05-02 14:31:10 -05:00
dfighter1985
bdfa7dbc37 Don't build GUI Editor when not building the GUI library. 2013-05-02 20:19:35 +02:00
dfighter1985
df834e0584 FIXED: Widgets will no longer get stuck in the widget hierarchy tree, when deleting their parent.
--HG--
branch : gsoc2012-gui-editor
2013-03-09 22:02:31 +01:00
dfighter1985
660fb00895 MODIFIED: Widgets derived from CInterfaceGroup should now be deleted too properly.
--HG--
branch : gsoc2012-gui-editor
2013-03-08 06:07:21 +01:00
dfighter1985
532a3ef7d3 MODIFIED: collapse the widget hierarchy tree and remove the widget from it when it's deleted. Also clear the widget properties panel.
--HG--
branch : gsoc2012-gui-editor
2013-03-03 03:49:56 +01:00