botanic
|
80e168886a
|
properly write the hostname for permissions creation
|
11 years ago |
botanic
|
036dac452f
|
changed it to error on bad permissions copying config.php
|
11 years ago |
Botanic
|
6dfafa7ae1
|
Merge
|
11 years ago |
kervala
|
588d262dbf
|
Fixed: MFC can't be found
|
11 years ago |
dfighter1985
|
1cc71457eb
|
Implemented a basic fog control widget.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
sfb
|
59abfb8a1d
|
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
sfb
|
df7110d2d6
|
Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
sfb
|
d86f150caa
|
Bad merge resolution, fixed the build files that merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
Matthew Lagoe
|
61f021f635
|
Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #43)
added rrd_graphs directory
|
11 years ago |
Botanic
|
9e67d9ea09
|
added rrd_graphs directory
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
4c5832204f
|
config.default.php
|
11 years ago |
Botanic
|
3e692705ea
|
added folder placeholders
|
11 years ago |
Botanic
|
7381de073e
|
fixed bad merge
|
11 years ago |
Botanic
|
057fe3e0f7
|
Merge
|
11 years ago |
Botanic
|
b6de1eca23
|
Changed installer page to no_visible_elements
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
284884c573
|
added installer for nel_tool database
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
a3cbd69d3b
|
fixed css
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
03a1dc39af
|
made logo clickable
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
2d174cf15c
|
fixed more warnings
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
b8fdefe10d
|
fixed php warning
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
04619a39a9
|
made users a dropdown for adding users to group
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
632a6f2929
|
fixed missing </div>
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
91c4784752
|
Fixed Support Groups
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
81d1cf93fb
|
added option for assigned and unassigned ie "both"
--HG--
branch : rc-botanic-webdev
|
11 years ago |
dfighter1985
|
ed885d3df6
|
Replaced ARB VertexAttribArray stuff with the core calls.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
d37b004372
|
Removed some more deprecated stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
a9a9768872
|
Removed ARB fragment shader stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
f768704cbf
|
Removed some ATI stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
6947a58ba1
|
Removed fixed embm stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Botanic
|
d1913cbfc5
|
fixed div in settings template
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
c4e79a8246
|
fixed some more static non-static warnings
--HG--
branch : rc-botanic-webdev
|
11 years ago |
dfighter1985
|
8276cb0140
|
We shouldn't set up a generated or newly compiled shader program if we already have one ( set up from outside the driver for example ).
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Botanic
|
6b266fd808
|
fixed missing index errors
--HG--
branch : rc-botanic-webdev
|
11 years ago |
dfighter1985
|
82a7237e7d
|
Forgot to actually add the driver infos to the list, which caused the driver to hang on deletion.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Botanic
|
8ca55f955e
|
fixed groupid if there are no groups
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
677c8fa251
|
cleanup sync
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
3dbb08f1d1
|
fixed static call to non static
--HG--
branch : rc-botanic-webdev
|
11 years ago |
dfighter1985
|
c105164eeb
|
Getting rid of z-order assignment warning.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Botanic
|
95c5b9e1a8
|
added fork on linux as well as implimented pid file to check for other running crons
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
72290313a4
|
Implimented lazy cron and fixed syncronize button.
--HG--
branch : rc-botanic-webdev
|
11 years ago |
sfb
|
892ed1ed3d
|
merge from default
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
Botanic
|
08ee2b8abc
|
added installing nel db
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
54d13d93d0
|
Fixed path bugs
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
16bd70c50a
|
remove install.php from sql
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
fd012e9cda
|
added installer
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
457f2f703f
|
updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
7a7191e981
|
added installer for when database is missing
--HG--
branch : rc-botanic-webdev
|
11 years ago |
Botanic
|
32c729f38e
|
Moved Android app
--HG--
branch : rc-botanic-webdev
|
11 years ago |
kervala
|
28b9fbe8bc
|
Changed: Search for default installation paths under Windows
|
11 years ago |
Matt Raykowski
|
0001719d99
|
Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
|
11 years ago |
Botanic
|
04221c3696
|
changed to tabs
|
11 years ago |
Botanic
|
31ca25b00b
|
connection failure message if mysql conneciton fails
|
11 years ago |
kervala
|
c180c06d7f
|
Removed: Backup files
|
11 years ago |
dfighter1985
|
982b99d8d0
|
Merged the GPU program stuff from mainline.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
3f1ce6020a
|
Merge with default
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
563afd027c
|
Fix #67 bad NELID in vertex program parser
|
11 years ago |
kaetemi
|
af621187f1
|
Merge with default
--HG--
branch : multipass-stereo
|
11 years ago |
dfighter1985
|
3b16f096cc
|
Merge with rename commit.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
32e814ecb6
|
Use separate shaders in the OpenGL3 driver.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kervala
|
eb3c58cce9
|
Fixed: Use multiarch library path under Linux
|
11 years ago |
kervala
|
30b0f25587
|
Fixed: server_share needs MySQL headers
|
11 years ago |
kervala
|
652915412f
|
Changed: Link to opengl library
|
11 years ago |
kervala
|
de43ea8d86
|
Fixed: Some warnings
|
11 years ago |
kervala
|
de42e4d7ff
|
Fixed: Some warnings
|
11 years ago |
kervala
|
67e0b796ce
|
Changed: Search for OpenGL Qt 4 module
|
11 years ago |
kervala
|
0b29d3993d
|
Changed: Don't check for D3D radio button under other OSes
|
11 years ago |
kervala
|
f8179f68ad
|
Changed: Minor change
|
11 years ago |
kervala
|
f11f5c8b7a
|
Changed: Disable D3D radio button for other OSes
|
11 years ago |
kervala
|
339242d88e
|
Changed: Virtual destructors
|
11 years ago |
kervala
|
b638779240
|
Fixed: Compilation under Linux
|
11 years ago |
kervala
|
28eb142f24
|
Changed: Minor changes
|
11 years ago |
kervala
|
b5e7542602
|
Fixed: Wrong driver version in Ryzom Configurator
Fixed: Typo in "width"
|
11 years ago |
kervala
|
b0b1c8a0b6
|
Changed: Added PCH for ryzom configurator qt
|
11 years ago |
kervala
|
f2ee0e99d8
|
Changed: Detect Windows 8 and Windows Server 2012
|
11 years ago |
kervala
|
c7899841d3
|
Fixed: Compilation under Linux
|
11 years ago |
Cédric OCHS
|
349b8a8b55
|
Merged in nimetu/ryzomcore (pull request #28)
Fixed: restore correct resolution
|
11 years ago |
kervala
|
eebe74066e
|
Changed: Include Lua headers directory for GUI Editor
|
11 years ago |
kervala
|
43bbfe3da7
|
Fixed: Some warnings
|
11 years ago |
Nimetu
|
5da36a54e4
|
Fixed: Do not save client.cfg when exiting from char selection screen or correct window size is lost
|
11 years ago |
Nimetu
|
276f664e50
|
Fixed: restore correct fullscreen resolution
|
11 years ago |
kervala
|
bc8490adb7
|
Changed: Detect Express versions
|
11 years ago |
kervala
|
2aba0ec52f
|
Changed: Don't use anymore the current SDK in registry (very unreliable)
Changed: Use the Windows SDK installed with VC++ or the most recent compatible one
|
11 years ago |
kervala
|
4fee35c5b3
|
Fixed: Windows SDK detection for some previous versions
|
11 years ago |
kaetemi
|
3b4730c890
|
Fix warnings
|
11 years ago |
kaetemi
|
3b1d4e3915
|
Fix warnings
|
11 years ago |
kaetemi
|
85365fd7bb
|
Fix line endings
|
11 years ago |
kervala
|
65d9c70cd9
|
Fixed: LNK2011 when using external libraries
|
11 years ago |
kervala
|
03201f979f
|
Changed: Improved Windows SDK detection
|
11 years ago |
Nimetu
|
4b86f979a8
|
Fixed: remember selected resolution in login screen (issue #36)
--HG--
branch : fix-issue-36
|
11 years ago |
dfighter1985
|
b70ce1eb09
|
Renamed OpenGL3 to opengl3
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
ace1b5386b
|
Check GL_ARB_separate_shader_objects extension on startup, and load related functions.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
cf6d2a88bc
|
Removed some now unused methods.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
afb56ea660
|
Moved the rendering methods into a new file.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
b0613e334c
|
Removed a now unused file.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
9d3e3a6a73
|
GL_VERTEX_PROGRAM_TWO_SIDED_ARB isn't used in the GL3 driver.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Cédric OCHS
|
f8f25e8579
|
Merged in nimetu/ryzomcore (pull request #26)
Fixed: map landmark bug (issue #15)
|
11 years ago |
dfighter1985
|
7b5aaf7e0f
|
Some cleanup, most of the old OpenGL stuff should be gone.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kervala
|
c8c296f484
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
11 years ago |
dfighter1985
|
5326324b56
|
Some comments.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
69a4a9f9a5
|
Two sided rendering, while using dynmat.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
390d1bb156
|
Don't call newMaterial() every time we load a (sub)material.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
dbd5185de1
|
Only use the shader combo box for the user shaders.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Nimetu
|
75d784c656
|
Fixed: map landmark bug (issue #15)
|
11 years ago |
dfighter1985
|
586c25f864
|
When clearing the dynmat, should clear all of them. Also fixes a crash.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
3949c210f6
|
OpenGL should be fed a clamped color value.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
b190d7930d
|
updated client_default.cfg and removed rhe anon login
|
11 years ago |
dfighter1985
|
76204a844d
|
When changing a shader in the editor, reload it in the driver too.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
b775237215
|
It's now possible to render using the user shaders and dynmat.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
a484de5b3f
|
Merge with quitta-gsoc-2013
|
11 years ago |
Quitta
|
a8f9036b28
|
Added empty ssl_ca_cert.pem to fix missing cert error
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
kervala
|
bb7297f260
|
Fixed: Wrong variable used to compute array length
|
11 years ago |
kervala
|
b7ddc2c0d2
|
Fixed: OpenGL ES driver compilation
|
11 years ago |
kervala
|
82904232d2
|
Fixed: Warnings with GCC
|
11 years ago |
kervala
|
61a5647bdd
|
Changed: Typo
|
11 years ago |
kervala
|
6695a9064e
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
11 years ago |
kervala
|
c7deb1b0c4
|
Changed: FIX_PRECOMPILED_HEADER now useless
|
11 years ago |
kervala
|
6dff896bba
|
Changed: Link to CURL_LIBRARIES
|
11 years ago |
kervala
|
0ff9908e8e
|
Changed: Don't include files from project in PCH
|
11 years ago |
kervala
|
3294955c60
|
Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API
|
11 years ago |
StudioEtrange
|
d81c9db04e
|
FindMSVC fix
|
11 years ago |
dfighter1985
|
c3c3f154b1
|
Instead of auto-generating the dynmaterial added a menu item in the material editor that will trigger it if needed.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
a2cedf109d
|
forgot to change one button, quick fix
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
43e356cda1
|
changed button sizes and added the forgot password link to the client_cfg.cpp
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
cf8251f25f
|
forgot password added
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
78adc25c8d
|
Made it possible to redirect to a specific page after login in
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
7d3bd1a4ba
|
renamed the config to config.default.php
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
cfa3651296
|
some extra information added + changed the default hardcoded register & support url in the client_cfg.cpp
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
8269ec7be5
|
Wrong direction, wrong lighting!
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
11fe86e552
|
Forgot to actually pass the direction in the previous commit...
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
72e7d09113
|
Don't calculate these more than once.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
69c41a31ae
|
These positions and directions were supposed to be in eye coords.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
0453f30582
|
Added lighting to the specular shader.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
f194704a28
|
Refactored directional lighting a little. No need to calculate things more than once.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
0ab68ef25f
|
Added point light support.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
9a647a893c
|
Specular shader should compile even when there's no fog added.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
40bcc543e3
|
tried to fix error messages being shown
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
3d69e377e0
|
it works, though this will also forward the client to the success page
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
4aa905c07f
|
bah, its late and I'm not working in c++...
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
343c01d077
|
this should fix it :D!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
2747ed75f7
|
wasn't completely fixed yet, hopefuly it now is
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
739defbd99
|
small fix
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
2e4b6bb6ae
|
Don't try to edit stock shaders.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
a9a1d17c4f
|
Added the stock shader names to the material editor, so it will now be able to select them when loading a shape.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
1d71a540ba
|
Apparently QColor::set[color]f takes colors as floats clamped to the [0,1] range.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
c6bb6ec2a9
|
Renamed a bunch of shader related classes in NL3D to contain the word Usr, since they are user shader related.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
6c58856ed7
|
Shininess is now loaded from the material as a uniform instead of being hardcoded.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
4ba9d815d4
|
Colors are now set from the light setup, rather than being hardcoded.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
6f396aa8f7
|
Added the directional light(s) to the lightmap shader too.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
01ef7fd973
|
The specular calculation is probably faster this way.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
cae26f525c
|
updated the help page!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
3dd4901036
|
syncing small fix
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
bfce96eb23
|
putted image files in the www folder too, because else it can't be accessed from outside!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
3c1d74045e
|
added function that imports the users from the nel db into the ams/ticket_user
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
a485382a47
|
updated the docs!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
4ec92d2f06
|
Simplified the directional light shader generator functions.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
28c4b5b157
|
Added specular term to the directional lights.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
354d2b8c65
|
Added ambient term support for directional light.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
43817746ec
|
Renamed light[n]Col to light[n]ColDiff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
0def5caf54
|
Added diffuse directional light support to the normal shader.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
f6668b3f6f
|
Cleanup vr config interface
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
6186da84b2
|
Add ingame configuration interface for virtual reality devices
--HG--
branch : multipass-stereo
|
11 years ago |
dfighter1985
|
3c99323ada
|
Apparently typos and redundantly setting uniforms can totally ruin rendering :D
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
5fbfe7b17f
|
Since now we have fog support, this doesn't need to be disabled anymore.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
1a669307da
|
Fix typo
|
11 years ago |
kaetemi
|
ce9e0a397b
|
Fix regression from stereo branch in wind tree
|
11 years ago |
kaetemi
|
046e3c92da
|
Fix compile error in vertex program
|
11 years ago |
kaetemi
|
3c099397d8
|
Update supportVertexProgram calls
|
11 years ago |
kaetemi
|
e99bc7ba69
|
Remove old interface
|
11 years ago |
kaetemi
|
256f7ff06c
|
Cleanup unused code
|
11 years ago |
dfighter1985
|
8d57eac3d4
|
Some basic fog.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
6dfc8d0a00
|
Rename
--HG--
branch : multipass-stereo
|
11 years ago |
Quitta
|
1b9f09bc52
|
Added more documentations, this time also the inc/func files are documented and changed the doxygen config file with the help of Botanic
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
kaetemi
|
973215e1d0
|
Cleanup
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
96dc139ddd
|
Merge with default
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
df123d6b89
|
Fix compile errors caused by missing includes
|
11 years ago |
kaetemi
|
d2bc32e598
|
Merge with default
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
cd9baf8f89
|
Cleanup
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
74cff50842
|
Use named indices with wind tree program
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
c766940e75
|
Use named indices for per pixel light vertex program
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
f9c9c1836a
|
Use named uniform indices for lighted vertex program
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
61af565bf9
|
Updated wind tree program container
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
c353121771
|
Use lighted vertex program container for per pixel light program
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
a72f25e763
|
Add container for lighted vertex program
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
ab231ea700
|
Adjust order for meshvp
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
278e19743c
|
Do not use old interface here
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
d5c2a0527d
|
Modify calls in bloom effect
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
5e14dc4458
|
Update veget implementation
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
9d93ae51a3
|
Fixes for d3d
--HG--
branch : multipass-stereo
|
11 years ago |
dfighter1985
|
c6b714299a
|
Instead of their own bool, store enabled features in the features variable as a flag.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
bbb4762b77
|
Move shader description generation to it's own method.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
06d7bd9c74
|
Added alpha test to generated shaders.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
580aa3c775
|
Added the doxygen generated pages + config file in ryzom/tools/server/ryzom_ams_docs
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
f11559bd8a
|
the lib is entirely documented, still webusers and func/inc folders to go :D
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
03b48ea0d3
|
some more documented classes..
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
9a6da85805
|
added extra documentation. Man, writing documentation for the ticket class was quite a job :D
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
9cc28cfc4d
|
Even more docs! writing documentation sucks..
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
d6558b5b0d
|
Fixed some typos with shader generation.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
afb0a74980
|
added more documentation..
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
37c8b096b1
|
Added OpenGL3 as a driver option to the configuration tool.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
21a70b4211
|
Update d3d implementation and add some debugging code
--HG--
branch : multipass-stereo
|
11 years ago |
dfighter1985
|
300cd284d1
|
Generate samplers for Lightmap shader, based on the number of lightmaps. This fixes the weird display of some lightmapped shapes.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
d055a15f29
|
added documentation for assigned, dblayer and forwarded class
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
kaetemi
|
e8d77e23e0
|
Rename of a d3d specific class
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
c6139419ac
|
Partial update of veget vp
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
0a9dfc6aef
|
Update decal vp
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
5fbb220795
|
Update some test code
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
c53aa6958e
|
Small adjustment to landscape vp parameter setting
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
88cbc2f82b
|
Simplify
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
abafc9b1ef
|
Adjust landscape vertex program to use new interface
--HG--
branch : multipass-stereo
|
11 years ago |
dfighter1985
|
36a30e83a0
|
Don't try to render if can't set program up.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
f7fc1afad9
|
Just retested the mailing functionality, which seems to still work proper
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
1acccdb5ef
|
Uniform index caching.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
5ad617efb6
|
Use new program interface for water vertex program
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
32809d646a
|
Set driver parameters
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
64643e564b
|
Some fixes
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
0429e67903
|
Use CSmartPtr for vertex program
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
8f4fe87b7b
|
Set params from storage
--HG--
branch : multipass-stereo
|
11 years ago |
Quitta
|
eb3d992716
|
removed my testing pass out of the config file :D
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
a0d8902d13
|
Added CreatePermissions + handling it while syncing + changed image path to refer to the image locations dir + other fixes
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
kaetemi
|
484a946c60
|
Fix incorrectly removed line
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
b03895f5f3
|
Missed file in last commit
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
e3dead19e4
|
Replace temporary CMaterial code
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
e9444ce36a
|
Implement param storage copy
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
bb625c33bd
|
Flag some TODO's
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
87b24bc4ab
|
Add glsl pixel program for stereo distortion
--HG--
branch : multipass-stereo
|
11 years ago |
dfighter1985
|
16290f7ff9
|
Merging default.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
ac2e087fbf
|
Cleanup abstract gpu program interface
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
0d743d7f37
|
Implement new driver interface in Direct3D driver
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
81876009d3
|
Implement new driver interface in OpenGL driver
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
d1b93ac3d6
|
Expand parameter interface
--HG--
branch : multipass-stereo
|
11 years ago |
dfighter1985
|
882118612d
|
Moved some constants to uniforms.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
77ae38e452
|
Added a very primitive shader caching scheme.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
8d8f53b2f2
|
Biggest push ever! :D Kinda made it possible to only need a few files in the inc/func of the drupal module, all others can be copied of the www version
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
kaetemi
|
e84e08b0f6
|
Reduce function duplication
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
4d1b5d90c0
|
Builtin parameter set functions
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
afe6c16bf3
|
Separate count and size
--HG--
branch : multipass-stereo
|
11 years ago |
Quitta
|
a7cce8b94e
|
Soem fixes + also using the createPermissions() function of the module atm!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
kaetemi
|
05583d134a
|
Cleanup driver interface
--HG--
branch : multipass-stereo
|
11 years ago |
kervala
|
0b9092a547
|
Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)
|
11 years ago |
kervala
|
0ccec811d6
|
Changed: Updated Freetype libraries variable
|
11 years ago |
kervala
|
11dd2bc101
|
Changed: Look for Debug versions of libwww libraries
|
11 years ago |
kervala
|
87ee7fa8d2
|
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
|
11 years ago |
kervala
|
17ebe78cf6
|
Changed: Look for Debug version of freetype and use it for Debug configuration
|
11 years ago |
Quitta
|
59d417efb7
|
Huge update! ingame part should work!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
kaetemi
|
235bfcfd94
|
Add additional set functions
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
f0af3326e6
|
Add gpu program params storage structure
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
ee0396bd6f
|
Implement new gpu program interface in direct3d driver
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
0a3f3f1760
|
Merge with default
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
350b580085
|
Implement new gpu program interface in opengl driver
--HG--
branch : multipass-stereo
|
11 years ago |
kaetemi
|
1fa02cae9e
|
Make gpu programs use abstract gpu program class
--HG--
branch : multipass-stereo
|
11 years ago |
StudioEtrange
|
3121a83730
|
Merged ryzom/ryzomcore into default
|
11 years ago |
kaetemi
|
97c9c26690
|
Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
|
11 years ago |
kervala
|
9dccf31863
|
Removed: S3TC module because not used anymore
|
11 years ago |
kaetemi
|
361b7eab74
|
Fix compile error
|
11 years ago |
kaetemi
|
348594e5fd
|
Merge
|
11 years ago |
kaetemi
|
68f20a3369
|
Use distSqTo instead of distTo
|
11 years ago |
kaetemi
|
082ce825a5
|
Add distSqTo to CAIVector
|
11 years ago |
kaetemi
|
9e1ca3d1d0
|
Comment if-check around commented unused client-side speed limiting code
|
11 years ago |
kaetemi
|
e99bf91b20
|
Move r2 plot item security off the AIS to the EGS and remove hardcoded sheet ids
|
11 years ago |
Quitta
|
d583b2cd8e
|
Ingame version works now too more or less
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
StudioEtrange
|
fec561914d
|
Merged ryzom/ryzomcore into default
|
11 years ago |
kervala
|
89b945bb8c
|
Changed: Minor changes
|
11 years ago |
kervala
|
980b7120c8
|
Changed: Merged code from official client
|
11 years ago |
kervala
|
3c37af1bbc
|
Fixed: Define math.fmod as a function for Lua 5.0
|
11 years ago |
kervala
|
86dfd0350b
|
Fixed: Integer 32 bits conversion to 64 bits pointer
|
11 years ago |
kervala
|
d03c795dd8
|
Changed: Don't use NLMISC includes in NLMISC PCH
|
11 years ago |
kervala
|
ca9597e11e
|
Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style
|
11 years ago |
kervala
|
37fa1fa1ec
|
Fixed: Use 32 bits libraries from Windows SDK in 64 bits
|
11 years ago |
kervala
|
a62b5068f7
|
Changed: Replace atoi by NLMISC::fromString
|
11 years ago |
kervala
|
d196f05b7e
|
Removed: DInput module because it's not used anymore
|
11 years ago |
StudioEtrange
|
d2530f6894
|
Merged ryzom/ryzomcore into default
|
11 years ago |
kervala
|
f2bc8f3c8c
|
Added: Toolchains for Android and iOS
|
11 years ago |
kervala
|
3988120c55
|
Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION
Changed: Look for all installed Windows SDKs
|
11 years ago |
kervala
|
6ddf4786ff
|
Changed: Use /X everytime with MSVC
|
11 years ago |
kervala
|
3a7cee4aa7
|
Changed: Improved MFC module
|
11 years ago |
kervala
|
4a4b9b5ab8
|
Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH
|
11 years ago |
kervala
|
651065e4ed
|
Added: MSVC module to use later
|
11 years ago |
kervala
|
a71f08274e
|
Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS
|
11 years ago |
kervala
|
969d9a057d
|
Changed: Display a message when compiling with NMake and define NMAKE
|
11 years ago |
kervala
|
a52df4c710
|
Changed: Factorized AMD/amd
|
11 years ago |
kervala
|
26679e767e
|
Changed: Allow to put a "revision" file in root directory if .hg directory is not present
|
11 years ago |
kervala
|
3e4a567d6a
|
Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases)
|
11 years ago |
Quitta
|
ae9fcba077
|
show queue works and show ticket info, I think all outgame aspects are covered now!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
f16711c9fa
|
added support group functionality to the drupal module
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
StudioEtrange
|
f10b6613cf
|
** PCH Support for NMake with VS2012
NMAKE-VS2012 Error LNK2011
while NMAKE-VS2010 does not complain
we need to link the pch.obj file
see http://msdn.microsoft.com/en-us/library/3ay26wa2(v=vs.110).aspx
** PCH Support for Ninja
Ninja need to add property
OBJECT_DEPENDS for using PCH
OBJECT_OUTPUTS for create PCH
see http://public.kitware.com/pipermail/cmake-developers/2012-March/003653.html
|
11 years ago |
Quitta
|
46114b65b3
|
some fixes for the real version
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
9362db15c2
|
userlist works, show reply works, also possible to change the permissions of the users (though relying on the libs permission system atm..)
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
d86f3cf755
|
show ticket log works + fixed timestamp issue
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
222da898f1
|
Creating tickets, browsing the profile, replying on tickets and forwarding them is possible!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
931c18cb51
|
Diffuse texenv should work with the material color, not the diffuse color. Also modulate the texenv result with vertex color if applicable. Also add the shader type as comment in the top of the shader.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
0ec8e76d8e
|
helpers class updated!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
9101cd2f6e
|
can display the dashboard html atm
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
34de0b5569
|
Removed renderTriangles2 as the normal render loop is used now.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
a1cf2c640b
|
This too.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
35429fea43
|
Oups forgot this when changing the rendering loop.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
7307d748ea
|
Sometimes shapes have 0 materials?!
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
b94e0dee67
|
reworked the index.php page into the module's _ams_handler function, which will be the main function. Having some serialize/unserialize issues though..
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
6ccc60660a
|
added amsblock and a menu item for the ams page
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
14aea7acc9
|
Removed the debug triangle from the material editor plugin.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
eabc209303
|
Render from the normal loops.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
888812e72d
|
Only validate the shader program after it's set up. Avoids false alarm.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
5bc7ecf799
|
Specular shader is now on GLSL.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
99fa5d938c
|
added help hook, to make it viewable in the help menu, however still unsure if I have to make a page or block or a combination..
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
86482ed82f
|
Fixed some shader compile errors.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
0fa17cb47d
|
auto login when calling the page from ingame (should work)...
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
ed23ec247d
|
Render lightmaps with GLSL.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
502cb9fadc
|
taking away the functions checkUser, checkEmail, checkpassword out of the module, the webuser/user handles this!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
609d2cf252
|
added hook_user_insert, now the user gets also added to the shard + a ticket_user entry gets created that couples the drupal id to it
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
4dd70fd8e7
|
reworked config file to work with drupal and added extra config fields to the configuration form in the module
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
3be11e8b93
|
including the module problem
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
4f2219eb7a
|
started working on the module + small addition
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
0ab6322955
|
More fixed functionality pipeline disabled with conditional build.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
29b5876162
|
small bug fix
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
dfighter1985
|
997a231bff
|
Conditionally build some deprecated functions. Also little adjustment to the shader texenv generator.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
c74e279282
|
Some settings for the normal shaded material.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
e740fd4aeb
|
Don't crash when releasing.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
d67640dab6
|
Render with GLSL. Long way to go.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
169ee413df
|
Redundant cloud shader code.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
f77bcf6981
|
Generate cloud shader.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
2c84b164ee
|
Water shader generation.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Quitta
|
3dc513e868
|
ingame dashboard also fixed!
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
af6c57ff52
|
dashboard added that shows the newest ticket, the amount of tickets in your todo list and tickets waiting on YOUR response
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
9647d6ec8f
|
added images in the ingame part, added config properties & fixed time bug in queues page
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Quitta
|
a19e833772
|
Fancified outgame show info page and made ingame info page
--HG--
branch : quitta-gsoc-2013
|
11 years ago |
Thibaut Girka
|
ea8a845ab9
|
Add support for LibVR
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
7782576dfc
|
Merge with default
--HG--
branch : multipass-stereo
|
11 years ago |
Quitta
|
75b645264d
|
ticket showing works outgame, but needs fancyfying :D
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
3790739f49
|
updated, stroing to the db seems to work!
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
2af50cb421
|
ticket_info class done, however I think I better add a field to the Ticket DB, instead the way I do it now..
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
54d71fd26d
|
ticket_info class almost done
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
bdbbb393cd
|
Finaly got it to working again..
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
kervala
|
6d10e3189c
|
Changed: Formatting
|
12 years ago |
kervala
|
881912fa34
|
Fixed: Crash when trying to display a missing texture
|
12 years ago |
Quitta
|
b1926fbec3
|
added language support however, something is broken :/
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
dfighter1985
|
750e7b5e8e
|
A little explanation after I successfully decyphered this.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Quitta
|
1a81a7810f
|
mailing refactored
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
dfighter1985
|
d64dd4f23f
|
Generate shader for per-pixel without specular.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Quitta
|
508545248a
|
#mailing languages setup
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
70732ffd42
|
rewrote language handling + language is now stored in the db and the value is based on the users language flag clicked (or default) or the ingame language
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
0e0ce112bb
|
receive messages setting is added to the ingame layout
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
dfighter1985
|
6b3b8855ee
|
Generate Per-Pixel Lighting shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Quitta
|
df4d97fa98
|
Inagme layout for modifying group email stuff is fixed
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
7f8c0f8380
|
Fixed sgroup_liist ingame layout..
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
dfighter1985
|
2ca79259ce
|
More work on specular shader generation. Hopefully now it's right.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
1414f4d3c1
|
Little bit of refactoring.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
12df2fd71c
|
Generate specular shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Quitta
|
3bebfe4492
|
put mail cron related debug info into a log file specified in config.php
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
Quitta
|
ebce7ae90c
|
fixing a lot of mail bug problems
--HG--
branch : quitta-gsoc-2013
|
12 years ago |
dfighter1985
|
69cc5e48ed
|
Lightmap shader generator.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Quitta
|
d1c1740741
|
Added encryption by using the openSSL functionality to encrypt the email passwords in the db
--HG--
branch : quitta-gsoc-2013
|
12 years ago |