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 |
|