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
|
e6658bdef0
|
Update decal vp
|
2013-09-10 17:01:33 +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
|
e5423d5a3a
|
Changed: Look for Debug versions of libwww libraries
|
2013-09-08 12:53:35 +02:00 |
|
kervala
|
811dca71ee
|
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
|
2013-09-08 12:52:00 +02:00 |
|
kervala
|
d5baba13e8
|
Changed: Look for Debug version of freetype and use it for Debug configuration
|
2013-09-08 10:26:23 +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
|
fca15bd084
|
Merge with default
|
2013-09-07 21:36:08 +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 |
|
StudioEtrange
|
3721135484
|
Merged ryzom/ryzomcore into default
|
2013-09-07 20:16:17 +02:00 |
|
kaetemi
|
d54774f978
|
Add abstract gpu program and source classes
|
2013-09-07 18:33:18 +02:00 |
|
kervala
|
6489e9e04f
|
Removed: S3TC module because not used anymore
|
2013-09-07 17:01:06 +02:00 |
|
kaetemi
|
ddbb65bd34
|
Fix compile error
|
2013-09-07 16:05:28 +02:00 |
|
kaetemi
|
b5b170ad84
|
Merge
|
2013-09-07 15:54:36 +02:00 |
|
kaetemi
|
576e508860
|
Use distSqTo instead of distTo
|
2013-09-07 15:53:17 +02:00 |
|
kaetemi
|
9d3bb1c76b
|
Add distSqTo to CAIVector
|
2013-09-07 15:53:10 +02:00 |
|
kaetemi
|
1d1fb14fc8
|
Comment if-check around commented unused client-side speed limiting code
|
2013-09-07 15:53:00 +02:00 |
|
kaetemi
|
035fd1d40a
|
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
|
93f9ca83f6
|
Merged ryzom/ryzomcore into default
|
2013-09-07 01:39:45 +02:00 |
|
kervala
|
8d27acc654
|
Changed: Minor changes
|
2013-09-06 15:00:35 +02:00 |
|
kervala
|
2a0d588cb5
|
Changed: Merged code from official client
|
2013-09-06 15:00:01 +02:00 |
|
kervala
|
a886559bf6
|
Fixed: Define math.fmod as a function for Lua 5.0
|
2013-09-06 14:53:40 +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 |
|
kervala
|
b16d904bb2
|
Fixed: Use 32 bits libraries from Windows SDK in 64 bits
|
2013-09-06 14:48:21 +02:00 |
|
kervala
|
1560df430a
|
Changed: Replace atoi by NLMISC::fromString
|
2013-09-06 14:45:48 +02:00 |
|
kervala
|
bfc65e70e7
|
Removed: DInput module because it's not used anymore
|
2013-09-06 14:44:03 +02:00 |
|
StudioEtrange
|
a4be8d565b
|
Merged ryzom/ryzomcore into default
|
2013-09-06 14:14:51 +02:00 |
|
kervala
|
08cf590b30
|
Added: Toolchains for Android and iOS
|
2013-09-06 13:38:19 +02:00 |
|
kervala
|
b26bf1a265
|
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
|
8cd8dcee5e
|
Changed: Use /X everytime with MSVC
|
2013-09-06 09:30:54 +02:00 |
|
kervala
|
9e042a5c67
|
Changed: Improved MFC module
|
2013-09-06 09:26:23 +02:00 |
|
kervala
|
b87aac1cc0
|
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
|
c87c99f6b2
|
Added: MSVC module to use later
|
2013-09-06 09:01:42 +02:00 |
|
kervala
|
5f4831f8b8
|
Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS
|
2013-09-06 09:00:33 +02:00 |
|
kervala
|
3833a51003
|
Changed: Display a message when compiling with NMake and define NMAKE
|
2013-09-06 08:58:36 +02:00 |
|
kervala
|
30a8cc1fe3
|
Changed: Factorized AMD/amd
|
2013-09-06 08:58:02 +02:00 |
|
kervala
|
3c3e25d523
|
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
|
ff444f42fa
|
Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases)
|
2013-09-06 08:43:44 +02:00 |
|
StudioEtrange
|
d951e1c452
|
** 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
|
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
|
33115f61b2
|
Changed: Minor formatting
|
2013-08-05 10:34:38 +02:00 |
|
kervala
|
f9b70173ce
|
Fixed: PCH with Qt 5 and CMake 2.8.11
|
2013-08-05 10:32:17 +02:00 |
|
kervala
|
e74913f589
|
Fixed: X64 not detected with CMake 2.8.11
|
2013-08-05 10:31:23 +02:00 |
|
kervala
|
a2f91ce484
|
Changed: Tabulations to spaces
|
2013-08-05 10:30:40 +02: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 |
|
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
|
7a8db939ad
|
Missed one
|
2013-07-28 18:22:35 +02:00 |
|