Commit graph

844 commits

Author SHA1 Message Date
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
dfighter1985
026ccfcd13 MODIFIED: GUI Editor can now delete widgets.
--HG--
branch : gsoc2012-gui-editor
2013-03-02 06:57:40 +01:00
dfighter1985
29ef7af61a MODIFIED: When selecting a widget in the central widget, the hierarchy tree should now be updated as well.
--HG--
branch : gsoc2012-gui-editor
2013-03-02 03:24:22 +01:00
dfighter1985
365ef61ec9 MODIFIED: Update property browser when selecting in the central widget.
--HG--
branch : gsoc2012-gui-editor
2013-02-23 06:55:19 +01:00
dfighter1985
fe456d91b6 GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 2013-02-20 22:05:09 +01:00
dfighter1985
ea8d82cfa6 MODIFIED: #20 Resolved build errors with stlport. 2013-02-19 19:29:48 +01:00
dfighter1985
f7962597bd MODIFIED: #20 Resolved some GCC build in the GUI Editor. 2013-02-19 17:16:58 +01:00
mattraykowski
e7e51f01e0 merging gui editor repo. 2013-02-14 09:53:06 -06:00
dfighter1985
fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 10:47:10 +01:00
kervala
4f8b62acb4 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:35:51 +01:00
kervala
e53d42ea0e Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:07:38 +01:00
kervala
fc0f58e99b Changed: Typo fixes (Thanks to DuDraig!) 2013-02-11 22:34:24 +01:00
kervala
671827225d Changed: French comments translated to English 2013-02-11 22:24:48 +01:00
kervala
6e498aefad Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
mattraykowski
032ff53d38 merge from default
--HG--
branch : branch-features-geqt-plugin
2013-01-30 10:15:14 -06:00
mattraykowski
af14e1e591 merge, fixed inconsistent newlines 2013-01-30 09:57:53 -06:00
dnk-88
d301e9ac67 Change: Optimized placement source files in object viewer qt 2013-01-06 16:25:28 +03:00
dnk-88
d62b9db23c Change: Fixed incorrect behavior scroll of 2d view in landscape editor qt
--HG--
branch : gsoc2011-worldeditorqt
2012-12-15 00:41:29 +03:00
kervala
4a63d4556a Fixed: PCH for Object Viewer plugin 2012-12-08 13:11:17 +01:00
kervala
21b784cc84 Changed: Methods constification 2012-12-08 11:27:18 +01:00
kervala
80d16e39eb Changed: Add Qt headers in PCH for speed improvement 2012-12-08 11:25:21 +01:00
kervala
0cabe14089 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
d1dfe4eb62 Added: PCH for Georges Editor Plugin 2012-12-08 11:22:05 +01:00
kervala
d9e75b1e03 Changed: Compilation with GCC 2012-12-08 11:18:26 +01:00
dfighter1985
a98b99865e MODIFIED: #1471 Forgot to remove parents' properties before saving the node properties.
--HG--
branch : gsoc2012-gui-editor
2012-12-02 19:47:12 +01:00
dfighter1985
e376bed8f1 MODIFIED: #1471 We should be able to close the application even when there's no loaded project.
--HG--
branch : gsoc2012-gui-editor
2012-12-02 18:17:39 +01:00
kervala
d890af5175 Changed: Applied Kaetemi patch to disable old S3TC library mistakes 2012-12-02 10:20:19 +01:00
dfighter1985
cb13ce46cd MODIFIED: #1471 Merged mainline default to this branch.
--HG--
branch : gsoc2012-gui-editor
2012-11-25 05:22:40 +01:00
kervala
9ceb9e7d81 Fixed: Wrong EOL 2012-11-24 18:38:56 +01:00
dfighter1985
3bcbcd45e7 MODIFIED: #1471 Exiting OVQT will now work again properly.
--HG--
branch : gsoc2012-gui-editor
2012-11-22 21:22:28 +01:00
dfighter1985
514536f0ff MODIFIED: #1471 There shouldn't be an error message when clicking cancel in the open file dialog.
--HG--
branch : gsoc2012-gui-editor
2012-11-21 23:36:07 +01:00
dfighter1985
7cad2331e7 MODIFIED: #1471 Widget template changes can now be saved.
--HG--
branch : gsoc2012-gui-editor
2012-11-21 21:33:08 +01:00
dfighter1985
6e1254b612 MODIFIED: #1471 Oups, forgot these warning messages...
--HG--
branch : gsoc2012-gui-editor
2012-11-20 04:54:09 +01:00
dfighter1985
c87cc27ae3 MODIFIED: #1471 Adding new widget now works in the widget property dialog.
--HG--
branch : gsoc2012-gui-editor
2012-11-20 04:50:51 +01:00
dfighter1985
4a9fb9e013 MODIFIED: #1471 Adding new property now works.
--HG--
branch : gsoc2012-gui-editor
2012-11-19 21:06:26 +01:00
dfighter1985
3c854dc1e2 CHANGED: #1471 Removing widget properties from the widget properties dialog will now work.
--HG--
branch : gsoc2012-gui-editor
2012-11-18 02:20:52 +01:00
dfighter1985
f31af3d95b CHANGED: #1471 Removing widgets from the widget properties dialog will now work.
--HG--
branch : gsoc2012-gui-editor
2012-11-17 20:13:29 +01:00
dfighter1985
2cebadaa79 CHANGED: #1471 Widget property templates are now stored in a tree. Also added some new controls to the widget property dialog.
--HG--
branch : gsoc2012-gui-editor
2012-11-17 04:55:12 +01:00
dnk-88
602ca06998 Changed: Fixed crash land editor qt
--HG--
branch : gsoc2011-worldeditorqt
2012-11-11 13:33:43 +03:00
kervala
eb6ccdaad8 Fixed: MFC tools compilation with STLport 2012-10-28 13:41:50 +01:00
kervala
a3376d32a4 fixes #3 allow Qt without STLport to link to NeL with STLport 2012-10-28 13:34:58 +01:00
kervala
34bf41082f Fixed: Compilation with 64 bits MFC 2012-10-28 12:22:30 +01:00
kervala
b7be696848 Move all PACS headers in nel/include/pacs directory (fixes #2) 2012-10-28 11:55:21 +01:00
mattraykowski
a45cf415c3 Changed: if-statements for context menu selection - no logic
--HG--
branch : branch-features-geqt-plugin
2012-10-21 13:58:44 -07:00
mattraykowski
c5cafc7acc Changed: Enabled custom context menu signal to open a menu at the mouse position.
--HG--
branch : branch-features-geqt-plugin
2012-10-21 13:48:02 -07:00
sfb
f7ffb4b865 GEQt Plugin: Starting to add the context menu back.
--HG--
branch : branch-features-geqt-plugin
2012-10-18 20:56:31 -05:00
sfb
6560f0c473 Changed: #1306 Fixed index bug with form array rename.
--HG--
branch : branch-features-geqt-plugin
2012-09-28 09:50:44 -05:00
sfb
cc5e8c043e Changed: #1306 Moved creation of undo command for form array renames to the model.
--HG--
branch : branch-features-geqt-plugin
2012-09-28 07:33:51 -05:00
kervala
6c1f14778e Changed: #825 Remove all warnings when compiling Ryzom 2012-09-27 22:25:00 +02:00
kervala
6c0bd82c2a Changed: Use *_PREFIX instead of fixed values with INSTALL 2012-09-27 22:11:26 +02:00
sfb
c770c7ac78 Added: #1306 Added undo/redo action for renaming array entry names
--HG--
branch : branch-features-geqt-plugin
2012-09-27 08:22:50 -05:00
kervala
f7ee271a8f Changed: Use RYZOM_SHARE_PREFIX as prefix to look for leveldesign data 2012-09-26 12:53:03 +02:00
kervala
cb12a7546a Changed: #1254 Error while compiling with current stable squish 2012-09-25 13:20:37 +02:00
kervala
1374286cab Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 13:20:25 +02:00
kervala
0795a61516 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
kervala
fc8c26ff9f Fixed: #1254 Error while compiling with current stable squish 2012-09-25 12:19:13 +02:00
kervala
0d4f383a7f Changed: Plugins specs and plugins installation 2012-09-24 14:02:33 +02:00
kervala
ddd33c6090 Fixed: OVQT plugins loading under Unices (in the order: local, OVQT plugins, system) 2012-09-24 09:52:35 +02:00
kervala
541a147d34 Changed: Homogeneous carriage returns 2012-09-24 09:49:52 +02:00
kervala
476377dd88 Changed: Fixed plugins specs name to install 2012-09-24 08:56:49 +02:00
kervala
2028034214 Changed: Install plugins specs in ${NL_SHARE_PREFIX}/object_viewer_qt/plugins under Linux 2012-09-24 08:25:47 +02:00
kervala
8d9c96a97a Changed: Use "lib" prefix under unices for plugins 2012-09-23 23:58:03 +02:00
kervala
8ab293a6ec Changed: #1493 Fixed some directories 2012-09-22 23:42:40 +02:00
kervala
7a04e920e1 Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
sfb
a42a58590e Changed: #1306 Radically changed the plugin in a new branch to match the way classic GE loads forms.
- Refactored the tree view to show only structs, arrays, vstructs and eliminated atoms from its view.
- Refactored the form view to have a Qt Properties Browser
- Refactored the loader to use the classic GE addStruct/addArray.
- Moved some functionality into CFormItem.
- Added icons from classic GE and configured model/item to return them appropriately.
- Getting read for changes via undo commands.
- Eliminating/ignoring the hold/slots business from classic GE code.

--HG--
branch : branch-features-geqt-plugin
2012-09-20 16:39:21 -05:00
kervala
3f764df03e Added: shape2obj project to convert NeL .shape to standard .obj file format 2012-09-19 19:38:37 +02:00
sfb
df07598a45 merging legacy dfn-based method into geqt. Warning: broke the build.
--HG--
branch : branch-features-geqt-plugin
2012-09-17 15:12:01 -05:00
kervala
f61d6c9ae2 Changed: Updated some object_viewer_qt french translations 2012-09-11 20:17:16 +02:00
dnk-88
068b9bf7bb Changed: #1302 Polish code of property editor
--HG--
branch : gsoc2011-worldeditorqt
2012-09-02 15:27:31 +03:00
dfighter1985
63370056f0 CHANGED: #1471 GUI Editor can now be linked without manually supplying the libraries.
--HG--
branch : gsoc2012-gui-editor
2012-08-20 04:50:19 +02:00
dfighter1985
efc9890e08 CHANGED: #1471 Serialize links that belong to the root group too. Also deactivate the active group when serializing.
--HG--
branch : gsoc2012-gui-editor
2012-08-20 03:34:09 +02:00
dfighter1985
7bfecaad4b CHANGED: #1471 Need to serialize root group first, otherwise client crashes when loading the pointer settings.
--HG--
branch : gsoc2012-gui-editor
2012-08-19 03:13:16 +02:00
dfighter1985
a0559ee680 CHANGED: #1471 Keys are now parsed from the config files, and then serialized on save.
--HG--
branch : gsoc2012-gui-editor
2012-08-18 20:28:56 +02:00
dfighter1985
c532f23ac1 CHANGED: #1471 Pointer settings are now parsed even when the particular pointer cannot be instantiated. They are also serialized when serializing the GUI.
--HG--
branch : gsoc2012-gui-editor
2012-08-18 18:39:45 +02:00
dfighter1985
0d4c4cd56d CHANGED: #1471 Should be able to change text options for CCtrlTextButton.
--HG--
branch : gsoc2012-gui-editor
2012-08-18 03:37:52 +02:00
dfighter1985
91368514b6 CHANGED: #1471 GUI Procedures are now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-17 21:49:54 +02:00
dfighter1985
4ae34c1844 CHANGED: #1471 Variables are now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-17 06:10:18 +02:00
dfighter1985
503b9c4234 CHANGED: #1471 Tree/node data is now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-17 04:37:07 +02:00
dfighter1985
180f86694d CHANGED: #1471 interface options are now serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-16 00:45:19 +02:00
dfighter1985
bffa5806ca CHANGED: #1471 CCtrlScroll fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-11 19:22:55 +02:00
dfighter1985
190a048641 CHANGED: #1471 Apparently the *root* group needed to be serializes separately, otherwise the parser cannot read it back.
--HG--
branch : gsoc2012-gui-editor
2012-08-10 17:10:01 +02:00
dfighter1985
50c2f4a41b CHANGED: #1471 CCtrlBase fields can now be serialized.
--HG--
branch : gsoc2012-gui-editor
2012-08-10 02:43:01 +02:00
dfighter1985
4c43870a47 ADDED: #1471 CWidgetSerializer class, that serializes the widgets into a single XML file. Also CInterfaceElement fields can now be serializes.
--HG--
branch : gsoc2012-gui-editor
2012-08-10 01:21:20 +02:00
dfighter1985
498a1a2ef1 CHANGED: #1471 Partially implemented save-as(only the project file is saved for now )
--HG--
branch : gsoc2012-gui-editor
2012-08-09 01:48:51 +02:00
dfighter1985
f10ef64bee ADDED: #1471 CProjectFileSerializer class, and also it's possible to save the project file changes now.
--HG--
branch : gsoc2012-gui-editor
2012-08-09 01:24:37 +02:00