kaetemi
c447405078
Initialize object viewer viewport at correct size
2014-07-29 14:10:40 +02:00
kaetemi
268d692b03
Compile fix
2014-07-29 14:09:08 +02:00
dfighter1985
8971f98722
Merged default.
2014-07-22 00:15:50 +02:00
kervala
b7cf2d3774
Fixed: Initialization of pointers in constructor
2014-07-19 14:02:43 +02:00
kervala
875ab80728
Changed: Minor optimization and warning
2014-07-19 14:01:44 +02:00
kervala
853b6aba0b
Changed: Replaced tests with .size() by .empty() because faster
2014-07-19 14:01:03 +02:00
kervala
dbbb344bde
Changed: Minor change
2014-07-19 11:24:07 +02:00
kervala
0d81bb48b8
Changed: Some Big endian swaps (for PowerPC especially)
2014-07-19 11:23:49 +02:00
kervala
0d83dd9162
Fixed: Warning
2014-07-19 11:16:43 +02:00
kervala
389037c26e
Changed: Replaced atof by NLMISC::fromString
2014-07-19 11:14:38 +02:00
KISHAN GRIMOUT
77d1f8e4bc
fix windows 64-bit crash in client due to VS 64-bit compiler bug, fix #164
2014-07-16 13:47:08 +02:00
kaetemi
b6e703d8f7
Fix self illumination color widget in NeL Material script
2014-07-28 18:32:05 +02:00
kaetemi
1140181fe3
Fix NeL Material script defaults, fix #166
2014-07-28 18:31:40 +02:00
kaetemi
0bcbb3f4aa
Adjust 3ds Max plugin versioning info
2014-07-28 18:31:20 +02:00
kaetemi
b24f979569
Add callback template class
2014-07-12 18:19:25 +02:00
kaetemi
dc17e72ad3
Higher quality outline, visual difference is relevant only for black
2014-10-16 02:00:45 +02:00
Laszlo Kis-Adam
606f0f483f
Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94 )
...
Just too lazy to push directly
2014-10-15 19:48:23 +02:00
kaetemi
de026fe48c
Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix)
2014-10-14 23:45:08 +02:00
kaetemi
32a144a282
Shadow should not be taken into account for font height, breaks vertical centering
2014-10-14 23:45:08 +02:00
kaetemi
18ade6cbd4
Trash DirectInput
2014-07-12 17:17:24 +02:00
dfighter1985
2ca6c73d09
Texture chooser now supports atlas textures as well.
2014-07-09 21:07:12 +02:00
kaetemi
3650ef83b7
Fix #162 : Center ingame mouse cursor after login
2014-07-09 12:31:22 +02:00
kaetemi
24e8caf0fb
Formatting: Use tabs
2014-07-09 16:59:55 +02:00
KISHAN GRIMOUT
bd257f42c7
fix windows 64bit build in mem_displayer.cpp
2014-07-09 13:41:43 +02:00
kaetemi
0f5f1f9047
Trash DirectInput
2014-07-08 22:21:11 +02:00
dfighter1985
c736145c2f
CPath can now return the file list with a path filter.
2014-07-06 23:21:25 +02:00
dfighter1985
668bbc1780
Added facilities for viewing the loaded actions.
2014-07-02 22:27:04 +02:00
dfighter1985
0dfb7a091c
Quelled some compiler compliants.
2014-06-29 03:01:43 +02:00
dfighter1985
c8c162308d
tooltip parent is now changable using an enum.
2014-06-29 02:53:33 +02:00
dfighter1985
5deea1a13b
Tooltip posrefs are now enums in the GUI Editor.
2014-06-29 01:44:06 +02:00
dfighter1985
afd1d96363
text posref is now an enum too.
2014-06-27 00:07:44 +02:00
dfighter1985
87778c86c9
Posref can now be set as an enum, instead of a string in the property editor.
2014-06-21 18:25:14 +02:00
kaetemi
dd52a05d02
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
9e0b573141
Exit with error
2014-06-21 05:46:20 +02:00
kaetemi
502d81c428
Fix compile
2014-06-20 23:38:44 +02:00
kaetemi
a6195bcee7
Fix compile
2014-06-20 23:24:54 +02:00
kaetemi
2753b49b45
Compile fix
2014-06-20 17:53:38 +02:00
kaetemi
39894f4a99
SSE2: Compile fix
2014-06-20 03:08:51 +02:00
kaetemi
2a87923ced
SSE2: Replace prefetch
2014-06-14 01:09:05 +02:00
kaetemi
92d00936aa
SSE2: Ensure correct allocator is used
2014-06-14 00:38:35 +02:00
kaetemi
f51843a721
SSE2: Remove dead code
2014-06-13 22:21:07 +02:00
kaetemi
56c59d114d
SSE2: Fix for MinGW
2014-06-19 00:05:43 +02:00
kaetemi
b9576c93dd
Merge with default
2014-06-20 03:01:32 +02:00
kaetemi
0c3baeb4de
Implement occlusion queries for AMD/ATI in the OpenGL driver
2014-06-19 21:49:33 +02:00
kaetemi
8967f57fdf
Backed out changeset: f665fcc42968 (except dru.cpp)
2014-06-19 20:22:12 +02:00
kaetemi
00528e1cd6
Fix Ryzom server compile under MinGW
2014-06-19 20:19:39 +02:00
kaetemi
fa373017f8
Fix NeL GUI compile under MinGW
2014-06-19 00:40:29 +02:00
kaetemi
76704a9952
Fix XA2 driver compile under MinGW
2014-06-18 23:18:06 +02:00
kaetemi
2c6b53c53e
Fix NeL Tools compile under MinGW
2014-06-18 21:05:39 +02:00
kaetemi
a4c86ddf20
Fix D3D driver compile under MinGW
2014-06-18 16:29:02 +02:00
kaetemi
a47d71713f
Fix Snowballs service compile under MinGW
2014-06-18 12:52:03 +02:00
kaetemi
a5b2b269a9
Fix NeL Samples for MinGW
2014-06-18 12:40:53 +02:00
kaetemi
9f699b4923
Fix Snowballs compile under MinGW
2014-06-18 02:05:54 +02:00
kaetemi
275f18d6ab
Fix linking of OpenGL driver under MinGW
2014-06-18 01:21:05 +02:00
kaetemi
fc9dc1471a
Fix linking of OpenAL driver under MinGW
2014-06-18 00:28:08 +02:00
kaetemi
6807d72136
Fix compilation of NL3D under MinGW
2014-06-17 22:33:56 +02:00
kaetemi
5a48e60763
Fix compilation of NLNET under MinGW
2014-06-17 21:56:53 +02:00
kaetemi
5b47ca4709
Fix compilation of NLMISC under MinGW
2014-06-17 21:48:25 +02:00
kaetemi
0420fea931
SSE2: Add macro for force inline
2014-06-13 20:25:45 +02:00
kaetemi
7929f78dd7
SSE2: Align CMatrix
2014-06-13 19:33:09 +02:00
kaetemi
78ccdb16b7
SSE2: Implement alignment for arena allocator
2014-06-13 19:26:22 +02:00
kaetemi
12c636d747
SSE2: Add aligned allocators
2014-06-13 19:12:31 +02:00
kaetemi
e0f0fe2650
Set additional preferred memory
2014-06-05 15:51:25 +02:00
kaetemi
70d798d5fb
Cleanup extension initialization
2014-06-05 15:03:09 +02:00
kaetemi
35b01fc3a9
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
kaetemi
30072a64c9
Set exec mode
2014-05-23 22:39:50 +02:00
kaetemi
b932a7de2a
Add --admininstall parameter to c1_shard_patch
2014-05-23 17:25:52 +02:00
kaetemi
1bd6e0993a
Fix Windows compilation of lightmap_optimizer
2014-05-23 01:57:19 +02:00
liria
b4b1e639fd
Merged default into lightmap_optimizer_port_to_linux
2014-05-15 16:36:59 +02:00
dfighter1985
9ee5a37ffd
Merged default
2014-05-14 18:01:15 +02:00
dfighter1985
f32545dda8
Moved ovqt to /code/studio
2014-05-06 01:30:28 +02:00
kaetemi
fb56ef3fdc
Merge
2014-04-30 12:57:54 +02:00
kaetemi
c93b04df1d
Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea
2014-04-30 12:54:20 +02:00
kaetemi
989965e33f
Fix EOL
2014-04-30 12:53:06 +02:00
kervala
eedaee3da3
Changed: Replaced strlwr by toLower
2014-04-24 22:59:29 +02:00
kervala
22374fb124
Fusion avec default
2014-04-24 19:16:42 +02:00
kervala
4da04fdfaa
Changed: Replaced strlwr by toLower
2014-04-24 18:11:16 +02:00
Nimetu
6217b46193
Fix compiling on linux with new OpenGL headers (issue #145 )
2014-04-23 23:23:23 +03:00
dfighter1985
c83ccc76bb
Tile Editor crash fixes.
2014-04-23 02:10:14 +02:00
dfighter1985
324aa7f851
Build fixes.
2014-04-23 00:49:17 +02:00
dfighter1985
e24447e98c
Merged Georges Editor branch.
2014-04-22 21:12:26 +02:00
dfighter1985
392061f06b
Merged default.
2014-04-22 21:10:19 +02:00
dfighter1985
04b2b69909
Merged default.
2014-04-22 21:02:34 +02:00
dfighter1985
916c9bf919
We can now drag elements, they will disappear and whatnot, but at least they can be dragged!
2014-04-21 19:30:33 +02:00
dfighter1985
83e0c1ceda
Refactored input event handling a bit.
2014-04-20 21:41:57 +02:00
dfighter1985
8c23925246
Merge default.
2014-04-19 21:53:29 +02:00
kervala
59042ccb6a
Changed: Updated OpenGL and OpenGL ES headers
2014-04-17 10:44:03 +02:00
kervala
396948f89a
Fixed: nglXSwapIntervalEXT return type should be void
2014-04-17 10:16:30 +02:00
liria
89097aa4a1
Typo correction
2014-04-05 13:49:14 +00:00
liria
610226d100
Merged default into lightmap_optimizer_port_to_linux
2014-04-05 15:40:17 +02:00
kaetemi
9edd54c446
Add interface for HMD with player death support
2014-04-01 13:14:44 +02:00
kervala
cd04a596cd
Backed out changeset: 3937923211ec
2014-03-29 12:45:22 +01:00
kervala
213749f410
Changed: Replaced some Mac OS X warnings by TODO comments
2014-03-27 16:36:00 +01:00
kervala
b118643bbd
Changed: Aligned methods names
2014-03-27 16:34:55 +01:00
kervala
9f628090cf
Changed: Aligned methods names
2014-03-27 16:34:55 +01:00
kervala
85ab0dba81
Fixed: Switch not handled warnings
2014-03-27 15:53:19 +01:00
kervala
479f31ef3b
Fixed: Warnings with clang: wrong ! and == operators order
2014-03-27 15:50:58 +01:00
kervala
7d4b89afc9
Fixed: Warnings with clang: wrong ! and == operators order
2014-03-27 15:50:58 +01:00
kervala
0d98d8d0b3
Changed: Removed useless definitions
2014-03-27 13:39:46 +01:00
kervala
b03b2cc5fb
Changed: Removed useless definitions
2014-03-27 13:39:46 +01:00
kervala
4b89a89004
Changed: Updated OpenGL headers
2014-03-27 13:39:16 +01:00
kervala
46fccf9902
Changed: Updated OpenGL headers
2014-03-27 13:39:16 +01:00
kervala
ed1b73948d
Changed: Give priority to ARB extensions in tests
2014-03-26 14:36:00 +01:00
kervala
654583807c
Changed: Detect available video memory with OpenGL extensions
2014-03-26 14:34:07 +01:00
kervala
5333ec3420
Changed: Detect available video memory with OpenGL extensions
2014-03-26 14:34:07 +01:00
kervala
d7f7523bdf
Changed: Use OpenGL ES functions prototypes from official headers
2014-03-26 14:32:00 +01:00
kervala
9fd642d24b
Changed: Use OpenGL ES functions prototypes from official headers
2014-03-26 14:32:00 +01:00
kervala
741f806f16
Changed: Optimize OpenGL driver PCH
2014-03-26 14:31:32 +01:00
kervala
091c22bf10
Changed: Optimize OpenGL driver PCH
2014-03-26 14:31:32 +01:00
kervala
efcdbd2424
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
2014-03-26 14:14:36 +01:00
kervala
1f60ea7fdf
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
2014-03-26 14:14:36 +01:00
kervala
76d7f4b620
Changed: Typo
2014-03-22 16:23:28 +01:00
kaetemi
7e6cf7c213
Fix crash in 0_setup.py on Linux
2014-03-15 09:12:40 +01:00
kaetemi
49fd01ccfb
Add color to console output
2014-03-13 18:34:26 +01:00
kaetemi
979502cbdd
Separate output directories from input directories
2014-03-12 19:19:52 +01:00
Jan Boon
f2536515ec
Merged in StudioEtrange/ryzomcore/ovqt-fixes (pull request #54 )
...
OVQT Plugins - CMake Install fixes
2014-02-21 04:53:06 +01:00
kaetemi
e8c482d36c
Disable build of dataset packed sheets in build pipeline
2014-02-20 20:15:18 +01:00
kaetemi
14a6776d0b
Update default directories
2014-02-20 03:37:23 +01:00
kaetemi
4433139a8e
Add script for creating a new shard patch
2014-02-20 03:09:31 +01:00
kaetemi
0934e84757
Rename scripts
2014-02-20 01:31:09 +01:00
kaetemi
3c5d35137d
Nicer batch scripts for pipeline
2014-02-20 01:06:29 +01:00
kaetemi
78f6aa1ce9
Add build process script for shard sheets
2014-02-19 23:51:55 +01:00
kaetemi
65b29b38e5
Additional streaming behaviour fix for XAudio2 driver
2014-02-17 00:20:29 +01:00
kaetemi
374f6a99ed
Remove some debug
2014-02-16 20:44:58 +01:00
kaetemi
b19971fe3f
Fix some streaming behaviour in XAudio2 driver
2014-02-16 20:36:58 +01:00
StudioEtrange
3da6355d73
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
2c81edcf56
Additional streaming behaviour fix for XAudio2 driver
2014-02-17 00:20:29 +01:00
kaetemi
5db0ba86a7
Remove some debug
2014-02-16 20:44:58 +01:00
kaetemi
3b38848903
Fix some streaming behaviour in XAudio2 driver
2014-02-16 20:36:58 +01:00
kervala
bb156457c0
Changed: Typo
2014-03-22 16:23:28 +01:00
kaetemi
c6e291c470
Only copy if needed
2014-02-14 02:46:07 +01:00
kaetemi
870444293f
Merge
2014-02-14 02:38:53 +01:00
kaetemi
f4a4a41fbf
Fix default directory
2014-02-14 02:03:22 +01:00
kaetemi
93a6e13d5e
Extend shard data script to gather executables and configurations
2014-02-14 01:21:05 +01:00
kaetemi
3860006530
Add directories for patchman to gamedata setup
2014-02-14 01:01:02 +01:00
kaetemi
46ab8acea7
Extend shard data script
2014-02-13 22:02:25 +01:00
botanic
b09fb394da
Backed out merge changeset: b2d97621fa3b
...
Backed out merge revision to its first parent (99840e8413f2)
2014-02-13 12:12:28 -08:00
kervala
81aa2a236a
Fixed: Reverted i18n change
2014-02-13 14:17:32 +01:00
kaetemi
0b3186ac6a
Clean translation diffs from OLDVALUE comments before merge, issue #116 , patch provided by Łukasz K
2014-02-12 16:35:07 +01:00
kaetemi
46bf57aaf7
Fix make_merge_wk for uxt
2014-02-10 16:38:04 +01:00
kaetemi
0366f021ea
Cleanup
2014-02-09 22:35:01 +01:00
kaetemi
c9437f9bd5
Cleanup
2014-02-09 22:21:30 +01:00
kaetemi
e90c325f1b
Merge
2014-02-09 22:15:33 +01:00
kaetemi
ad40eb6450
Fix the bug that caused the shape exporter to crash
2014-02-09 22:12:44 +01:00
kaetemi
aaad67a5e5
Cleanup
2014-02-09 21:53:49 +01:00
kaetemi
c0e55b4cc6
Fix export of NeL Flare
2014-02-09 17:26:26 +01:00
Matthew Lagoe
4308e65f97
Merged in botanic/ryzomcore-botanic-testing (pull request #21 )
...
Make it so that bad text always throws a nlwarning
2014-02-08 18:33:27 -08:00
kaetemi
b4c2c28ee6
Remove pacs.packed_prims when done
2014-02-09 02:42:45 +01:00
kaetemi
bce5b31a6a
Move visual slot tab to separate directory
2014-02-09 02:40:14 +01:00
kaetemi
28235008ea
Fix typo
2014-02-08 23:57:39 +01:00
kaetemi
f97dfa1d09
Implement skip for rbank process
2014-02-08 23:43:42 +01:00
kaetemi
3fadcb1f53
Implement skip for ig elevation
2014-02-08 22:54:25 +01:00
kaetemi
8dc1a89440
Implement skip for zone dependency process
2014-02-08 22:23:24 +01:00
kaetemi
a5282ccb7e
Get properties search paths from python variable
2014-02-08 22:07:33 +01:00
kaetemi
045e0c3ec6
Fix lightmap optimize skip
2014-02-08 21:09:35 +01:00
kaetemi
23cf77ea2f
Implement skip for coarse mesh build process
2014-02-08 21:02:24 +01:00
kaetemi
c04eea9a22
Implement skip for shape lightmap optimize build process
2014-02-08 20:02:57 +01:00
kaetemi
76009d8b05
Implement skip for interface build process
2014-02-08 19:44:52 +01:00
kaetemi
4a71690859
Add script to automatically merge translation wk files
2014-02-08 17:36:17 +01:00
kaetemi
b7fe5153d3
Add script to make and merge all translation diffs
2014-02-08 17:10:34 +01:00
kaetemi
3481ad75e8
Add short translation procedure readme
2014-02-08 17:01:13 +01:00
kaetemi
2e9aaf3f33
Merge
2014-02-08 16:26:01 +01:00
kaetemi
7c901bf5d8
Improve leveldesign_dev.bat
2014-02-08 16:24:56 +01:00
botanic
777aa0b6ae
Add CMAKE option and NVIDIA PerfHUD support
2014-02-07 19:49:40 -08:00
kaetemi
6976f9e4fa
Adjust default paths
2014-02-08 01:34:16 +01:00
kaetemi
134ddf193a
Add clause translation tool scripts
2014-02-08 01:03:01 +01:00
kaetemi
db53075a4f
Add translation tool scripts
2014-02-08 00:23:42 +01:00
kaetemi
4009f03f4c
Add translation directory to pipeline setup
2014-02-08 00:03:56 +01:00
kaetemi
7fb942cbbf
Copy refs in client install
2014-02-07 19:35:55 +01:00
kaetemi
01850f9b96
Add refs to patch xml
2014-02-07 18:30:55 +01:00
kaetemi
f9c9fbd0be
Reorder pipeline scripts
2014-02-07 18:10:09 +01:00
kaetemi
b5d354a92b
Add world edit data install directory to pipeline setup
2014-02-07 18:04:23 +01:00
kaetemi
fe36caf6fc
Typo
2014-02-07 17:23:34 +01:00
kaetemi
343f7e8c39
Add build shadow skin to shape process
2014-02-07 17:16:40 +01:00
kaetemi
f223a551ad
Generate correct client.cfg data path for dev client
2014-02-07 15:26:15 +01:00
kaetemi
719a316acd
Replace shard install script
2014-02-07 14:53:47 +01:00
kaetemi
332b17c382
Remove duplicate tool
2014-02-07 02:17:42 +01:00
kaetemi
9dce6793b2
Fix thread lockup in zone lighter
2014-02-07 02:01:23 +01:00
kaetemi
7ed267dd7d
Backed out changeset: de1de16eef3b
2014-02-07 01:49:39 +01:00
kaetemi
68f1440967
Include world editor files directory in prim export
2014-02-07 01:49:16 +01:00
kaetemi
c82c82c44d
Improve debug message
2014-02-07 01:49:01 +01:00
kaetemi
0d317d64c6
Let prim checker only open files with ig extension
2014-02-07 01:01:36 +01:00
kaetemi
9ef5fcaacd
Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?)
2014-02-07 01:01:19 +01:00
kaetemi
29a70767b4
Merge with default
2014-02-07 00:11:12 +01:00
kaetemi
8647d960b6
Include world editor files in rbank process, part of what caused water not to build
2014-02-06 23:58:18 +01:00
kaetemi
964e1a4bb7
Add more paths to the build gamedata configuration
2014-02-06 23:49:54 +01:00
kaetemi
fc0406eb77
Build pacs prim list txt outside repository
2014-02-06 22:10:56 +01:00
kaetemi
5540ec9375
Add separate target directory for shard data
2014-02-06 21:44:14 +01:00
kaetemi
f37ed8c753
Update default paths
2014-02-06 20:31:43 +01:00
kaetemi
652f6b5247
Merge with default
2014-02-06 20:16:18 +01:00
kaetemi
80477df91e
Merge with default
2014-02-06 19:54:15 +01:00
kaetemi
7989e9e6bc
Do not select stereo display debugger when HMD is set to Auto in Snowballs
2014-02-04 20:52:15 +01:00
kaetemi
f3a1dad1d2
Remove georges4cvs feature
2014-02-03 01:25:02 +01:00
kaetemi
ce88e5836a
Remove georges4cvs feature
2014-02-03 00:16:35 +01:00
kervala
62e62d2e72
Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1)
2014-01-30 16:14:25 +01:00
kervala
37d36e0ab5
Fixed: Compilation under Mac OS X 10.9
2014-01-30 14:43:51 +01:00
botanic
a8cabc90d1
Fixed typo issue 60
2014-01-28 11:41:26 -08:00
botanic
8c4a6fc2da
Issue #60
...
does seem to work better when latency is high
2014-01-26 03:20:00 -08:00
botanic
fad0671af1
Merge
2014-01-26 02:58:42 -08:00
botanic
95c63bc0dd
Fix for Issue #94
2014-01-26 02:57:59 -08:00
kervala
f256e78b2c
Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h)
2014-01-26 11:03:33 +01:00
liria
b1fb181b56
use NEL CFile function for file test
2014-01-25 17:09:07 +01:00
liria
afbe00fc39
Merged default into lightmap_optimizer_port_to_linux
2014-01-25 13:52:12 +01:00
liria
0e48ab1a38
make the programm compile on linux plateform
2014-01-25 11:50:14 +01:00
kervala
0e57ad38c3
Fixed: Compilation with freetype
2014-01-25 10:45:57 +01:00
kervala
7ee9607f41
Changed: Enable ig_elevation everywhere (patch by Liria)
2014-01-23 13:08:11 +01:00
liria
9d39e8b0a0
Merged default into ig_elevaton_port_to_linux
2014-01-23 00:49:56 +01:00
liria
39948bd5c7
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
2014-01-22 23:49:11 +00:00
kaetemi
6d39fd64b3
Fix Qt build on Windows
2014-01-21 12:50:23 +01:00
Nimetu
c37850920a
Remove tooltip debug message from logs
2014-01-04 00:20:05 +02:00
Nimetu
f26e595ad3
Fix typo (issue #70 )
2014-01-03 19:51:50 +02:00
Nimetu
2c38c21a40
Add deadlock counter to prevent endless loop (issue #73 )
2014-01-03 19:11:49 +02:00
botanic
b358155f73
dont force null driver, doesnt work on all cards and disable maximising max while running pipeline
2013-12-30 10:03:49 -08:00
botanic
ef83530ccc
un kaetemi'd the pipeline
2013-12-30 08:59:59 -08:00
botanic
7a8dd2829f
added single bat file to run whole pipeline
2013-12-29 23:25:09 -08:00
kervala
eb7299b8eb
Changed: #85 Compilation with STLport + EOL
2013-11-22 11:25:53 +01:00
kervala
fae156d22d
Fixed : #85 Compilation with STLport
2013-11-22 11:25:12 +01:00
kervala
559e5ed395
Fixed: Assign instead of comparison
2013-11-22 11:20:07 +01:00
kervala
925a97ad85
Fixed: Verbose warning
2013-11-13 22:23:57 +01:00
kervala
5df1ebf8ba
Fixed: Compilation under Mac OS X
2013-11-13 22:23:24 +01:00
kervala
ca82fcfe0c
Fixed: Warning with clang
2013-11-13 22:23:02 +01:00
kervala
1d46a6f94e
Changed: Don't need to change _PolygonSmooth if value is the same
2013-11-13 21:55:14 +01:00
kervala
1a5100bd93
Changed: Implement VSync under Mac OS X
2013-11-13 21:54:45 +01:00
kervala
43b87ff588
Changed: Replace strlwr by toLower
2013-11-13 21:53:21 +01:00
kervala
c2045c928d
Fixed : #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
2013-11-13 21:52:21 +01:00
kervala
0b400ae0c2
Fixed: Wrong algorithm
2013-11-13 21:46:42 +01:00
kervala
57a4c0ece1
Changed: EOL
2013-11-13 21:45:06 +01:00
kervala
b7feea6c95
Fixed: Warning with clang
2013-11-13 21:40:41 +01:00
kervala
753c5d6378
Changed: Replaced atof by fromString
2013-11-13 21:37:28 +01:00
kervala
5f0a674ad2
Changed: Updated OpenGL registry
2013-11-13 20:31:08 +01:00
Botanic
8ec1ee4d45
Merge
2013-11-02 16:35:26 -07:00
sfb
35cf55adca
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
2013-10-28 12:58:08 -05:00
sfb
2220c593f5
Bad merge resolution, fixed a couple source files which merged poorly.
2013-10-28 11:24:31 -05:00
sfb
436970dc46
Bad merge resolution, fixed the build files that merged poorly.
2013-10-28 11:24:02 -05:00
sfb
e9b8e2edba
merge from default
2013-10-23 12:08:09 -05:00
Matt Raykowski
8c046cf4c0
Merged in DJanssens/quitta-ryzomcore (pull request #25 )
...
Ryzom AMS - GSOC Project
2013-10-19 16:02:52 -05:00
kaetemi
08a4d9eb11
Fix #67 bad NELID in vertex program parser
2013-10-06 20:06:53 +02:00
kervala
88b2a1a38d
Fixed: Use multiarch library path under Linux
2013-09-30 09:11:35 +02:00
kervala
2becb762f8
Fixed: Some warnings
2013-09-29 16:26:24 +02:00
kervala
713e7b75b3
Changed: Detect Windows 8 and Windows Server 2012
2013-09-29 13:41:42 +02:00
kervala
be6a77e9de
Fixed: Compilation under Linux
2013-09-28 10:18:35 +02:00
kervala
6b9e9b8486
Changed: Include Lua headers directory for GUI Editor
2013-09-27 16:43:02 +02:00
kervala
9889049239
Fixed: Some warnings
2013-09-27 16:30:55 +02:00
kaetemi
185709734d
Fix warnings
2013-09-27 01:32:01 +02:00
kaetemi
3d53e078a5
Fix line endings
2013-09-27 00:08:49 +02:00
kervala
b5c625f261
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-24 21:33:59 +02:00
Quitta
3d7a7dc191
Merge with quitta-gsoc-2013
2013-09-23 00:49:16 +02:00
kervala
4b6ca1e628
Fixed: Wrong variable used to compute array length
2013-09-22 13:23:03 +02:00
kervala
4f1897208c
Fixed: OpenGL ES driver compilation
2013-09-22 13:20:53 +02:00
kervala
26370c962d
Fixed: Warnings with GCC
2013-09-22 13:20:19 +02:00
kervala
df8c6e9b08
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-22 13:10:57 +02:00
kaetemi
64d8faddd0
Fix typo
2013-09-14 19:05:54 +02:00
kaetemi
adcb3e032b
Fix regression from stereo branch in wind tree
2013-09-14 18:58:23 +02:00
kaetemi
60cd1f6116
Fix compile error in vertex program
2013-09-14 17:53:47 +02:00
kaetemi
4adbfd4e4e
Update supportVertexProgram calls
2013-09-14 16:43:36 +02:00
kaetemi
7967709e0e
Remove old interface
2013-09-14 16:45:00 +02:00
kaetemi
102f0080af
Cleanup unused code
2013-09-14 16:23:11 +02:00
kaetemi
0386673d13
Rename
2013-09-14 00:46:10 +02:00
kaetemi
08f37643b7
Cleanup
2013-09-14 00:36:06 +02:00
kaetemi
93b5536036
Merge with default
2013-09-13 23:24:13 +02:00
kaetemi
4f193231a1
Fix compile errors caused by missing includes
2013-09-13 23:23:19 +02:00
kaetemi
7d0a84b2d1
Merge with default
2013-09-13 23:07:49 +02:00
kaetemi
291c5d6012
Cleanup
2013-09-13 23:02:35 +02:00
kaetemi
881949a5d7
Use named indices with wind tree program
2013-09-13 22:20:52 +02:00
kaetemi
7176cbc0af
Use named indices for per pixel light vertex program
2013-09-13 21:47:42 +02:00
kaetemi
edec14807f
Use named uniform indices for lighted vertex program
2013-09-13 21:31:47 +02:00
kaetemi
a0fbb152ee
Updated wind tree program container
2013-09-13 20:45:06 +02:00
kaetemi
ba945f30a8
Use lighted vertex program container for per pixel light program
2013-09-13 20:00:20 +02:00
kaetemi
482c13fd1a
Add container for lighted vertex program
2013-09-13 19:03:05 +02:00
kaetemi
f7e80187ad
Adjust order for meshvp
2013-09-13 18:25:52 +02:00
kaetemi
ce7357ffa4
Do not use old interface here
2013-09-13 17:17:11 +02:00
kaetemi
7d854d54d1
Modify calls in bloom effect
2013-09-13 17:11:42 +02:00
kaetemi
2f384d9789
Update veget implementation
2013-09-13 17:09:05 +02:00
kaetemi
2ee6843cd9
Fixes for d3d
2013-09-13 17:08:56 +02:00
kaetemi
b77101cdd4
Update d3d implementation and add some debugging code
2013-09-11 01:12:37 +02:00
kaetemi
f0177268b4
Rename of a d3d specific class
2013-09-10 19:53:41 +02:00
kaetemi
a798aecd71
Partial update of veget vp
2013-09-10 19:52:14 +02:00
kaetemi
776f198df3
Update some test code
2013-09-10 16:42:51 +02:00
kaetemi
7462d731f1
Small adjustment to landscape vp parameter setting
2013-09-10 16:24:45 +02:00
kaetemi
26f4073ad7
Simplify
2013-09-10 15:59:31 +02:00
kaetemi
4de5eeb586
Adjust landscape vertex program to use new interface
2013-09-10 15:42:42 +02:00
kaetemi
32288eabe8
Use new program interface for water vertex program
2013-09-10 02:07:16 +02:00
kaetemi
dd490a0cc4
Set driver parameters
2013-09-10 02:01:57 +02:00
kaetemi
c9a2f9dbfc
Some fixes
2013-09-10 01:29:53 +02:00
kaetemi
680f260803
Use CSmartPtr for vertex program
2013-09-10 00:31:26 +02:00
kaetemi
14026e6f08
Set params from storage
2013-09-09 23:39:18 +02:00
kaetemi
f46ef4fd07
Fix incorrectly removed line
2013-09-09 23:03:52 +02:00
kaetemi
b6fde3c706
Missed file in last commit
2013-09-09 23:01:43 +02:00
kaetemi
1447e2f2d8
Replace temporary CMaterial code
2013-09-09 21:44:14 +02:00
kaetemi
01577f9f95
Implement param storage copy
2013-09-09 21:05:12 +02:00
kaetemi
aa85673b3b
Flag some TODO's
2013-09-09 20:55:23 +02:00
kaetemi
0bcb0d6ffd
Add glsl pixel program for stereo distortion
2013-09-09 20:49:59 +02:00
kaetemi
057eab4680
Cleanup abstract gpu program interface
2013-09-09 18:33:38 +02:00
kaetemi
fcb0ee720e
Implement new driver interface in Direct3D driver
2013-09-09 16:36:29 +02:00
kaetemi
99a48d5511
Implement new driver interface in OpenGL driver
2013-09-09 14:43:10 +02:00
kaetemi
ea25e5375d
Expand parameter interface
2013-09-09 12:18:20 +02:00
kaetemi
0cf5dbab8a
Reduce function duplication
2013-09-09 02:03:40 +02:00
kaetemi
060bd3035e
Builtin parameter set functions
2013-09-09 01:53:02 +02:00
kaetemi
c512dfbb3d
Separate count and size
2013-09-09 01:31:15 +02:00
kaetemi
7be6891bd7
Cleanup driver interface
2013-09-08 21:57:27 +02:00
kervala
7f6959ce39
Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)
2013-09-08 12:57:34 +02:00
kervala
a023ab89d7
Changed: Updated Freetype libraries variable
2013-09-08 12:54:05 +02:00
kervala
811dca71ee
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
2013-09-08 12:52:00 +02:00
kaetemi
48493b225d
Add additional set functions
2013-09-08 01:49:34 +02:00
kaetemi
58a8982ba5
Add gpu program params storage structure
2013-09-08 01:36:01 +02:00
kaetemi
f4d05d25c5
Implement new gpu program interface in direct3d driver
2013-09-07 22:00:07 +02:00
kaetemi
f4fccab548
Implement new gpu program interface in opengl driver
2013-09-07 21:30:40 +02:00
kaetemi
47716d7247
Make gpu programs use abstract gpu program class
2013-09-07 20:41:07 +02:00
kaetemi
d54774f978
Add abstract gpu program and source classes
2013-09-07 18:33:18 +02:00
kaetemi
ddbb65bd34
Fix compile error
2013-09-07 16:05:28 +02:00
kervala
8d27acc654
Changed: Minor changes
2013-09-06 15:00:35 +02:00
kervala
712f9ad2a0
Fixed: Integer 32 bits conversion to 64 bits pointer
2013-09-06 14:51:21 +02:00
kervala
53d5e56a2a
Changed: Don't use NLMISC includes in NLMISC PCH
2013-09-06 14:50:19 +02:00
kervala
12cd9083de
Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style
2013-09-06 14:49:12 +02:00
Thibaut Girka
a45299bfe5
Add support for LibVR
2013-08-28 08:08:22 +02:00
kaetemi
beb66b19b7
Merge with default
2013-09-07 16:25:45 +02:00
kervala
d2a9cb90d0
Changed: Formatting
2013-08-26 12:34:04 +02:00
kervala
dd116afff3
Fixed: Crash when trying to display a missing texture
2013-08-26 12:33:26 +02:00
kervala
a2f91ce484
Changed: Tabulations to spaces
2013-08-05 10:30:40 +02:00
Botanic
6deea176a8
Make it so that bad text always throws a nlwarning
2013-08-04 01:43:54 -07:00
kaetemi
d0a4f5ed75
Fix warning
2013-08-03 21:29:47 +02:00
kaetemi
9dc9acd68f
Merge with default
2013-08-01 23:02:49 +02:00
kaetemi
bbe4ea4ba8
Add some basic prediction to CCDBNodeBranch::find
2013-08-01 22:47:46 +02:00
kaetemi
1ed7e4fcff
Force link
2013-08-01 10:11:11 +02:00
Quitta
63db620ca6
Merge with default
2013-07-31 16:26:22 +02:00
Quitta
e3625bc4e4
Merge with default
2013-07-31 16:17:29 +02:00
Quitta
0bf8c4d526
fix for getting client working + possibly auto login for ingame part
2013-07-30 01:46:56 +02:00
kaetemi
7bbf40ea19
Improve performance of UsedTexture debugging info in OpenGL driver
2013-07-29 03:41:10 +02:00
kaetemi
7046b6f364
NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked
2013-07-28 21:39:54 +02:00
kaetemi
b09e28e9e0
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
2013-07-28 05:10:07 +02:00
kaetemi
70f83e1fb9
Parse action handler condition for interface link in advance
2013-07-28 03:02:07 +02:00
kaetemi
36c969252b
Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager
2013-07-28 00:48:34 +02:00
kaetemi
a519de3e5d
Build ligo outside the database
2013-07-27 04:03:05 +02:00
kaetemi
bcba46f950
Merge with default
2013-07-25 21:18:52 +02:00
kaetemi
9587ccc6ba
Silently sneaking in a nicer splash image for ovqt
2013-07-25 02:39:07 +02:00
kaetemi
fd285cc703
Merge with default
2013-07-25 00:37:00 +02:00
kaetemi
f83fdf5a2f
Fix bug #45 crash in zone lighter with large number of CPU cores
2013-07-24 20:51:43 +02:00
kaetemi
da53f11c73
Use tags for pacs prim export
2013-07-24 20:51:38 +02:00
kervala
dfbf2998b0
Fixed: lua_open() doesn't exist with Lua 5.2
2013-07-24 18:47:50 +02:00
kervala
bd8a606341
Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange)
2013-07-24 18:47:04 +02:00
kaetemi
b1f953c2a1
Merge with default
2013-07-19 15:38:49 +02:00
kaetemi
b6c869f072
Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs
2013-07-19 15:37:25 +02:00
kaetemi
4a593aa273
Merge with default
2013-07-19 14:10:07 +02:00
kaetemi
62f0c1e20c
Merge with default
2013-07-18 23:05:25 +02:00
kaetemi
e822c2be0d
Fix an error in 3ds Max with the material script
2013-07-18 18:15:53 +02:00
Michael Witrant
59dc1a6c16
Fixed definition tests for optional LibOVR
2013-07-06 20:40:42 +02:00
Michael Witrant
69c194f57f
LibOVR is optional, and is disabled by default
2013-07-06 20:05:19 +02:00
Michael Witrant
67ebf920ec
Added LibOVR finder and Linux support, ref #43
2013-07-06 19:33:07 +02:00
kaetemi
cb9e5762db
Don't render to texture when in wireframe mode, re #43
2013-07-05 03:42:38 +02:00
kaetemi
c3f6f5b8ff
Put stereo render loop inside ryzom client main loop, see #43
2013-07-05 02:38:56 +02:00
kaetemi
541f75920b
Init/release VR interfaces in ryzom client, ref #43
2013-07-05 02:04:34 +02:00
kaetemi
6113b07673
Distort 2D gui as well, ref #43
2013-07-04 21:12:11 +02:00
kaetemi
4b2ea661cc
Fix particles being animated twice in stereo render, see #43
2013-07-04 00:42:06 +02:00
kaetemi
fd1d606154
Add stereo debugger for visually comparing rendered frames, ref #43
2013-07-04 00:09:10 +02:00
kaetemi
d57b7b39fe
Use width instead of height of screen for hmd fov, re #43
2013-07-03 06:04:37 +02:00
kaetemi
a531535dfa
Add minimal head model and world scale, ref #43
2013-07-03 05:21:32 +02:00
kaetemi
299b3ec401
Make bloom work together with render target used for the rift shader, ref #43
2013-07-03 03:53:32 +02:00
kaetemi
9516851bee
Remove unnecessary user render target code from bloom, see #43
2013-07-03 03:21:57 +02:00
kaetemi
e3784571cd
Add arbfp1 and fp40 barrel fragment programs, see #43
2013-07-02 19:39:05 +02:00
kaetemi
118340d821
Test arbfp1, see #43
2013-07-02 18:48:29 +02:00
kaetemi
2315ae9c5a
Prefer NPOT texture over RECT texture
2013-07-02 18:43:15 +02:00
kaetemi
a924479a5c
Render left and right deformed view, re #43
2013-07-02 03:34:49 +02:00
kaetemi
6b8d43181d
Test the barrel shader, see #43
2013-07-02 02:40:27 +02:00
kaetemi
3a12aa5894
Render the scene to a target texture for the stereo rendering filter, ref #43
2013-07-02 00:55:13 +02:00
kaetemi
3b630492aa
Fix a render target issue, see #43
2013-07-02 00:53:45 +02:00
kaetemi
ffc91631e7
Create stereo render target, see #43
2013-07-01 23:23:54 +02:00
kaetemi
f25a9da718
Add interface for stereo display render targets, ref #43
2013-07-01 21:23:47 +02:00
kaetemi
9960b9dfdb
Cleanup
2013-07-01 20:15:55 +02:00
kaetemi
b04d278a27
Create interface classes for stereo displays and head mounted displays, see #43
2013-06-28 23:19:32 +02:00
kaetemi
d404c1228c
Create a clipping frustum, ref #43
2013-06-26 21:35:36 +02:00
kaetemi
2f4867ab78
Allow multiple user cameras to be calculated separately, useful for sky etc, re #43
2013-06-26 20:57:37 +02:00
kaetemi
4a579d0af2
Fix warning
2013-06-26 20:10:30 +02:00
kaetemi
eb196fd99a
Adjust 2D interface shift, re #43
2013-06-26 19:58:27 +02:00
kaetemi
8230238b5f
Add eye distance in 2D interface shift, re #43
2013-06-26 17:24:23 +02:00
kaetemi
1b8ddaa87b
Add 2D interface shifting calculations, see #43
2013-06-26 16:59:08 +02:00
kaetemi
78ae99731d
Correctly adjust text to viewport, re #43
2013-06-26 16:08:48 +02:00
kaetemi
cbd72f73ff
Add some comments, see #43
2013-06-26 15:55:39 +02:00
kaetemi
7672ab2812
Cleanup and make bloom work with stereo rendering, re #43
2013-06-26 15:49:31 +02:00
kaetemi
e51d9e15d9
Render from multiple cameras, see #43
2013-06-26 08:00:19 +02:00
kaetemi
a7cf55c58e
Read sensor data and set camera in snowballs, ref #43
2013-06-26 04:57:58 +02:00
kaetemi
dc813a060e
Add library name to device name, re #43
2013-06-26 02:55:15 +02:00
kaetemi
b45bdb88e6
List stereo devices, see #43
2013-06-26 02:45:49 +02:00
kaetemi
982bf804de
Added some notes
2013-06-20 00:25:52 +02:00
kaetemi
1f68025931
Rename some functions to follow the same naming convention of others
2013-06-19 23:49:39 +02:00
kaetemi
1ed0d46026
Cleanup
2013-06-19 23:34:40 +02:00
kaetemi
aa3462b7bc
Add support for fp40 with opengl
2013-06-19 22:41:03 +02:00
kaetemi
0d1e405d3e
Activate textures for postprocessing material under direct3d
2013-06-19 21:16:13 +02:00
kaetemi
cfb9827b2c
Test texture with postprocessing material, seems to work with opengl
2013-06-19 20:47:23 +02:00
kaetemi
4cc4a84578
Fix linux compile
2013-06-19 16:18:09 +02:00
kaetemi
3865e6e56f
Add function to check which pixel program profiles are available on a driver
2013-06-19 05:03:47 +02:00
kaetemi
9c5fabf615
Add test for ps.1.1 pixel program in snowballs (it works too now)
2013-06-19 04:03:32 +02:00
kaetemi
0c1bfe0f63
Cleanup more unneeded code
2013-06-19 02:36:57 +02:00
kaetemi
72035e936a
Removed unneeded parser related code from the opengl pixel program implementation
2013-06-19 02:33:19 +02:00
kaetemi
7dcc86c717
Add direct3d diff for old nevrax pixel program code, marked a todo in the comments
2013-06-19 02:10:38 +02:00
kaetemi
acf8ec653c
Added diff to opengl driver for old nevrax pixel program code, marked todos in comments
2013-06-19 02:01:12 +02:00
kaetemi
cb966505cc
Add rest of the diff from the old nevrax code for pixel programs to NL3D
2013-06-19 01:38:23 +02:00
kaetemi
7da48d8866
Removed some CEffect related bit that slipped in
2013-06-19 01:22:26 +02:00
kaetemi
9f6b60a920
Add diff from old nevrax pixel program code to IDriver, CEffect related code not included
2013-06-19 01:20:51 +02:00
kaetemi
b5dfdbdd55
Simplify CPixelProgram
2013-06-19 01:19:45 +02:00
kaetemi
fd42d61af9
Add some files from old nevrax shader code for exposing pixel programs in the drivers
2013-06-19 01:14:30 +02:00