Commit graph

3963 commits

Author SHA1 Message Date
dfighter1985
28c30b70f1 Set the undostack so we won't crash...
--HG--
branch : gsoc2014-dfighter
2014-07-15 21:46:16 +02:00
dfighter1985
d30e9ad226 Initialize the undostack to NULL, so we get a proper crash instead of a dangled pointer crash.
--HG--
branch : gsoc2014-dfighter
2014-07-15 21:41:11 +02:00
dfighter1985
63b6a03f85 Fixed another crash.
--HG--
branch : gsoc2014-dfighter
2014-07-15 20:29:57 +02:00
dfighter1985
1cbcca259c 'Fixed' the Mission Compiler crash.
--HG--
branch : gsoc2014-dfighter
2014-07-15 20:19:53 +02:00
dfighter1985
56a4c3ea7d When changing a property make sure to set default to false, so it's actually saved!
--HG--
branch : gsoc2014-dfighter
2014-07-15 18:51:06 +02:00
kaetemi
ca4c302c6a Disable WG specifics in r2_login script 2014-07-15 15:25:09 +02:00
dfighter1985
61b8a4ef82 Save world editor files.
--HG--
branch : gsoc2014-dfighter
2014-07-15 01:30:30 +02:00
kaetemi
3f5eedf040 Restructure web. IMPORTANT! This moves all web files to a new central directory. Update your configuration if necessary 2014-07-14 20:27:46 +02:00
kaetemi
aca4d8e48b One set of SQL scripts to rule them all 2014-07-14 19:15:23 +02:00
dfighter1985
2d865a8567 Trying to load an invalid world editor file shouldn't crash the application, and an error messagebox should inform the user.
--HG--
branch : gsoc2014-dfighter
2014-07-13 21:38:14 +02:00
dfighter1985
3517283526 Apply property changes.
--HG--
branch : gsoc2014-dfighter
2014-07-12 01:54:45 +02:00
dfighter1985
3ad5ffee15 Block only the propertychanged signal in the const_string_array property manager.
--HG--
branch : gsoc2014-dfighter
2014-07-12 00:38:35 +02:00
dfighter1985
8f8b4fae65 Store QtProperty, IPrimitive pairs and look the primitive up when the property changes.
--HG--
branch : gsoc2014-dfighter
2014-07-12 00:01:17 +02:00
dfighter1985
820b6bc8ca Changed property to p, property is a reserved word in VS.
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:47:24 +02:00
dfighter1985
aa82655ee7 Use \n instead of ; as a separator.
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:41:15 +02:00
dfighter1985
8ff5317f01 Identation
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:37:32 +02:00
dfighter1985
a222e44eaa Implemented const_string_array editor.
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:35:05 +02:00
dfighter1985
094210a079 Workaround related to the unknown statusbar crash.
--HG--
branch : gsoc2014-dfighter
2014-07-09 23:20:50 +02:00
dfighter1985
d850a07e9e Copyright banner + line endings... I always mess this up somehow..
--HG--
branch : gsoc2014-dfighter
2014-07-09 21:13:57 +02:00
dfighter1985
012ad96806 Texture chooser now supports atlas textures as well.
--HG--
branch : gsoc2014-dfighter
2014-07-09 21:07:12 +02:00
kaetemi
e729a9d035 Fix : Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
kaetemi
246d931bee Formatting: Use tabs 2014-07-09 16:59:55 +02:00
KISHAN GRIMOUT
107646d95d fix windows 64bit build in mem_displayer.cpp 2014-07-09 13:41:43 +02:00
dfighter1985
a1b0f9d7e2 Added texture property editor, editor factory, manager. Textures can now be selected using these in the property tree browser.
--HG--
branch : gsoc2014-dfighter
2014-07-08 18:59:30 +02:00
dfighter1985
7cbc82fe8f Added action property editor, editor factory, manager. Actions can now be edited using the editor widget in the property tree.
--HG--
branch : gsoc2014-dfighter
2014-07-08 18:26:20 +02:00
dfighter1985
396a3c2db2 Allow TextureChooser's texture selection to be queried.
--HG--
branch : gsoc2014-dfighter
2014-07-07 19:19:03 +02:00
dfighter1985
fe58435bb5 CPath can now return the file list with a path filter.
--HG--
branch : gsoc2014-dfighter
2014-07-06 23:21:25 +02:00
dfighter1985
6119f2c480 Make sure to always convert to plain bitmap.
--HG--
branch : gsoc2014-dfighter
2014-07-05 03:31:21 +02:00
dfighter1985
1dee9d232b No need to store the loaded image data after passing it to the label.
--HG--
branch : gsoc2014-dfighter
2014-07-05 03:13:01 +02:00
dfighter1985
1e6dc1cc37 Prototype of the texture chooser.
--HG--
branch : gsoc2014-dfighter
2014-07-05 02:55:46 +02:00
dfighter1985
e4e2a57b65 ActionList dialog can now select an action, and is used with the proc editor.
--HG--
branch : gsoc2014-dfighter
2014-07-03 00:44:38 +02:00
dfighter1985
085c1b41b9 Added facilities for viewing the loaded actions.
--HG--
branch : gsoc2014-dfighter
2014-07-02 22:27:04 +02:00
dfighter1985
0d9022226c Line endings...
--HG--
branch : gsoc2014-dfighter
2014-07-02 20:44:46 +02:00
dfighter1985
471c3a0dc5 Changed some property types.
--HG--
branch : gsoc2014-dfighter
2014-07-01 01:54:55 +02:00
dfighter1985
c6312db222 Bitmap alignment can now be set as an enum.
--HG--
branch : gsoc2014-dfighter
2014-07-01 01:51:41 +02:00
dfighter1985
27fe95904a Quelled some compiler compliants.
--HG--
branch : gsoc2014-dfighter
2014-06-29 03:01:43 +02:00
dfighter1985
7f5973e462 tooltip parent is now changable using an enum.
--HG--
branch : gsoc2014-dfighter
2014-06-29 02:53:33 +02:00
dfighter1985
842ca366de Tooltip posrefs are now enums in the GUI Editor.
--HG--
branch : gsoc2014-dfighter
2014-06-29 01:44:06 +02:00
dfighter1985
809fcab9e2 Forgot the widget settings...
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:49:31 +02:00
dfighter1985
b88e53c685 Got rid of a memleak.
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:47:29 +02:00
dfighter1985
0c4e0e63cc The proper enum type is now determined by type not name.
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:24:31 +02:00
dfighter1985
e182e25e07 text posref is now an enum too.
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:07:44 +02:00
dfighter1985
ec86d0381b Some refactoring.
--HG--
branch : gsoc2014-dfighter
2014-06-21 22:55:10 +02:00
kaetemi
e8f7851dd2 Fix compile 2014-06-21 22:32:49 +02:00
dfighter1985
250cd6efc1 Posref can now be set as an enum, instead of a string in the property editor.
--HG--
branch : gsoc2014-dfighter
2014-06-21 18:25:14 +02:00
kaetemi
353c74ff21 Don't enforce native fragment programs on modern hardware. Fixes water for the open source ATI/AMD driver, which reports fragment programs as not native (as they are translated to modern hardware). 2014-06-21 06:41:14 +02:00
kaetemi
5cb8a7700e Exit with error 2014-06-21 05:46:20 +02:00
kaetemi
cf3e779ae9 Fix compile 2014-06-20 23:38:44 +02:00
kaetemi
655c22e839 Fix compile 2014-06-20 23:24:54 +02:00
kaetemi
5312547295 Add option for -mfpmath=both flag 2014-06-20 19:46:33 +02:00
kaetemi
ed5721a79b Add SSE3 compile flag if enabled 2014-06-20 18:51:34 +02:00
kaetemi
07dd9eb85b Compile fix 2014-06-20 17:53:38 +02:00
dfighter1985
1afe2d4a17 Text justification can now be set using an enum property editor.
--HG--
branch : gsoc2014-dfighter
2014-06-20 17:07:27 +02:00
dfighter1985
9e36082ff0 A little refactoring
--HG--
branch : gsoc2014-dfighter
2014-06-20 16:26:10 +02:00
dfighter1985
25df3c8afe Button types can now be set using an enum property editor.
--HG--
branch : gsoc2014-dfighter
2014-06-20 16:22:07 +02:00
dfighter1985
49002d0250 Line endings...
--HG--
branch : gsoc2014-dfighter
2014-06-20 15:09:13 +02:00
kaetemi
43a061bebd SSE2: Compile fix
--HG--
branch : sse2
2014-06-20 03:08:51 +02:00
dfighter1985
1ce333bb00 As Object Viewer no longer uses the QtOpenGL widget this is not needed.
--HG--
branch : gsoc2014-dfighter
2014-06-19 18:40:50 +02:00
dfighter1985
bb7fa7987b More widgets can use the color picker now.
--HG--
branch : gsoc2014-dfighter
2014-06-19 17:21:11 +02:00
dfighter1985
f1ff5e7d2c Added color picking support to the GUI Editor. TODO: change all the widget definitions.
--HG--
branch : gsoc2014-dfighter
2014-06-18 16:48:33 +02:00
dfighter1985
0a26a5a1c6 Why did I make these public in the first place?
--HG--
branch : gsoc2014-dfighter
2014-06-18 02:53:39 +02:00
dfighter1985
d64b499284 Making master Dnk happy.
--HG--
branch : gsoc2014-dfighter
2014-06-18 02:51:53 +02:00
dfighter1985
3d48a01170 Wrong slash...
--HG--
branch : gsoc2014-dfighter
2014-06-18 02:41:58 +02:00
dfighter1985
a80053083d Crashfix: If the status info widget isn't removed it miraclously crashes the app on shutdown. TODO: investigate why.
--HG--
branch : gsoc2014-dfighter
2014-06-18 01:20:37 +02:00
dfighter1985
4341ac3139 Unload plugins when killing them.
--HG--
branch : gsoc2014-dfighter
2014-06-18 01:15:39 +02:00
dfighter1985
ca78ce10a0 Object Viewer plugin will now use the Nel3DWidget in the Core plugin.
--HG--
branch : gsoc2014-dfighter
2014-06-16 16:22:52 +02:00
dfighter1985
d74d1d1663 Had to move the Nel3DWidget library to the core plugin, because Nel can only be used statically at this point. Which makes using the separate Nel3DWidget library inparctical.
--HG--
branch : gsoc2014-dfighter
2014-06-16 15:30:35 +02:00
dfighter1985
b4eac44a9d Moved the Nel 3d widget into it's own library.
--HG--
branch : gsoc2014-dfighter
2014-06-15 22:22:01 +02:00
dfighter1985
dde63ceb31 Nel3DWidget is no longer in the GUI Editor namespace.
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:52:04 +02:00
dfighter1985
81908eea01 Set some windows attributes.
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:42:41 +02:00
dfighter1985
e5921ffd64 Activate the driver when getting a show event, and clear the GUI Editor display widget when there's no GUI loaded.
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:28:57 +02:00
dfighter1985
f8505429ee Moved the event listener from the 3d widget to the gui control class.
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:16:52 +02:00
dfighter1985
3cbe37d700 Fixed build error that was caused by two widgets having the same filenames.
--HG--
branch : gsoc2014-dfighter
2014-06-15 18:41:54 +02:00
dfighter1985
59b4735d96 Renamed nelgui_widget.* to nelgui_ctrl.*
--HG--
branch : gsoc2014-dfighter
2014-06-14 19:37:42 +02:00
dfighter1985
676587559b Renamed NelGUIWidget to NelGUICtrl, and changed it's base class from QWidget to QObject.
--HG--
branch : gsoc2014-dfighter
2014-06-14 18:44:57 +02:00
dfighter1985
1457469dfe TimerId should be set to 0 when hiding.
--HG--
branch : gsoc2014-dfighter
2014-06-14 18:32:27 +02:00
dfighter1985
9d9cd463b0 GUI Editor main window will now send the show/hide events to NelGUIWidget.
--HG--
branch : gsoc2014-dfighter
2014-06-14 18:31:50 +02:00
dfighter1985
c692b168d7 Split Nel3DWidget and NelGUIWidget.
--HG--
branch : gsoc2014-dfighter
2014-06-14 17:28:33 +02:00
kaetemi
cec2970169 SSE2: Replace prefetch
--HG--
branch : sse2
2014-06-14 01:09:05 +02:00
kaetemi
6734852fa3 SSE2: Ensure correct allocator is used
--HG--
branch : sse2
2014-06-14 00:38:35 +02:00
kaetemi
71a598db7e SSE2: Remove dead code
--HG--
branch : sse2
2014-06-13 22:21:07 +02:00
kaetemi
848932f93a SSE2: Fix for MinGW
--HG--
branch : sse2
2014-06-19 00:05:43 +02:00
kaetemi
ac3e69b8ab Merge with default
--HG--
branch : sse2
2014-06-20 03:01:32 +02:00
kaetemi
93e97c56cd Implement occlusion queries for AMD/ATI in the OpenGL driver 2014-06-19 21:49:33 +02:00
kaetemi
66922f04bd Fix Ryzom server compile under MinGW 2014-06-19 20:43:03 +02:00
kaetemi
fd6a95e3a3 Backed out changeset: f665fcc42968 (except dru.cpp) 2014-06-19 20:22:12 +02:00
kaetemi
b18203fc4e Fix Ryzom server compile under MinGW 2014-06-19 20:19:39 +02:00
kaetemi
2e096a9b36 Fix Ryzom client compile under MinGW 2014-06-19 01:17:35 +02:00
kaetemi
7adf98e8a7 Fix NeL GUI compile under MinGW 2014-06-19 00:40:29 +02:00
kaetemi
cffd68230c Fix XA2 driver compile under MinGW 2014-06-18 23:18:06 +02:00
kaetemi
401d4bc791 Fix NeL Tools compile under MinGW 2014-06-18 21:05:39 +02:00
kaetemi
43be0fd2a5 Fix D3D driver compile under MinGW 2014-06-18 16:29:02 +02:00
kaetemi
40854aa5f3 Fix NeLNS compile under MinGW 2014-06-18 13:03:11 +02:00
kaetemi
75f7b9f931 Fix Snowballs service compile under MinGW 2014-06-18 12:52:03 +02:00
kaetemi
ee4a9ef334 Fix NeL Samples for MinGW 2014-06-18 12:40:53 +02:00
kaetemi
9838ef56de Fix Snowballs compile under MinGW 2014-06-18 02:05:54 +02:00
kaetemi
f4fd8bb669 Fix linking of OpenGL driver under MinGW 2014-06-18 01:21:05 +02:00
kaetemi
2f3f12e034 Fix linking of OpenAL driver under MinGW 2014-06-18 00:28:08 +02:00
kaetemi
5bd6c5e06b Fix compilation of NL3D under MinGW 2014-06-17 22:33:56 +02:00
kaetemi
1df9bec563 Fix compilation of NLNET under MinGW 2014-06-17 21:56:53 +02:00
kaetemi
3dd11fe157 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
f6ad306a57 SSE2: Add macro for force inline
--HG--
branch : sse2
2014-06-13 20:25:45 +02:00
kaetemi
d3fb390cf3 SSE2: Align CMatrix
--HG--
branch : sse2
2014-06-13 19:33:09 +02:00
kaetemi
556a41afee SSE2: Implement alignment for arena allocator
--HG--
branch : sse2
2014-06-13 19:26:22 +02:00
kaetemi
eee9ba0cae SSE2: Add aligned allocators
--HG--
branch : sse2
2014-06-13 19:12:31 +02:00
kaetemi
4ed37ac68e SSE2: Add CMake options
--HG--
branch : sse2
2014-06-13 19:00:24 +02:00
dfighter1985
fe7c3e4edf Rename log menu item.
--HG--
branch : gsoc2014-dfighter
2014-06-09 18:01:14 +02:00
dfighter1985
92cb5eea3a Updated qrc location.
--HG--
branch : gsoc2014-dfighter
2014-06-09 17:58:07 +02:00
dfighter1985
a86605f8d8 Move the log trigger menu item into it's own menu, and remove the menu when unloading the plugin.
--HG--
branch : gsoc2014-dfighter
2014-06-09 17:55:45 +02:00
dfighter1985
d4ee31ed63 Destroy context when unloading plugins.
--HG--
branch : gsoc2014-dfighter
2014-06-09 17:40:06 +02:00
dfighter1985
f060adbed7 Plugin loading, with issues..
--HG--
branch : gsoc2014-dfighter
2014-06-09 01:14:13 +02:00
dfighter1985
c45b6a17f4 Don't crash when removing the plugin of the first tab.
--HG--
branch : gsoc2014-dfighter
2014-06-08 21:56:31 +02:00
dfighter1985
0096ad1204 Remove Object Viewer menus when unloading the plugin.
--HG--
branch : gsoc2014-dfighter
2014-06-08 19:39:58 +02:00
dfighter1985
9ad71881dc Line endings...
--HG--
branch : gsoc2014-dfighter
2014-06-08 19:28:19 +02:00
dfighter1985
b9bbe802d4 Remove display sheet id action when unloading the plugin.
--HG--
branch : gsoc2014-dfighter
2014-06-08 19:27:03 +02:00
dfighter1985
3fc289e7fa Remove sheet builder action when unloading the plugin.
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:56:40 +02:00
dfighter1985
828f31a2a4 Remove translation manager menu when unloading the plugin.
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:45:13 +02:00
dfighter1985
fb4dc15fe7 Remove GUI Editor menu when unloading the plugin.
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:30:09 +02:00
dfighter1985
d7536332a6 Implemented plugin unload.
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:17:24 +02:00
dfighter1985
eb41278369 GUI for plugin loading / unloading in the plugin dialog.
--HG--
branch : gsoc2014-dfighter
2014-06-07 21:07:46 +02:00
dfighter1985
732b24b985 Updated qrc location.
--HG--
branch : gsoc2014-dfighter
2014-06-07 20:04:15 +02:00
dfighter1985
c2a951fd6c Progressbar should look nicer on the splash screen now.
--HG--
branch : gsoc2014-dfighter
2014-06-07 18:10:43 +02:00
dfighter1985
f0a312a6e5 Progress bar will now actually show progress.
--HG--
branch : gsoc2014-dfighter
2014-06-07 17:23:06 +02:00
dfighter1985
f177a49a9e Instead of drawing the progressbar on the splash image, draw it below it. Also move the status text closer to the progress bar.
--HG--
branch : gsoc2014-dfighter
2014-06-07 16:56:10 +02:00
dfighter1985
2ce11cc2f9 Line endings...
--HG--
branch : gsoc2014-dfighter
2014-06-07 16:41:39 +02:00
kaetemi
15dc492690 Set additional preferred memory 2014-06-05 15:51:25 +02:00
kaetemi
ad0bf64b18 Cleanup extension initialization 2014-06-05 15:03:09 +02:00
dfighter1985
91463f9fa2 The splash screen will now inform the user about what's happening.
--HG--
branch : gsoc2014-dfighter
2014-06-05 01:57:13 +02:00
dfighter1985
cfa12b6d81 Somehow I always forget the banners...
--HG--
branch : gsoc2014-dfighter
2014-06-04 22:30:32 +02:00
dfighter1985
c15eebaadf First iteration of the new splash screen.
--HG--
branch : gsoc2014-dfighter
2014-06-04 22:09:11 +02:00
kaetemi
766cace955 Implement volatile vertex buffer for opengl driver, should provide considerable performance improvements for particle systems. Needs additional testing. 2014-06-04 18:59:54 +02:00
dfighter1985
1d23a092c1 rename.
--HG--
branch : gsoc2014-dfighter
2014-05-26 21:07:39 +02:00
dfighter1985
883c0d4462 Settings dialog on first startup.
--HG--
branch : gsoc2014-dfighter
2014-05-26 21:04:05 +02:00
dfighter1985
1306853697 More renames.
--HG--
branch : gsoc2014-dfighter
2014-05-25 22:45:34 +02:00
kaetemi
0d67c420cd Set exec mode 2014-05-23 22:39:50 +02:00
kaetemi
1f786418a7 Crash safely with an error when sphrase is missing on client 2014-05-23 19:13:36 +02:00
kaetemi
47e5e587ad Use vector instead of map to store sbrick sheets, it's faster 2014-05-23 19:13:08 +02:00
kaetemi
4311da091f Add --admininstall parameter to c1_shard_patch 2014-05-23 17:25:52 +02:00
dfighter1985
4adbb6dbd9 Moved plugin menu items to their own sub-menu into the menubar.
--HG--
branch : gsoc2014-dfighter
2014-05-23 02:26:31 +02:00
kaetemi
0a41e6b3c4 Fix Windows compilation of lightmap_optimizer 2014-05-23 01:57:19 +02:00
dfighter1985
79348c8e93 More renames.
--HG--
branch : gsoc2014-dfighter
2014-05-22 15:56:38 +02:00
dfighter1985
ef7a39641f Rename.
--HG--
branch : gsoc2014-dfighter
2014-05-22 15:06:40 +02:00
dfighter1985
eeb4e48d38 Renames.
--HG--
branch : gsoc2014-dfighter
2014-05-19 02:08:03 +02:00
dfighter1985
0974142bcc Renamed the plugin XML files.
--HG--
branch : gsoc2014-dfighter
2014-05-19 01:45:19 +02:00
dfighter1985
3440c7081b Renamed ovqt and ovqt plugin binaries.
--HG--
branch : gsoc2014-dfighter
2014-05-18 21:47:31 +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
12890373a4 Merged default
--HG--
branch : gsoc2014-dfighter
2014-05-14 18:01:15 +02:00
kervala
46e5c39e74 Changed: Replaced some spaces by tabulations 2014-05-13 09:29:45 +02:00
botanic
b57755b9ee Fix for bug from de6f606 2014-05-10 09:15:00 -07:00
kervala
d7c9608d83 Fixed: Compilation error 2014-05-09 19:18:56 +02:00