Botanic
d0d69d7c77
Make it so that bad text always throws a nlwarning
2013-08-04 01:43:54 -07:00
kaetemi
71cdf88b81
Fix warning
...
--HG--
branch : multipass-stereo
2013-08-03 21:29:47 +02:00
kaetemi
96b2df8405
Merge with default
...
--HG--
branch : multipass-stereo
2013-08-01 23:02:49 +02:00
kaetemi
53bebec880
Add some basic prediction to CCDBNodeBranch::find
...
--HG--
branch : kaetemi-optimize
2013-08-01 22:47:46 +02:00
kaetemi
3bc5d88d78
Force link
2013-08-01 10:11:11 +02:00
Quitta
eba12f770f
Merge with default
...
--HG--
branch : quitta-gsoc-2013
2013-07-31 16:26:22 +02:00
Quitta
e8db641b47
Merge with default
...
--HG--
branch : quitta-gsoc-2013
2013-07-31 16:17:29 +02:00
Quitta
12baee2fcf
fix for getting client working + possibly auto login for ingame part
...
--HG--
branch : quitta-gsoc-2013
2013-07-30 01:46:56 +02:00
kaetemi
1c3fbf0256
Improve performance of UsedTexture debugging info in OpenGL driver
...
--HG--
branch : kaetemi-optimize
2013-07-29 03:41:10 +02:00
kaetemi
64335ae0b8
NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked
2013-07-28 21:39:54 +02:00
kaetemi
5a9537dfcc
Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets
...
--HG--
branch : kaetemi-optimize
2013-07-28 05:10:07 +02:00
kaetemi
7bb8dec40c
Parse action handler condition for interface link in advance
...
--HG--
branch : kaetemi-optimize
2013-07-28 03:02:07 +02:00
kaetemi
d5308215aa
Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager
...
--HG--
branch : kaetemi-optimize
2013-07-28 00:48:34 +02:00
kaetemi
5ad6373f61
Build ligo outside the database
...
--HG--
branch : build_pipeline_py
2013-07-27 04:03:05 +02:00
kaetemi
f6ee2707ea
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-25 21:18:52 +02:00
kaetemi
78595ec0e6
Silently sneaking in a nicer splash image for ovqt
2013-07-25 02:39:07 +02:00
kaetemi
1e9771d054
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-25 00:37:00 +02:00
kaetemi
e435a07bb6
Fix bug #45 crash in zone lighter with large number of CPU cores
2013-07-24 20:51:43 +02:00
kaetemi
e9c274c135
Use tags for pacs prim export
2013-07-24 20:51:38 +02:00
kervala
aeddda3e19
Fixed: lua_open() doesn't exist with Lua 5.2
2013-07-24 18:47:50 +02:00
kervala
296b4384a8
Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange)
2013-07-24 18:47:04 +02:00
kaetemi
662b75f87a
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-19 15:38:49 +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
kaetemi
f280f4673f
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-19 14:10:07 +02:00
kaetemi
53e11d0d68
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-18 23:05:25 +02:00
kaetemi
9f185ce38d
Fix an error in 3ds Max with the material script
2013-07-18 18:15:53 +02:00
Michael Witrant
293601e80e
Fixed definition tests for optional LibOVR
...
--HG--
branch : multipass-stereo
2013-07-06 20:40:42 +02:00
Michael Witrant
a33a0e5c56
LibOVR is optional, and is disabled by default
...
--HG--
branch : multipass-stereo
2013-07-06 20:05:19 +02:00
Michael Witrant
c60bd3e3f5
Added LibOVR finder and Linux support, ref #43
...
--HG--
branch : multipass-stereo
2013-07-06 19:33:07 +02:00
kaetemi
eab2386ff6
Don't render to texture when in wireframe mode, re #43
...
--HG--
branch : multipass-stereo
2013-07-05 03:42:38 +02:00
kaetemi
248f07ad9e
Put stereo render loop inside ryzom client main loop, see #43
...
--HG--
branch : multipass-stereo
2013-07-05 02:38:56 +02:00
kaetemi
b1aaf05bf6
Init/release VR interfaces in ryzom client, ref #43
...
--HG--
branch : multipass-stereo
2013-07-05 02:04:34 +02:00
kaetemi
352ee42571
Distort 2D gui as well, ref #43
...
--HG--
branch : multipass-stereo
2013-07-04 21:12:11 +02:00
kaetemi
dcd77495ca
Fix particles being animated twice in stereo render, see #43
...
--HG--
branch : multipass-stereo
2013-07-04 00:42:06 +02:00
kaetemi
bf8bd64f0d
Add stereo debugger for visually comparing rendered frames, ref #43
...
--HG--
branch : multipass-stereo
2013-07-04 00:09:10 +02:00
kaetemi
e68e7161d8
Use width instead of height of screen for hmd fov, re #43
...
--HG--
branch : multipass-stereo
2013-07-03 06:04:37 +02:00
kaetemi
1fe2b62eb1
Add minimal head model and world scale, ref #43
...
--HG--
branch : multipass-stereo
2013-07-03 05:21:32 +02:00
kaetemi
0dd8764e45
Make bloom work together with render target used for the rift shader, ref #43
...
--HG--
branch : multipass-stereo
2013-07-03 03:53:32 +02:00
kaetemi
52f4a37939
Remove unnecessary user render target code from bloom, see #43
...
--HG--
branch : multipass-stereo
2013-07-03 03:21:57 +02:00
kaetemi
391fa6dcff
Add arbfp1 and fp40 barrel fragment programs, see #43
...
--HG--
branch : multipass-stereo
2013-07-02 19:39:05 +02:00
kaetemi
73d3176f0c
Test arbfp1, see #43
...
--HG--
branch : multipass-stereo
2013-07-02 18:48:29 +02:00
kaetemi
d13da7a398
Prefer NPOT texture over RECT texture
...
--HG--
branch : multipass-stereo
2013-07-02 18:43:15 +02:00
kaetemi
43f8adff79
Render left and right deformed view, re #43
...
--HG--
branch : multipass-stereo
2013-07-02 03:34:49 +02:00
kaetemi
ce92c13289
Test the barrel shader, see #43
...
--HG--
branch : multipass-stereo
2013-07-02 02:40:27 +02:00
kaetemi
c5c6f7c871
Render the scene to a target texture for the stereo rendering filter, ref #43
...
--HG--
branch : multipass-stereo
2013-07-02 00:55:13 +02:00
kaetemi
7766116494
Fix a render target issue, see #43
...
--HG--
branch : multipass-stereo
2013-07-02 00:53:45 +02:00
kaetemi
c5e1235cbb
Create stereo render target, see #43
...
--HG--
branch : multipass-stereo
2013-07-01 23:23:54 +02:00
kaetemi
85109102b2
Add interface for stereo display render targets, ref #43
...
--HG--
branch : multipass-stereo
2013-07-01 21:23:47 +02:00
kaetemi
fe91e2a751
Cleanup
...
--HG--
branch : multipass-stereo
2013-07-01 20:15:55 +02:00
kaetemi
5f229667bc
Create interface classes for stereo displays and head mounted displays, see #43
...
--HG--
branch : multipass-stereo
2013-06-28 23:19:32 +02:00
kaetemi
1cc5848220
Create a clipping frustum, ref #43
...
--HG--
branch : multipass-stereo
2013-06-26 21:35:36 +02:00
kaetemi
e7842982a0
Allow multiple user cameras to be calculated separately, useful for sky etc, re #43
...
--HG--
branch : multipass-stereo
2013-06-26 20:57:37 +02:00
kaetemi
38be9b5997
Fix warning
...
--HG--
branch : multipass-stereo
2013-06-26 20:10:30 +02:00
kaetemi
202413ab52
Adjust 2D interface shift, re #43
...
--HG--
branch : multipass-stereo
2013-06-26 19:58:27 +02:00
kaetemi
4864ce7a5a
Add eye distance in 2D interface shift, re #43
...
--HG--
branch : multipass-stereo
2013-06-26 17:24:23 +02:00
kaetemi
5423d4d025
Add 2D interface shifting calculations, see #43
...
--HG--
branch : multipass-stereo
2013-06-26 16:59:08 +02:00
kaetemi
39197681fa
Correctly adjust text to viewport, re #43
...
--HG--
branch : multipass-stereo
2013-06-26 16:08:48 +02:00
kaetemi
d1bf069708
Add some comments, see #43
...
--HG--
branch : multipass-stereo
2013-06-26 15:55:39 +02:00
kaetemi
91be2d64bd
Cleanup and make bloom work with stereo rendering, re #43
...
--HG--
branch : multipass-stereo
2013-06-26 15:49:31 +02:00
kaetemi
32a187a199
Render from multiple cameras, see #43
...
--HG--
branch : multipass-stereo
2013-06-26 08:00:19 +02:00
kaetemi
a5c9592165
Read sensor data and set camera in snowballs, ref #43
...
--HG--
branch : multipass-stereo
2013-06-26 04:57:58 +02:00
kaetemi
a79b9f7e65
Add library name to device name, re #43
...
--HG--
branch : multipass-stereo
2013-06-26 02:55:15 +02:00
kaetemi
64821ab4de
List stereo devices, see #43
...
--HG--
branch : multipass-stereo
2013-06-26 02:45:49 +02:00
kaetemi
8ded099fbb
Added some notes
...
--HG--
branch : multipass-stereo
2013-06-20 00:25:52 +02:00
kaetemi
78179ed809
Rename some functions to follow the same naming convention of others
...
--HG--
branch : multipass-stereo
2013-06-19 23:49:39 +02:00
kaetemi
ad5b60963f
Cleanup
...
--HG--
branch : multipass-stereo
2013-06-19 23:34:40 +02:00
kaetemi
be33bbc70f
Add support for fp40 with opengl
...
--HG--
branch : multipass-stereo
2013-06-19 22:41:03 +02:00
kaetemi
f278ac7638
Activate textures for postprocessing material under direct3d
...
--HG--
branch : multipass-stereo
2013-06-19 21:16:13 +02:00
kaetemi
3e91b1a5cf
Test texture with postprocessing material, seems to work with opengl
...
--HG--
branch : multipass-stereo
2013-06-19 20:47:23 +02:00
kaetemi
9b0b1008ff
Fix linux compile
...
--HG--
branch : multipass-stereo
2013-06-19 16:18:09 +02:00
kaetemi
dfb110b387
Add function to check which pixel program profiles are available on a driver
...
--HG--
branch : multipass-stereo
2013-06-19 05:03:47 +02:00
kaetemi
9f1ddc9202
Add test for ps.1.1 pixel program in snowballs (it works too now)
...
--HG--
branch : multipass-stereo
2013-06-19 04:03:32 +02:00
kaetemi
1c3fc17d91
Cleanup more unneeded code
...
--HG--
branch : multipass-stereo
2013-06-19 02:36:57 +02:00
kaetemi
4200483383
Removed unneeded parser related code from the opengl pixel program implementation
...
--HG--
branch : multipass-stereo
2013-06-19 02:33:19 +02:00
kaetemi
197c0687d9
Add direct3d diff for old nevrax pixel program code, marked a todo in the comments
...
--HG--
branch : multipass-stereo
2013-06-19 02:10:38 +02:00
kaetemi
f08de2dcdc
Added diff to opengl driver for old nevrax pixel program code, marked todos in comments
...
--HG--
branch : multipass-stereo
2013-06-19 02:01:12 +02:00
kaetemi
983fab378c
Add rest of the diff from the old nevrax code for pixel programs to NL3D
...
--HG--
branch : multipass-stereo
2013-06-19 01:38:23 +02:00
kaetemi
ef720f764f
Removed some CEffect related bit that slipped in
...
--HG--
branch : multipass-stereo
2013-06-19 01:22:26 +02:00
kaetemi
3927378399
Add diff from old nevrax pixel program code to IDriver, CEffect related code not included
...
--HG--
branch : multipass-stereo
2013-06-19 01:20:51 +02:00
kaetemi
7be5858010
Simplify CPixelProgram
...
--HG--
branch : multipass-stereo
2013-06-19 01:19:45 +02:00
kaetemi
16d47d742f
Add some files from old nevrax shader code for exposing pixel programs in the drivers
...
--HG--
branch : multipass-stereo
2013-06-19 01:14:30 +02:00
kaetemi
f63a275f2b
Backed out changeset ea4b76b7213a, bad approach
...
--HG--
branch : multipass-stereo
2013-06-19 01:03:20 +02:00
kaetemi
c7994bb11f
Allow rendering with bloom to a user provided render target (untested) ( #43 )
...
--HG--
branch : multipass-stereo
2013-06-17 00:45:17 +02:00
kaetemi
c7a9edd495
Remove silly heap allocation of a null pointer
...
--HG--
branch : multipass-stereo
2013-06-16 23:49:45 +02:00
kaetemi
87c30bceea
Add info structure for multipass camera rendering effects #43
...
--HG--
branch : multipass-stereo
2013-06-16 20:48:17 +02:00
kaetemi
3b9f934b82
Fixes to compile Ryzom Client with lua 5.2
2013-06-16 03:43:45 +02:00
kaetemi
d139185b1e
Compile NLGUI with lua 5.2
2013-06-16 02:33:04 +02:00
kervala
30d56b7c24
Added: CMake project for shape2obj
2013-06-10 15:48:10 +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
cfc78bd614
FIXED: GUI not showing up because of the interface user functions not getting registered, because of a file linking issue.
2013-06-05 03:29:34 +02:00
dfighter1985
f382b97f74
Making GCC happy.
...
--HG--
branch : gsoc2012-gui-editor
2013-05-15 01:54:35 +02:00
dfighter1985
b29fd5ca11
Editbox should now create it's text when added.
...
--HG--
branch : gsoc2012-gui-editor
2013-05-11 02:40:55 +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
25195fce4c
The editor probably shouldn't crash when adding textbutton widget.
...
--HG--
branch : gsoc2012-gui-editor
2013-05-10 02:10:18 +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
057960d056
Forgot to set the parent.
...
--HG--
branch : gsoc2012-gui-editor
2013-05-10 00:28:29 +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
Dzmitry Kamiahin
68fe576f01
Fixed self-comparsion in ps.
2013-05-04 01:57:53 +03:00
dfighter1985
67a24bb1b0
Merged default
...
--HG--
branch : gsoc2012-gui-editor
2013-05-03 02:07:38 +02:00
sfb
1bfba35cd0
merge
2013-05-02 14:38:49 -05:00
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
2013-05-02 21:37:15 +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
kervala
2aea567fe2
Changed: Moved Ryzom detailed version in client
2013-04-29 14:46:53 +02:00
kervala
0624da9c82
Changed: Added a new event EventCloseWindowId when system reports window should be closed
2013-04-29 11:15:14 +02:00
kervala
381eeaef8a
Fixed: Virtual destructor warning
2013-04-29 10:41:34 +02:00
kervala
9aff9ae939
Fixed: PCH compilation
2013-03-31 23:36:56 +02:00
kervala
0c2e2d3e8f
fixes #32 build failure/error using clang
2013-03-26 13:56:16 +01:00
kervala
3aee7c3ac8
fixes a warning
2013-03-24 20:16:53 +01:00
kervala
ab454f3d92
fixes #31 Luabind can't be found
...
Added PCH support to NeL GUI
2013-03-24 20:16:23 +01:00
dfighter1985
d2fd01393f
Merging default.
...
--HG--
branch : gsoc2012-gui-editor
2013-03-12 07:17:04 +01:00
dfighter1985
526da8ddf8
MODIFIED: no more action handler spam.
2013-03-12 07:16:16 +01:00
dfighter1985
7aee088634
FIXED: Deleting the CViewText of CCtrlTextButton should no longer lead to crashes.
...
--HG--
branch : gsoc2012-gui-editor
2013-03-10 00:56:27 +01:00
dfighter1985
b6970c54ae
MODIFIED: Ups, missed this.
...
--HG--
branch : gsoc2012-gui-editor
2013-03-09 22:31:51 +01: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
20820697a3
FIXED: It's not nice to leak memory.
...
--HG--
branch : gsoc2012-gui-editor
2013-03-09 20:58:53 +01:00
dfighter1985
363154e241
MODIFIED: Preliminary support for a little cleanup when removing a widget from it's parent group ( for example when moving the widget ).
...
--HG--
branch : gsoc2012-gui-editor
2013-03-08 06:28:52 +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
aa2affa158
MODIFIED: Draw the highlight of the currently selected widget in editor mode.
...
--HG--
branch : gsoc2012-gui-editor
2013-03-07 06:01:33 +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
b80c47cc10
MODIFIED: Somehow I left this here, and it prevented viewtexts from being selected.
...
--HG--
branch : gsoc2012-gui-editor
2013-03-03 00:54:22 +01:00
dfighter1985
48d50cb409
MODIFIED: Text buttons will now delete their text too when being deleted.
...
--HG--
branch : gsoc2012-gui-editor
2013-03-02 23:27:17 +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
3a7f25bc79
MODIFIED: Views can now be selected too from the central widget.
...
--HG--
branch : gsoc2012-gui-editor
2013-02-23 00:13:44 +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
d106260646
Merged in dfighter1985/ryzomcore (pull request #3 )
...
GCC build error fixes for #20
2013-02-19 17:19:51 +01:00
dfighter1985
f7962597bd
MODIFIED: #20 Resolved some GCC build in the GUI Editor.
2013-02-19 17:16:58 +01:00
mattraykowski
6e309fee7a
changed #20 - moved the libwww package discovery and fixed include paths in library project.
2013-02-19 10:04:40 -06:00
dfighter1985
ecbcdf388f
MODIFIED: Resolved some GCC build errors.
2013-02-17 14:30:05 +01:00
mattraykowski
e7e51f01e0
merging gui editor repo.
2013-02-14 09:53:06 -06:00
dfighter1985
96a5f00dbf
CHANGED: Somehow lost this code part during development.
...
--HG--
branch : gsoc2012-gui-editor
2013-02-14 12:13:32 +01: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
3416ec2824
Changed: Warnings with clang
2013-02-08 18:17:42 +01:00
kervala
1582ae9dbf
Changed: Preliminary memory leaks detection under Windows
2013-02-08 13:29:17 +01:00
kervala
c71e6e82f1
Changed: Typo fixes (thanks to Vagrant!)
2013-02-08 13:26:07 +01:00
kervala
45c8b20f39
Changed: Typo fixes (thanks to Vagrant!)
2013-02-08 13:17:44 +01:00
Botanic
0b75988887
Backed out changeset: 97505c669e04
2013-02-08 03:09:17 -08:00
Botanic
eb7b45eba3
Backed out changeset: e36d69e04aa1
2013-02-08 03:08:59 -08:00
Botanic
74c6735274
Backed out changeset: 57d8f3733daf
2013-02-08 03:08:42 -08:00
Botanic
26c4cd3bc9
Backed out changeset: c569b6062f5d
2013-02-08 03:08:24 -08:00
Botanic
09851e732c
fixed load form and character_cl
2013-02-07 15:04:28 -08:00
Botanic
12bb26459b
fixed vertex_program_parse
2013-02-07 13:00:51 -08:00
Botanic
f57637baf6
Fixed warning: multi-character character constant [-Wmultichar]
2013-02-07 12:19:00 -08:00
Botanic
4f16007da6
Fixed warning "unix_event_emitter.cpp:569:8: warning: 'KeySym XKeycodeToKeysym(Display*, KeyCode, int)' is deprecated (declared at /usr/include/X11/Xlib.h:1695)"
2013-02-07 03:27:12 -08: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
kervala
c53d1fb301
Changed: OpenGL headers not being found by PCH
2013-01-09 09:29:15 +01: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
5efeb5ba62
Fixed: Compilation with VC++ 2010 and 2012
2012-12-11 12:22:41 +01:00
kervala
c8172d233c
Changed: PCH optimizations
2012-12-11 11:59:54 +01:00
kaetemi
dcbdb76fc9
Changed: Better log text
2012-12-10 13:32:17 +01:00
kaetemi
0e973ec976
Fixed: typo
2012-12-10 13:30:14 +01:00
kaetemi
d29a9ee8d7
Changed: Alternative code for play function for streaming source
2012-12-10 13:28:39 +01:00
kaetemi
6502311563
Changed: Additional checks for streaming buffers in OpenAL
2012-12-10 13:09:41 +01:00
kervala
41f4cf2979
Fixed: Include libxml2 header
2012-12-08 13:13:00 +01:00
kervala
4a63d4556a
Fixed: PCH for Object Viewer plugin
2012-12-08 13:11:17 +01:00
kervala
7f4ac72ef3
Changed: Minor typos
2012-12-08 12:07:23 +01:00
kervala
7136618a72
Changed: Preliminary memory leaks detection under Windows
2012-12-08 11:40:34 +01:00
kervala
4daf3bd009
Changed: Compilation with PCH optimizations
2012-12-08 11:32:31 +01:00
kervala
439266544e
Changed: Compilation with VC++ 2012
2012-12-08 11:28:46 +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
kervala
af366070ea
Changed: Simplification of OpenGL ES driver
2012-12-06 10:48:46 +01:00
kervala
9483b7f170
Changed: Updated OpenGL registries
2012-12-06 09:39:53 +01:00
kervala
58c8606d5d
Changed: Preliminary memory leaks detection under Windows
2012-12-05 10:26:01 +01:00
kervala
1715470910
Changed: Display HRESULT when D3DXCreateEffect fails
2012-12-03 09:37:21 +01:00
kervala
9ad7bd7969
Changed: Replaced size() by !empty()
2012-12-03 09:36:45 +01:00
kervala
6ee416badf
Changed: Minor typos
2012-12-03 09:09:31 +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
kervala
8bf05865ab
Changed: Disabled some useless temporary files
2012-12-01 12:43:35 +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
08f2b93b94
Changed: VC++ 2012 partial support
2012-11-24 20:26:55 +01:00
kervala
9ceb9e7d81
Fixed: Wrong EOL
2012-11-24 18:38:56 +01:00
dfighter1985
66d381f37d
MODIFIED: #1471 Incompatible / unincrementable iterators assert will no longer be hit in debug mode with M$ STL when updating the interface anims.
...
--HG--
branch : gsoc2012-gui-editor
2012-11-22 22:57:37 +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
11e88fed8f
Changed: Minor changes
2012-10-28 13:47:09 +01: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
kervala
95cb41465a
Changed: NPOT textures finally don't need that in D3D
2012-10-27 18:44:38 +02:00
kervala
0d782993f9
Fixed #1 : Implement anisotropic filtering for textures
2012-10-27 17:46:13 +02:00
kervala
100befeb1b
Changed: Minor changes
2012-10-27 16:39:06 +02:00
kervala
7c024fb479
Changed: Simplify OpenGL ES driver by using some aliases
2012-10-27 16:27:13 +02:00
dfighter1985
d83c375981
CHANGED: #1471 GUI library will now build with the new externals and Visual Studio 2010.
...
--HG--
branch : gsoc2012-gui-editor
2012-10-24 18:16:01 +02: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
kervala
bced63993b
Changed: #573 Add anti-aliasing to the OpenGL Driver
2012-10-17 11:05:51 +02:00
kervala
d8c7fa52f9
Changed: Replaced string empty comparisons with empty()
2012-10-06 18:17:57 +02:00
kervala
25dd379d7e
Changed: Replaced string empty comparisons with empty()
2012-10-06 17:17:26 +02:00
kervala
152df7402b
Changed: Updated description for CBitmap::load and CBitmap::loadSize
2012-10-06 15:49:27 +02:00
kervala
9a5b97dfff
Fixed: Compilation under Mac OS X
2012-10-05 20:36:10 +02:00
kervala
29359a552e
Fixed : #1496 Fall back to OpenAL default device (patch provided by simco, thanks!)
2012-09-29 12:51:15 +02: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
3a3fb5ea1a
Changed: Added zbuffer formats (commented)
2012-09-26 12:47:13 +02:00
kervala
8e2009279d
Changed: Drivers runtimes should go in NL_DRIVER_PREFIX
2012-09-26 12:46:43 +02:00
kervala
493f033e02
Changed: Added a warning when a texture can't be created in D3D driver
2012-09-26 00:02:27 +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
kervala
8701d6e6ee
Fixed: Replaced "Reqiures" by "Requires" in pkg-config files
2012-09-22 22:42:02 +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
kervala
429ac753e9
Changed: #878 Fix typos in comments/code
2012-09-11 20:16:26 +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
0da667bffb
CHANGED: #1471 CGroupContainer action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-20 02:14:06 +02:00
dfighter1985
6d343a460b
CHANGED: #1471 CGroupWheel action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-20 01:55:16 +02:00
dfighter1985
905c19b4e4
CHANGED: #1471 CGroupEditBox action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-20 01:50:13 +02:00
dfighter1985
0e46b933e4
CHANGED: #1471 CInterfaceGroup action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-20 01:39:20 +02:00
dfighter1985
e620f725c3
CHANGED: #1471 CCtrlBaseButton action handlers will now be retrievable, even if the action handler couldn't be found at the time of parsing.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-20 01:29:49 +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
6b42c11626
CHANGED: #1471 I probably shouldn't sacrifice the game's key config parsing on the altar of the GUI editor :P
...
--HG--
branch : gsoc2012-gui-editor
2012-08-19 02:38:24 +02:00
dfighter1985
53eb29fef8
CHANGED: #1471 got rid of a crash.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-19 02:20:57 +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
caa024b0be
CHANGED: #1471 Serialize text options for Buttons with text too.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-18 02:46:19 +02:00
dfighter1985
152aacc41e
CHANGED: #1471 Squashed a bug that prevented text to be displayed when hardtextformat was specified as an empty string. A.K.A hidden mines in the code. There are some more :(
...
--HG--
branch : gsoc2012-gui-editor
2012-08-18 01:30:52 +02:00
dfighter1985
d23b17f8a0
CHANGED: #1471 Apparently when parsing variables, the parser changes the parsed entry, so better to re-read it from the XML-tree when caching.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-18 00:27: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
87001d8ff1
CHANGED: #1471 Links are now serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-17 20:36:35 +02:00
dfighter1985
4ae34c1844
CHANGED: #1471 Variables are now serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-17 06:10:18 +02:00
dfighter1985
ceba5457c5
CHANGED: #1471 Squashed a bug that prevented many widgets from being serialized right. Therefore preventing correct display when loading the saved XML.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-17 05:11:13 +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
cae68df393
CHANGED: #1471 CGroupMenu's previously unnamed children will now be named properly.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-15 18:20:54 +02:00
dfighter1985
94a6fe7595
CHANGED: #1471 CCtrlTextButton created CViewText shouldn't be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-15 18:12:33 +02:00
dfighter1985
0e33091e27
CHANGED: #1471 CGroupMenu and CGroupList created widgets shouldn't be serialized by CInterfaceGroup.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-15 18:02:05 +02:00
dfighter1985
c554c90fbe
CHANGED: #1471 Widgets can now be flagged as non-serializable, in which case they won't be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-15 16:35:21 +02:00
dfighter1985
e684882296
CHANGED: #1471 CInterfaceElement::convertBool is now implemented with NLMISC::fromString, and can convert both 0/1 and false/true style strings to boolean.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-15 16:01:50 +02:00
dfighter1985
875f8814b7
CHANGED: #1471 CGroupContainer fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 21:02:20 +02:00
dfighter1985
f3cdb18f74
CHANGED: #1471 CGroupTab fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 19:43:43 +02:00
dfighter1985
d0f94ade15
CHANGED: #1471 CDBGroupSelectNumber fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 19:29:20 +02:00
dfighter1985
8a33e0ea9f
CHANGED: #1471 CDBGroupComboBox fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 18:43:21 +02:00
dfighter1985
005afd7aab
CHANGED: #1471 CGroupHTML fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 09:22:24 +02:00
dfighter1985
5371a77486
CHANGED: #1471 CGroupScrollText fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 02:10:27 +02:00
dfighter1985
4c9ab0ac63
CHANGED: #1471 CGroupParagraph fields can now we serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:33:54 +02:00
dfighter1985
a390b90ee0
CHANGED: #1471 CGroupHeader fields can now we serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:22:49 +02:00
dfighter1985
7d12259197
CHANGED: #1471 CGroupList fields can now we serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:20:14 +02:00
dfighter1985
7dfb60bd0c
CHANGED: #1471 CGroupHTMLInputOffset fields can now we serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 01:10:14 +02:00
dfighter1985
42b4eae629
CHANGED: #1471 CGroupWheel fields can now we serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 00:59:29 +02:00
dfighter1985
7547c5aa88
CHANGED: #1471 CGroupHeaderEntry fields can now we serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-14 00:53:47 +02:00
dfighter1985
b4c21e1f04
CHANGED: #1471 CGroupTree fields can now we serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-13 22:38:02 +02:00
dfighter1985
e825f9b055
CHANGED: #1471 CGroupMenu fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-13 03:08:41 +02:00
dfighter1985
00bae86e74
CHANGED: #1471 CGroupModal fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-13 02:28:24 +02:00
dfighter1985
59d86b070e
CHANGED: #1471 CGroupFrame fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-13 02:06:54 +02:00
dfighter1985
d1cf73e368
CHANGED: #1471 CGroupTable fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-13 01:58:39 +02:00
dfighter1985
11a3e03253
CHANGED: #1471 CGroupCell fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-13 01:34:00 +02:00
dfighter1985
d75e87d2dc
CHANGED: #1471 CGroupEditBox fields can now be serialized.
...
--HG--
branch : gsoc2012-gui-editor
2012-08-13 00:48:06 +02:00