kervala
87ee7fa8d2
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
2013-09-08 12:52:00 +02:00
kervala
17ebe78cf6
Changed: Look for Debug version of freetype and use it for Debug configuration
2013-09-08 10:26:23 +02:00
kaetemi
235bfcfd94
Add additional set functions
...
--HG--
branch : multipass-stereo
2013-09-08 01:49:34 +02:00
kaetemi
f0af3326e6
Add gpu program params storage structure
...
--HG--
branch : multipass-stereo
2013-09-08 01:36:01 +02:00
kaetemi
ee0396bd6f
Implement new gpu program interface in direct3d driver
...
--HG--
branch : multipass-stereo
2013-09-07 22:00:07 +02:00
kaetemi
0a3f3f1760
Merge with default
...
--HG--
branch : multipass-stereo
2013-09-07 21:36:08 +02:00
kaetemi
350b580085
Implement new gpu program interface in opengl driver
...
--HG--
branch : multipass-stereo
2013-09-07 21:30:40 +02:00
kaetemi
1fa02cae9e
Make gpu programs use abstract gpu program class
...
--HG--
branch : multipass-stereo
2013-09-07 20:41:07 +02:00
StudioEtrange
3121a83730
Merged ryzom/ryzomcore into default
2013-09-07 20:16:17 +02:00
kaetemi
97c9c26690
Add abstract gpu program and source classes
...
--HG--
branch : multipass-stereo
2013-09-07 18:33:18 +02:00
kervala
9dccf31863
Removed: S3TC module because not used anymore
2013-09-07 17:01:06 +02:00
kaetemi
361b7eab74
Fix compile error
2013-09-07 16:05:28 +02:00
kaetemi
348594e5fd
Merge
2013-09-07 15:54:36 +02:00
kaetemi
68f20a3369
Use distSqTo instead of distTo
2013-09-07 15:53:17 +02:00
kaetemi
082ce825a5
Add distSqTo to CAIVector
2013-09-07 15:53:10 +02:00
kaetemi
9e1ca3d1d0
Comment if-check around commented unused client-side speed limiting code
2013-09-07 15:53:00 +02:00
kaetemi
e99bf91b20
Move r2 plot item security off the AIS to the EGS and remove hardcoded sheet ids
2013-09-07 15:51:30 +02:00
StudioEtrange
fec561914d
Merged ryzom/ryzomcore into default
2013-09-07 01:39:45 +02:00
kervala
89b945bb8c
Changed: Minor changes
2013-09-06 15:00:35 +02:00
kervala
980b7120c8
Changed: Merged code from official client
2013-09-06 15:00:01 +02:00
kervala
3c37af1bbc
Fixed: Define math.fmod as a function for Lua 5.0
2013-09-06 14:53:40 +02:00
kervala
86dfd0350b
Fixed: Integer 32 bits conversion to 64 bits pointer
2013-09-06 14:51:21 +02:00
kervala
d03c795dd8
Changed: Don't use NLMISC includes in NLMISC PCH
2013-09-06 14:50:19 +02:00
kervala
ca9597e11e
Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style
2013-09-06 14:49:12 +02:00
kervala
37fa1fa1ec
Fixed: Use 32 bits libraries from Windows SDK in 64 bits
2013-09-06 14:48:21 +02:00
kervala
a62b5068f7
Changed: Replace atoi by NLMISC::fromString
2013-09-06 14:45:48 +02:00
kervala
d196f05b7e
Removed: DInput module because it's not used anymore
2013-09-06 14:44:03 +02:00
StudioEtrange
d2530f6894
Merged ryzom/ryzomcore into default
2013-09-06 14:14:51 +02:00
kervala
f2bc8f3c8c
Added: Toolchains for Android and iOS
2013-09-06 13:38:19 +02:00
kervala
3988120c55
Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION
...
Changed: Look for all installed Windows SDKs
2013-09-06 13:35:43 +02:00
kervala
6ddf4786ff
Changed: Use /X everytime with MSVC
2013-09-06 09:30:54 +02:00
kervala
3a7cee4aa7
Changed: Improved MFC module
2013-09-06 09:26:23 +02:00
kervala
4a4b9b5ab8
Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH
2013-09-06 09:02:48 +02:00
kervala
651065e4ed
Added: MSVC module to use later
2013-09-06 09:01:42 +02:00
kervala
a71f08274e
Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS
2013-09-06 09:00:33 +02:00
kervala
969d9a057d
Changed: Display a message when compiling with NMake and define NMAKE
2013-09-06 08:58:36 +02:00
kervala
a52df4c710
Changed: Factorized AMD/amd
2013-09-06 08:58:02 +02:00
kervala
26679e767e
Changed: Allow to put a "revision" file in root directory if .hg directory is not present
2013-09-06 08:44:57 +02:00
kervala
3e4a567d6a
Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases)
2013-09-06 08:43:44 +02:00
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
2013-09-05 17:18:01 +02:00
Thibaut Girka
ea8a845ab9
Add support for LibVR
...
--HG--
branch : multipass-stereo
2013-08-28 08:08:22 +02:00
kaetemi
7782576dfc
Merge with default
...
--HG--
branch : multipass-stereo
2013-09-07 16:25:45 +02:00
kervala
6d10e3189c
Changed: Formatting
2013-08-26 12:34:04 +02:00
kervala
881912fa34
Fixed: Crash when trying to display a missing texture
2013-08-26 12:33:26 +02:00
kervala
f680e3943d
Changed: Minor formatting
2013-08-05 10:34:38 +02:00
kervala
a41ba055a5
Fixed: PCH with Qt 5 and CMake 2.8.11
2013-08-05 10:32:17 +02:00
kervala
c792c423db
Fixed: X64 not detected with CMake 2.8.11
2013-08-05 10:31:23 +02:00
kervala
2c7f848c83
Changed: Tabulations to spaces
2013-08-05 10:30:40 +02: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
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
f5a8bd2785
Missed one
2013-07-28 18:22:35 +02:00
kaetemi
692dafacfb
Fix a typo
2013-07-28 18:19:51 +02:00
kaetemi
343cc325b2
Merge
2013-07-28 18:04:13 +02:00
kaetemi
72fabe141e
Fix another compile error
2013-07-28 18:02:43 +02:00
kaetemi
2670e34621
Can't include this here. A light header with all of these maximum constants might be handy
2013-07-28 17:59:05 +02:00
kaetemi
cf42b3473f
Fix a compile error
2013-07-28 17:49:28 +02:00
kaetemi
0163a508c2
Merge
2013-07-28 09:17:58 +02:00
kaetemi
32082e854a
Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:DIRECTION"")
...
--HG--
branch : kaetemi-optimize
2013-07-28 09:06:11 +02:00
kaetemi
16783449a7
Avoid redundant per-frame calls to getDbProp in outpost.xml and outpost.lua
...
--HG--
branch : kaetemi-optimize
2013-07-28 08:55:28 +02:00
kaetemi
70ea479714
Make _ShowReticleLeaf static
...
--HG--
branch : kaetemi-optimize
2013-07-28 08:35:40 +02:00
kaetemi
ed912ab3ae
Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:CDB_INIT_IN_PROGRESS")
...
--HG--
branch : kaetemi-optimize
2013-07-28 08:22:53 +02:00
kaetemi
1fc4277cf4
Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:MK_MOVE")
...
--HG--
branch : kaetemi-optimize
2013-07-28 08:19:54 +02:00
kaetemi
cc2465199c
Avoid redundant per-frame calls to getDbProp("UI:SAVE:USER_CHAR_FADE")
...
--HG--
branch : kaetemi-optimize
2013-07-28 08:16:02 +02:00
kaetemi
23ac008cf1
Avoid redundant per-frame calls to getDbProp("SERVER:WEATHER:VALUE")
...
--HG--
branch : kaetemi-optimize
2013-07-28 08:13:19 +02:00
kaetemi
171faa31fb
Avoid redundant calls to getDbProp("UI:SAVE:INSCENE:...")
...
--HG--
branch : kaetemi-optimize
2013-07-28 07:55:16 +02:00
kaetemi
477e9e8ef1
Avoid redundant calls to getDbProp in CEntityCL
...
--HG--
branch : kaetemi-optimize
2013-07-28 06:45:43 +02:00
kaetemi
aeb9f4d945
Avoid redundant per-frame calls to getDbProp("UI:ENTITY:GUILD:#:ICON")
...
--HG--
branch : kaetemi-optimize
2013-07-28 05:48:59 +02:00
kaetemi
13fc6ffb58
Avoid per-frame 'set' action handler in map.xml when opening the respawn map
...
--HG--
branch : kaetemi-optimize
2013-07-28 05:21:05 +02:00
kaetemi
22710e12bd
Avoid per-frame 'set' action handler in config.xml for blending day and night color
...
--HG--
branch : kaetemi-optimize
2013-07-28 05:21:00 +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
19a8b48355
Avoid redundant per-frame calls to getDbProp("SERVER:USER:DEFAULT_WEIGHT_HANDS")
...
--HG--
branch : kaetemi-optimize
2013-07-28 05:10:06 +02:00
kaetemi
a75bd5d23a
Avoid redundant per-frame calls to getDbProp in CNetManager
...
--HG--
branch : kaetemi-optimize
2013-07-28 05:10:06 +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
fb00acf329
Avoid redundant per-frame calls to getDbValue32(toString("SERVER:CHARACTER_INFO:CHARACTERISTICS%d:VALUE", i))
...
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:32 +02:00
kaetemi
5f80a90a1c
Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:FPS", false)
...
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:32 +02:00
kaetemi
2a57f6c647
Avoid redundant per-frame calls to getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false)
...
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:32 +02:00
kaetemi
0897092fe3
Avoid redundant per-frame calls to getDbProp("UI:SAVE:SHOW_RETICLE")
...
--HG--
branch : kaetemi-optimize
2013-07-28 00:29:25 +02:00
kervala
8577277bfd
Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method)
2013-07-26 09:33:32 +02:00
Cédric OCHS
1a83892ec6
Merged in StudioEtrange/ryzomcore/StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398 (pull request #19 )
...
Fix some problems with space char in path on windows
2013-07-26 08:07:42 +02:00
kaetemi
f6ee2707ea
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-25 21:18:52 +02:00
kaetemi
55a00fd518
Don't do EOL changes for database.xml and msg.xml, causes checksum difference
2013-07-25 18:06:32 +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
StudioEtrange
0efa7c8aee
PCHSupport.cmake edited online with Bitbucket
...
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
2013-07-24 21:57:52 +00:00
StudioEtrange
744267c63b
Fix some probleme with spaces in path on windows
...
PCHSupport.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
2013-07-24 20:53:33 +00:00
StudioEtrange
f18dd1f351
Error passing wrong version number to msvc linker
...
ENV: WinSDK8 VS2012 Compilation in 64 Bits
ERROR: error when linking client
CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012
see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx
--HG--
branch : StudioEtrange/error-passing-wrong-version-number-to-ms-1374694351376
2013-07-24 19:32:41 +00:00
StudioEtrange
885a39ad7e
nel.cmake edited online with Bitbucket
...
--HG--
branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640
2013-07-24 19:31:10 +00:00
StudioEtrange
cc30e3b8f8
ENV:
...
WinSDK8
VS2012
Compilation in 64 Bits
ERROR:
error when linking client
CAUSE:
msvc link support only major and minor version number.
Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012
see https://bugs.php.net/bug.php?id=63537
see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx
--HG--
branch : StudioEtrange/env-winsdk8-vs2012-compilation-in-64-bit-1374693753244
2013-07-24 19:22:38 +00: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
kaetemi
179669116c
EOL
2013-07-24 20:51:26 +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
5831150471
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-19 18:12:08 +02:00
kaetemi
347d4e0940
Some necessary ryzom tools did not build when client and server were unchecked
2013-07-19 18:11:31 +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
8323f95e22
Fix issue #48 , landscape quality issues caused by incorrect defaults
2013-07-18 18:22:28 +02:00
kaetemi
9f185ce38d
Fix an error in 3ds Max with the material script
2013-07-18 18:15:53 +02:00
kaetemi
d5329b1ac8
Fix bad includes in snowballs, re #43
...
--HG--
branch : multipass-stereo
2013-07-06 21:58:26 +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
0036b5c619
Added Win32 and Apple LibOVR build paths
...
--HG--
branch : multipass-stereo
2013-07-06 19:55:08 +02:00
Michael Witrant
fa4cbb00f7
Fixed Linux build failure because a temporary pointer was passed, ref #43
...
--HG--
branch : multipass-stereo
2013-07-06 19:34:28 +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
d1051ce5c9
Handle head orientation in ryzom client, ref #43
...
--HG--
branch : multipass-stereo
2013-07-05 04:09:53 +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
ffe05eae62
Move some more updates out of the render code, see #43
...
--HG--
branch : multipass-stereo
2013-07-05 00:47:17 +02:00
kaetemi
263e506551
Some necessary changes to camera setting, re #43
...
--HG--
branch : multipass-stereo
2013-07-05 00:17:09 +02:00
kaetemi
5ac4a23bd3
Some more cleanup
...
--HG--
branch : multipass-stereo
2013-07-04 23:41:46 +02:00
kaetemi
93d856b394
Make oversize screenshots be perfectly seamless
...
--HG--
branch : multipass-stereo
2013-07-04 23:11:15 +02:00
kaetemi
bf8ad82e21
Pull weather updates out of scene render
...
--HG--
branch : multipass-stereo
2013-07-04 22:39:05 +02:00
kaetemi
5c568c6ea0
Correctly apply bloom on oversize screenshots
...
--HG--
branch : multipass-stereo
2013-07-04 22:26:31 +02:00
kaetemi
c87403ecb9
Refactor fulldetail override
...
--HG--
branch : multipass-stereo
2013-07-04 22:18:19 +02:00
kaetemi
25f5bccfe6
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-04 21:12:34 +02:00
kaetemi
352ee42571
Distort 2D gui as well, ref #43
...
--HG--
branch : multipass-stereo
2013-07-04 21:12:11 +02:00
Jan Boon
46c4cc7aa4
Merged in botanic/rc-botanic-webdev (pull request #13 )
...
warning and path fix's
2013-07-04 21:07:21 +02:00
kaetemi
6cfc75a1a2
Correctly synchronize some more animation in snowballs, re #43
...
--HG--
branch : multipass-stereo
2013-07-04 20:43:49 +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
8c86b05d5b
Merge with default
...
--HG--
branch : multipass-stereo
2013-07-03 03:17:29 +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
5bae110c2c
Properly scale seconds per frame graph in snowballs
...
--HG--
branch : multipass-stereo
2013-07-02 18:43:28 +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
d45813adfc
Workaround in snowballs for fullscreen bug with opengl driver
...
--HG--
branch : multipass-stereo
2013-07-02 01:08:49 +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
85977755de
Allow turning off bloom in snowballs
...
--HG--
branch : multipass-stereo
2013-07-01 20:38:18 +02:00
kaetemi
fe91e2a751
Cleanup
...
--HG--
branch : multipass-stereo
2013-07-01 20:15:55 +02:00
kaetemi
fba17e4553
Allow linking debug and release with same mysql lib if no specific debug lib.
...
--HG--
branch : multipass-stereo
2013-07-01 18:45:43 +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
bf16ccd320
Separate some camera related functions, ref #43
...
--HG--
branch : multipass-stereo
2013-06-27 04:11:09 +02:00