kaetemi
|
f4dda130a6
|
Clean translation diffs from OLDVALUE comments before merge, issue #116, patch provided by Łukasz K
|
2014-02-12 16:35:07 +01:00 |
|
kaetemi
|
4df290147b
|
Fix make_merge_wk for uxt
|
2014-02-10 16:38:04 +01:00 |
|
kaetemi
|
b1c485fde0
|
Cleanup
|
2014-02-09 22:35:01 +01:00 |
|
kaetemi
|
451a82e59e
|
Cleanup
|
2014-02-09 22:21:30 +01:00 |
|
kaetemi
|
ccf99f4f8e
|
Merge
|
2014-02-09 22:15:33 +01:00 |
|
kaetemi
|
4f2a1b7db2
|
Fix the bug that caused the shape exporter to crash
|
2014-02-09 22:12:44 +01:00 |
|
kaetemi
|
90c9028170
|
Cleanup
|
2014-02-09 21:53:49 +01:00 |
|
kaetemi
|
ada9e8da5d
|
Fix export of NeL Flare
|
2014-02-09 17:26:26 +01:00 |
|
Matthew Lagoe
|
3f04907c31
|
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
|
bd206db383
|
Remove pacs.packed_prims when done
|
2014-02-09 02:42:45 +01:00 |
|
kaetemi
|
9d5c9019b5
|
Move visual slot tab to separate directory
|
2014-02-09 02:40:14 +01:00 |
|
kaetemi
|
13e3849c89
|
Fix typo
|
2014-02-08 23:57:39 +01:00 |
|
kaetemi
|
6ac551cf60
|
Implement skip for rbank process
|
2014-02-08 23:43:42 +01:00 |
|
kaetemi
|
f085e226c6
|
Implement skip for ig elevation
|
2014-02-08 22:54:25 +01:00 |
|
kaetemi
|
bd335d80c4
|
Implement skip for zone dependency process
|
2014-02-08 22:23:24 +01:00 |
|
kaetemi
|
3d2c60aac6
|
Get properties search paths from python variable
|
2014-02-08 22:07:33 +01:00 |
|
kaetemi
|
af65ca5c62
|
Fix lightmap optimize skip
|
2014-02-08 21:09:35 +01:00 |
|
kaetemi
|
38e353b5c6
|
Implement skip for coarse mesh build process
|
2014-02-08 21:02:24 +01:00 |
|
kaetemi
|
a0f86ebd39
|
Implement skip for shape lightmap optimize build process
|
2014-02-08 20:02:57 +01:00 |
|
kaetemi
|
01a115899b
|
Implement skip for interface build process
|
2014-02-08 19:44:52 +01:00 |
|
kaetemi
|
3f492d8b20
|
Add script to automatically merge translation wk files
|
2014-02-08 17:36:17 +01:00 |
|
kaetemi
|
6371fc324d
|
Add script to make and merge all translation diffs
|
2014-02-08 17:10:34 +01:00 |
|
kaetemi
|
6b19d30de0
|
Add short translation procedure readme
|
2014-02-08 17:01:13 +01:00 |
|
kaetemi
|
8dac3b82f3
|
Merge
|
2014-02-08 16:26:01 +01:00 |
|
kaetemi
|
74984f768a
|
Improve leveldesign_dev.bat
|
2014-02-08 16:24:56 +01:00 |
|
botanic
|
e728daa7cd
|
Add CMAKE option and NVIDIA PerfHUD support
|
2014-02-07 19:49:40 -08:00 |
|
kaetemi
|
972d26ddde
|
Adjust default paths
|
2014-02-08 01:34:16 +01:00 |
|
kaetemi
|
b785192a5e
|
Add clause translation tool scripts
|
2014-02-08 01:03:01 +01:00 |
|
kaetemi
|
762a3b2655
|
Add translation tool scripts
|
2014-02-08 00:23:42 +01:00 |
|
kaetemi
|
62a4bec18c
|
Add translation directory to pipeline setup
|
2014-02-08 00:03:56 +01:00 |
|
kaetemi
|
50f0ebbb41
|
Copy refs in client install
|
2014-02-07 19:35:55 +01:00 |
|
kaetemi
|
ef03dcd294
|
Add refs to patch xml
|
2014-02-07 18:30:55 +01:00 |
|
kaetemi
|
9c9811f1b3
|
Reorder pipeline scripts
|
2014-02-07 18:10:09 +01:00 |
|
kaetemi
|
7736c5757c
|
Add world edit data install directory to pipeline setup
|
2014-02-07 18:04:23 +01:00 |
|
kaetemi
|
f3b6ab7052
|
Typo
|
2014-02-07 17:23:34 +01:00 |
|
kaetemi
|
0d0907aa08
|
Add build shadow skin to shape process
|
2014-02-07 17:16:40 +01:00 |
|
kaetemi
|
3fa19d91a5
|
Generate correct client.cfg data path for dev client
|
2014-02-07 15:26:15 +01:00 |
|
kaetemi
|
2619033972
|
Replace shard install script
|
2014-02-07 14:53:47 +01:00 |
|
kaetemi
|
680dfbd738
|
Remove duplicate tool
--HG--
branch : build_pipeline_py
|
2014-02-07 02:17:42 +01:00 |
|
kaetemi
|
40fe633dbe
|
Fix thread lockup in zone lighter
--HG--
branch : build_pipeline_py
|
2014-02-07 02:01:23 +01:00 |
|
kaetemi
|
5144770d9d
|
Backed out changeset: de1de16eef3b
--HG--
branch : build_pipeline_py
|
2014-02-07 01:49:39 +01:00 |
|
kaetemi
|
7219073bdc
|
Include world editor files directory in prim export
--HG--
branch : build_pipeline_py
|
2014-02-07 01:49:16 +01:00 |
|
kaetemi
|
1a0ee41780
|
Improve debug message
--HG--
branch : build_pipeline_py
|
2014-02-07 01:49:01 +01:00 |
|
kaetemi
|
31d5b54e74
|
Let prim checker only open files with ig extension
--HG--
branch : build_pipeline_py
|
2014-02-07 01:01:36 +01:00 |
|
kaetemi
|
240576ab9c
|
Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?)
--HG--
branch : build_pipeline_py
|
2014-02-07 01:01:19 +01:00 |
|
kaetemi
|
f5c30593c8
|
Merge with default
--HG--
branch : build_pipeline_py
|
2014-02-07 00:11:12 +01:00 |
|
kaetemi
|
2c4ca0d915
|
Include world editor files in rbank process, part of what caused water not to build
--HG--
branch : build_pipeline_py
|
2014-02-06 23:58:18 +01:00 |
|
kaetemi
|
32ca8d61fe
|
Add more paths to the build gamedata configuration
--HG--
branch : build_pipeline_py
|
2014-02-06 23:49:54 +01:00 |
|
kaetemi
|
439ba0713e
|
Build pacs prim list txt outside repository
--HG--
branch : build_pipeline_py
|
2014-02-06 22:10:56 +01:00 |
|
kaetemi
|
dfb2815bcd
|
Add separate target directory for shard data
--HG--
branch : build_pipeline_py
|
2014-02-06 21:44:14 +01:00 |
|
kaetemi
|
6f7e5e7c72
|
Update default paths
--HG--
branch : build_pipeline_py
|
2014-02-06 20:31:43 +01:00 |
|
kaetemi
|
11c9f6a91b
|
Merge with default
--HG--
branch : build_pipeline_py
|
2014-02-06 20:16:18 +01:00 |
|
kaetemi
|
48d2c22639
|
Merge with default
--HG--
branch : kaetemi-cleanup
|
2014-02-06 19:54:15 +01:00 |
|
kaetemi
|
89a2a2ce99
|
Do not select stereo display debugger when HMD is set to Auto in Snowballs
|
2014-02-04 20:52:15 +01:00 |
|
kaetemi
|
ca31e78f7c
|
Remove georges4cvs feature
|
2014-02-03 01:25:02 +01:00 |
|
kaetemi
|
bcb2f48940
|
Remove georges4cvs feature
|
2014-02-03 00:16:35 +01:00 |
|
kervala
|
c9a9839ce6
|
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
|
1c50b1f943
|
Fixed: Compilation under Mac OS X 10.9
|
2014-01-30 14:43:51 +01:00 |
|
botanic
|
e995784886
|
Fixed typo issue 60
|
2014-01-28 11:41:26 -08:00 |
|
botanic
|
71b0f9ae92
|
Issue #60
does seem to work better when latency is high
|
2014-01-26 03:20:00 -08:00 |
|
botanic
|
60495f79ac
|
Merge
|
2014-01-26 02:58:42 -08:00 |
|
botanic
|
b6441edf2d
|
Fix for Issue #94
|
2014-01-26 02:57:59 -08:00 |
|
kervala
|
a5a9532a13
|
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
|
16dbe48ed5
|
use NEL CFile function for file test
--HG--
branch : lightmap_optimizer_port_to_linux
|
2014-01-25 17:09:07 +01:00 |
|
liria
|
a6d9521ae6
|
Merged default into lightmap_optimizer_port_to_linux
--HG--
branch : lightmap_optimizer_port_to_linux
|
2014-01-25 13:52:12 +01:00 |
|
liria
|
54c53255b1
|
make the programm compile on linux plateform
--HG--
branch : lightmap_optimizer_port_to_linux
|
2014-01-25 11:50:14 +01:00 |
|
kervala
|
09e3471f1b
|
Fixed: Compilation with freetype
|
2014-01-25 10:45:57 +01:00 |
|
kervala
|
43c48ad36a
|
Changed: Enable ig_elevation everywhere (patch by Liria)
|
2014-01-23 13:08:11 +01:00 |
|
liria
|
41a475b8f3
|
Merged default into ig_elevaton_port_to_linux
--HG--
branch : ig_elevaton_port_to_linux
|
2014-01-23 00:49:56 +01:00 |
|
liria
|
ac48221c8b
|
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
--HG--
branch : ig_elevaton_port_to_linux
|
2014-01-22 23:49:11 +00:00 |
|
kaetemi
|
207d7323ce
|
Fix Qt build on Windows
|
2014-01-21 12:50:23 +01:00 |
|
Nimetu
|
ea5a36b105
|
Remove tooltip debug message from logs
--HG--
branch : misc-patches
|
2014-01-04 00:20:05 +02:00 |
|
Nimetu
|
4c2531474a
|
Fix typo (issue #70)
--HG--
branch : misc-patches
|
2014-01-03 19:51:50 +02:00 |
|
Nimetu
|
3cd6ecdb82
|
Add deadlock counter to prevent endless loop (issue #73)
--HG--
branch : misc-patches
|
2014-01-03 19:11:49 +02:00 |
|
botanic
|
935ea04c58
|
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
|
db3a789ab4
|
un kaetemi'd the pipeline
|
2013-12-30 08:59:59 -08:00 |
|
botanic
|
2c0d64e8ff
|
added single bat file to run whole pipeline
|
2013-12-29 23:25:09 -08:00 |
|
kervala
|
6196077160
|
Changed: #85 Compilation with STLport + EOL
|
2013-11-22 11:25:53 +01:00 |
|
kervala
|
986edb216f
|
Fixed: #85 Compilation with STLport
|
2013-11-22 11:25:12 +01:00 |
|
kervala
|
c718ff693a
|
Fixed: Assign instead of comparison
|
2013-11-22 11:20:07 +01:00 |
|
kervala
|
b219623129
|
Fixed: Verbose warning
|
2013-11-13 22:23:57 +01:00 |
|
kervala
|
b96ad682f5
|
Fixed: Compilation under Mac OS X
|
2013-11-13 22:23:24 +01:00 |
|
kervala
|
a45bbd96c5
|
Fixed: Warning with clang
|
2013-11-13 22:23:02 +01:00 |
|
kervala
|
af1721a0a4
|
Changed: Don't need to change _PolygonSmooth if value is the same
|
2013-11-13 21:55:14 +01:00 |
|
kervala
|
166607f644
|
Changed: Implement VSync under Mac OS X
|
2013-11-13 21:54:45 +01:00 |
|
kervala
|
73196fe7fe
|
Changed: Replace strlwr by toLower
|
2013-11-13 21:53:21 +01:00 |
|
kervala
|
b46c316940
|
Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
|
2013-11-13 21:52:21 +01:00 |
|
kervala
|
dda2215ed8
|
Fixed: Wrong algorithm
|
2013-11-13 21:46:42 +01:00 |
|
kervala
|
6b3b85962a
|
Changed: EOL
|
2013-11-13 21:45:06 +01:00 |
|
kervala
|
d8a6c9f966
|
Fixed: Warning with clang
|
2013-11-13 21:40:41 +01:00 |
|
kervala
|
36a537a88e
|
Changed: Replaced atof by fromString
|
2013-11-13 21:37:28 +01:00 |
|
kervala
|
b7082644f0
|
Changed: Updated OpenGL registry
|
2013-11-13 20:31:08 +01:00 |
|
Botanic
|
6dfafa7ae1
|
Merge
|
2013-11-02 16:35:26 -07:00 |
|
sfb
|
59abfb8a1d
|
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-28 12:58:08 -05:00 |
|
sfb
|
df7110d2d6
|
Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-28 11:24:31 -05:00 |
|
sfb
|
d86f150caa
|
Bad merge resolution, fixed the build files that merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-28 11:24:02 -05:00 |
|
Botanic
|
7381de073e
|
fixed bad merge
|
2013-10-26 00:57:50 -07:00 |
|
Botanic
|
057fe3e0f7
|
Merge
|
2013-10-26 00:50:56 -07:00 |
|
sfb
|
892ed1ed3d
|
merge from default
--HG--
branch : gsoc2011-worldeditorqt
|
2013-10-23 12:08:09 -05:00 |
|
Matt Raykowski
|
0001719d99
|
Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
|
2013-10-19 16:02:52 -05:00 |
|
kaetemi
|
563afd027c
|
Fix #67 bad NELID in vertex program parser
|
2013-10-06 20:06:53 +02:00 |
|
kervala
|
eb3c58cce9
|
Fixed: Use multiarch library path under Linux
|
2013-09-30 09:11:35 +02:00 |
|
kervala
|
de43ea8d86
|
Fixed: Some warnings
|
2013-09-29 16:26:24 +02:00 |
|
kervala
|
f2ee0e99d8
|
Changed: Detect Windows 8 and Windows Server 2012
|
2013-09-29 13:41:42 +02:00 |
|
kervala
|
c7899841d3
|
Fixed: Compilation under Linux
|
2013-09-28 10:18:35 +02:00 |
|
kervala
|
eebe74066e
|
Changed: Include Lua headers directory for GUI Editor
|
2013-09-27 16:43:02 +02:00 |
|
kervala
|
43bbfe3da7
|
Fixed: Some warnings
|
2013-09-27 16:30:55 +02:00 |
|
kaetemi
|
3b4730c890
|
Fix warnings
|
2013-09-27 01:32:01 +02:00 |
|
kaetemi
|
85365fd7bb
|
Fix line endings
|
2013-09-27 00:08:49 +02:00 |
|
kervala
|
c8c296f484
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
2013-09-24 21:33:59 +02:00 |
|
Quitta
|
a484de5b3f
|
Merge with quitta-gsoc-2013
|
2013-09-23 00:49:16 +02:00 |
|
kervala
|
bb7297f260
|
Fixed: Wrong variable used to compute array length
|
2013-09-22 13:23:03 +02:00 |
|
kervala
|
b7ddc2c0d2
|
Fixed: OpenGL ES driver compilation
|
2013-09-22 13:20:53 +02:00 |
|
kervala
|
82904232d2
|
Fixed: Warnings with GCC
|
2013-09-22 13:20:19 +02:00 |
|
kervala
|
6695a9064e
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
2013-09-22 13:10:57 +02:00 |
|
kaetemi
|
1a669307da
|
Fix typo
|
2013-09-14 19:05:54 +02:00 |
|
kaetemi
|
ce9e0a397b
|
Fix regression from stereo branch in wind tree
|
2013-09-14 18:58:23 +02:00 |
|
kaetemi
|
046e3c92da
|
Fix compile error in vertex program
|
2013-09-14 17:53:47 +02:00 |
|
kaetemi
|
3c099397d8
|
Update supportVertexProgram calls
|
2013-09-14 16:43:36 +02:00 |
|
kaetemi
|
e99bc7ba69
|
Remove old interface
|
2013-09-14 16:45:00 +02:00 |
|
kaetemi
|
256f7ff06c
|
Cleanup unused code
|
2013-09-14 16:23:11 +02:00 |
|
kaetemi
|
6dfc8d0a00
|
Rename
--HG--
branch : multipass-stereo
|
2013-09-14 00:46:10 +02:00 |
|
kaetemi
|
973215e1d0
|
Cleanup
--HG--
branch : multipass-stereo
|
2013-09-14 00:36:06 +02:00 |
|
kaetemi
|
96dc139ddd
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-09-13 23:24:13 +02:00 |
|
kaetemi
|
df123d6b89
|
Fix compile errors caused by missing includes
|
2013-09-13 23:23:19 +02:00 |
|
kaetemi
|
d2bc32e598
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-09-13 23:07:49 +02:00 |
|
kaetemi
|
cd9baf8f89
|
Cleanup
--HG--
branch : multipass-stereo
|
2013-09-13 23:02:35 +02:00 |
|
kaetemi
|
74cff50842
|
Use named indices with wind tree program
--HG--
branch : multipass-stereo
|
2013-09-13 22:20:52 +02:00 |
|
kaetemi
|
c766940e75
|
Use named indices for per pixel light vertex program
--HG--
branch : multipass-stereo
|
2013-09-13 21:47:42 +02:00 |
|
kaetemi
|
f9c9c1836a
|
Use named uniform indices for lighted vertex program
--HG--
branch : multipass-stereo
|
2013-09-13 21:31:47 +02:00 |
|
kaetemi
|
61af565bf9
|
Updated wind tree program container
--HG--
branch : multipass-stereo
|
2013-09-13 20:45:06 +02:00 |
|
kaetemi
|
c353121771
|
Use lighted vertex program container for per pixel light program
--HG--
branch : multipass-stereo
|
2013-09-13 20:00:20 +02:00 |
|
kaetemi
|
a72f25e763
|
Add container for lighted vertex program
--HG--
branch : multipass-stereo
|
2013-09-13 19:03:05 +02:00 |
|
kaetemi
|
ab231ea700
|
Adjust order for meshvp
--HG--
branch : multipass-stereo
|
2013-09-13 18:25:52 +02:00 |
|
kaetemi
|
278e19743c
|
Do not use old interface here
--HG--
branch : multipass-stereo
|
2013-09-13 17:17:11 +02:00 |
|
kaetemi
|
d5c2a0527d
|
Modify calls in bloom effect
--HG--
branch : multipass-stereo
|
2013-09-13 17:11:42 +02:00 |
|
kaetemi
|
5e14dc4458
|
Update veget implementation
--HG--
branch : multipass-stereo
|
2013-09-13 17:09:05 +02:00 |
|
kaetemi
|
9d93ae51a3
|
Fixes for d3d
--HG--
branch : multipass-stereo
|
2013-09-13 17:08:56 +02:00 |
|
kaetemi
|
21a70b4211
|
Update d3d implementation and add some debugging code
--HG--
branch : multipass-stereo
|
2013-09-11 01:12:37 +02:00 |
|
kaetemi
|
e8d77e23e0
|
Rename of a d3d specific class
--HG--
branch : multipass-stereo
|
2013-09-10 19:53:41 +02:00 |
|
kaetemi
|
c6139419ac
|
Partial update of veget vp
--HG--
branch : multipass-stereo
|
2013-09-10 19:52:14 +02:00 |
|
kaetemi
|
5fbb220795
|
Update some test code
--HG--
branch : multipass-stereo
|
2013-09-10 16:42:51 +02:00 |
|
kaetemi
|
c53aa6958e
|
Small adjustment to landscape vp parameter setting
--HG--
branch : multipass-stereo
|
2013-09-10 16:24:45 +02:00 |
|
kaetemi
|
88cbc2f82b
|
Simplify
--HG--
branch : multipass-stereo
|
2013-09-10 15:59:31 +02:00 |
|
kaetemi
|
abafc9b1ef
|
Adjust landscape vertex program to use new interface
--HG--
branch : multipass-stereo
|
2013-09-10 15:42:42 +02:00 |
|
kaetemi
|
5ad617efb6
|
Use new program interface for water vertex program
--HG--
branch : multipass-stereo
|
2013-09-10 02:07:16 +02:00 |
|
kaetemi
|
32809d646a
|
Set driver parameters
--HG--
branch : multipass-stereo
|
2013-09-10 02:01:57 +02:00 |
|
kaetemi
|
64643e564b
|
Some fixes
--HG--
branch : multipass-stereo
|
2013-09-10 01:29:53 +02:00 |
|
kaetemi
|
0429e67903
|
Use CSmartPtr for vertex program
--HG--
branch : multipass-stereo
|
2013-09-10 00:31:26 +02:00 |
|
kaetemi
|
8f4fe87b7b
|
Set params from storage
--HG--
branch : multipass-stereo
|
2013-09-09 23:39:18 +02:00 |
|