Commit graph

3706 commits

Author SHA1 Message Date
StudioEtrange
3da6355d73 CMAKE TARGET : SHARED and MODULE
About Shared Library (shared) and Module Library (module) type of cmake target
INSTALL command has different behaviour for ARCHIVE LIBRARY RUNTIME depending on the platform
2014-02-16 19:43:44 +01:00
botanic
52d5a2cfcc Merge 2014-02-15 19:56:43 -08:00
botanic
8860790b91 force deleting of file so it works even after server crash 2014-02-15 19:52:08 -08:00
kaetemi
92a80850e2 Fix for excessive inlining of npc chat serialization, issue #97 2014-02-14 18:36:15 +01:00
kervala
54ae4e8e0d Changed: Minor changes 2014-03-23 20:36:46 +01:00
kervala
178017091e Changed: Removed pwd command 2014-03-23 20:36:05 +01:00
kervala
9607039cf2 Fixed: Removed chmod because useless 2014-03-23 20:34:28 +01:00
kervala
4ee93fc533 Fixed: Wrong parameters passed to bash script 2014-03-23 20:32:44 +01:00
kervala
82686fe4d3 Changed: Use BuildName only on Unix 2014-03-23 20:31:59 +01:00
kervala
2b078627e4 Changed: Use official settings for client.cfg 2014-03-23 20:27:55 +01:00
kervala
91b4a3bb94 Changed: Use fullpath in batch file 2014-03-23 20:27:09 +01:00
kervala
b042ec67f8 Changed: Create .sh file under Unix 2014-03-23 20:26:29 +01:00
kervala
b16d1f1e03 Changed: Renamed RZ_PATCH to RZ_USE_PATCH 2014-03-23 20:25:48 +01:00
kervala
19eeb99e37 Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix 2014-03-22 19:36:53 +01:00
kervala
f9f17b0cff Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix 2014-03-22 19:36:13 +01:00
kervala
32089fce78 Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP 2014-03-22 18:20:30 +01:00
kaetemi
86d05cbc9a Fix #134 Exit crash after failed response from character selection 2014-02-17 13:57:26 +01:00
kaetemi
aaff449393 Make IG load waiting loop more agreeable 2014-02-17 01:54:12 +01:00
kaetemi
2c81edcf56 Additional streaming behaviour fix for XAudio2 driver 2014-02-17 00:20:29 +01:00
kaetemi
dd454ad543 Fix #132 You can no longer walk through rezzed players 2014-02-16 23:09:19 +01:00
kaetemi
5db0ba86a7 Remove some debug 2014-02-16 20:44:58 +01:00
kaetemi
3b38848903 Fix some streaming behaviour in XAudio2 driver 2014-02-16 20:36:58 +01:00
kervala
bb156457c0 Changed: Typo 2014-03-22 16:23:28 +01:00
kervala
4011c6c70c Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
kaetemi
57e6b3bdbd Fix for excessive inlining of npc chat serialization, issue #97 2014-02-14 18:36:15 +01:00
kaetemi
ada90101f2 Fixup paths (could we use the search paths for this?) 2014-02-14 04:52:11 +01:00
kaetemi
5fb9ef8675 Cleanup data_shard 2014-02-14 03:30:15 +01:00
kaetemi
c6e291c470 Only copy if needed 2014-02-14 02:46:07 +01:00
kaetemi
870444293f Merge 2014-02-14 02:38:53 +01:00
kaetemi
ca2d7941f8 Get path for datasets from config like other services 2014-02-14 02:37:41 +01:00
kaetemi
f4a4a41fbf Fix default directory 2014-02-14 02:03:22 +01:00
kaetemi
5a092039f1 Move mirror sheets back in 2014-02-14 01:58:56 +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
kervala
5c0ee4a9ec Fixed: Reverted OpenGLES support change 2014-02-13 14:15:34 +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
botanic
d558690f44 add_user code for AMS 2014-02-08 20:15:38 -08:00
botanic
f283c4294b auto create ring user permissions 2014-02-08 19:26:11 -08:00
botanic
194f076443 Set permissions in the ams installer 2014-02-08 19:00:21 -08:00
botanic
61f1795311 Backed out changeset: 7d3eaa1bada0 2014-02-08 18:59:38 -08:00
botanic
d65d9c9b5f Set permissions in the ams installer 2014-02-08 18:57:03 -08:00
Matthew Lagoe
1d6765ac17 Merged in nimetu/ryzomcore/shard-script-fixes-for-dash (pull request #47)
Change shard scripts to work with dash shell (issue #99)
2014-02-08 18:34:11 -08: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
b70a9d7e75 Skip some files in ig build when possible 2014-02-09 00:46:03 +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
633d2dbb5e Compile fix 2014-02-08 16:29:15 +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
18c2b62c0c Added 7z library to all versions needed for in-game patcher 2014-02-07 20:12:15 -08:00
botanic
58c6b188d7 Added linux patcher! 2014-02-07 20:10:07 -08:00
botanic
777aa0b6ae Add CMAKE option and NVIDIA PerfHUD support 2014-02-07 19:49:40 -08:00
botanic
20e825329c Change frontend to use shard.ryzomcore.org by default 2014-02-07 19:32:10 -08:00
botanic
826d9966e6 General ui fix's 2014-02-07 19:29:36 -08:00
kaetemi
a70b5bd75f Merge with default 2014-02-08 02:58:22 +01: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
4315a2d197 Fix crash in translation_tools 2014-02-07 23:01:36 +01:00
kaetemi
ebf144ae5f Remove temporary file 2014-02-07 20:31:21 +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
b5e90e081e Update default paths for world editor 2014-02-07 17:47:43 +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
91abed1567 Add some useful data to gamedev interfaces (temporary) 2014-02-07 15:53:35 +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
e606ea3b9f Remove weather configuration from data common 2014-02-06 23:39:05 +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
Matthew Lagoe
c347165e3d Merged in nimetu/ryzomcore/shard-admin-tool-mysqli-class (pull request #49)
mysqli class for shard admin tool
2014-02-05 13:14:50 -08:00
Matthew Lagoe
db18dda4f3 Merged in nimetu/ryzomcore/php-mysqli-refactor-fixed (pull request #48)
Replace deprecated mysql functions with mysqli in login and ring scripts
2014-02-05 13:05:14 -08:00
botanic
c88790dc96 remove sleep on ams install 2014-02-05 13:04:18 -08: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
2833cc42d4 Fix georges sound plugin compilation 2014-02-04 19:21:13 +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
Jan Boon
f84aab54c0 Merged ryzom/ryzomcore into default 2014-02-02 00:52:25 +01:00
kaetemi
91163ba7bb Properly handle NeL dependencies for Ryzom tools when disabling NeL libraries 2014-02-02 00:47:33 +01:00
kervala
cb5a600578 Fixed: Compilation with freetype under Linux 2014-02-01 13:59:47 +01:00
kervala
9b058de0e6 Changed: CMAKE_OSX_DEPLOYMENT_TARGET is useless because CMake set it automatically based on MACOSX_DEPLOYMENT_TARGET 2014-01-30 16:26:16 +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
Nimetu
4c949774c3 Removed debug output 2014-01-29 14:11:08 +02:00
Nimetu
8c16bc6e94 Add mysqli database class to shard admin tool 2014-01-29 14:06:48 +02:00
kervala
2fe67e96e4 Fixed: Don't set CMAKE_OSX_DEPLOYMENT_TARGET anymore by default, only use that if you need 2014-01-29 13:06:22 +01:00
botanic
a8cabc90d1 Fixed typo issue 60 2014-01-28 11:41:26 -08:00
Nimetu
a4a575d49e Replace deprecated mysql functions with mysqli in login and ring scripts 2014-01-28 00:47:13 +02:00
Nimetu
a6629ddd32 Change shard scripts to work with dash shell (issue #99)
Fix 'Press ENTER key' functionality
2014-01-27 23:15:31 +02: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
botanic
7bbfca6f1b Backed out php-mysqli-refactor, broke logins 2014-01-26 01:31:47 -08: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
kervala
3fc3f584a3 Fixed: #96 cmake and freetype detection on Linux Debian SID 2014-01-22 10:24:35 +01:00
kaetemi
6d39fd64b3 Fix Qt build on Windows 2014-01-21 12:50:23 +01:00
Nimetu
a9f9317dc9 Replace deprecated mysql functions with mysqli in login and ring scripts 2014-01-10 14:00:09 +02:00
Nimetu
c37850920a Remove tooltip debug message from logs 2014-01-04 00:20:05 +02:00
Nimetu
4185369ce9 Hide over the limit landmarks instead deleting them 2014-01-03 22:43:00 +02:00
Nimetu
f26e595ad3 Fix typo (issue #70) 2014-01-03 19:51:50 +02:00
Nimetu
ec4b21ac75 Fix inventory items draggable state (issue #78) 2014-01-03 20:31:14 +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
botanic
26b8d32aac fixed permissions 2013-12-18 11:45:10 -08:00
botanic
d6f0d99065 changed client_default to use shard 2013-12-17 06:54:27 -08:00
botanic
581ed65fd7 ams needs some urls editable without recompiling 2013-12-17 05:10:28 -08:00
botanic
50e5b956f8 fixed permissions on default admin account 2013-12-17 04:59:53 -08:00
botanic
9ca951e1c5 added the install for ring_open 2013-12-17 00:07:09 -08:00
botanic
e52c525827 a positive and a negative is supposted to be NEGATIVE stupid php 2013-12-16 23:38:24 -08:00
botanic
2776b4f461 updated words file 2013-12-16 23:19:29 -08:00
botanic
395503bed1 helps if i use the right file... 2013-12-16 23:14:24 -08:00
botanic
7c23b19f58 forgot a few ; 2013-12-16 23:11:30 -08:00
botanic
29fc217a88 fixed some permissions issues, setup system so that it has a is_installed file to determin if it should install or not 2013-12-16 22:59:06 -08:00
botanic
eeeefe4e17 Merge 2013-12-14 19:36:36 -08:00
botanic
5e150397a1 fix for new install 2013-12-14 19:34:07 -08:00
kervala
df32fe7e02 Changed: #71 Crash when entering rooms (patch provided by Tierry Anthony, thanks!) 2013-12-14 09:18:51 +01:00
kervala
47bcf3504e Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported" 2013-11-22 11:27:30 +01: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
picomancer
bdefa428b7 README: Update URL for build instructions, fix typo 2013-11-13 17:25:12 -05:00
kervala
70bbc88f0f Fixed: Warning with clang 2013-11-13 22:53:26 +01:00
kervala
4a46f42889 Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake 2013-11-13 22:52:48 +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
2109b536d0 Changed: Replaced math.mod by math.fmod in Ring lua files 2013-11-13 21:38:23 +01:00
kervala
753c5d6378 Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
3318485d58 Changed: Replaced strlwr by toLower 2013-11-13 21:33:29 +01:00
kervala
5f0a674ad2 Changed: Updated OpenGL registry 2013-11-13 20:31:08 +01:00
botanic
9db3e45ec4 added reload link to if config permissions are wack 2013-11-11 13:23:33 -08:00
botanic
208549a68d properly write the hostname for permissions creation 2013-11-11 13:17:19 -08:00
botanic
a1fb84e014 changed it to error on bad permissions copying config.php 2013-11-11 10:54:09 -08:00
Botanic
8ec1ee4d45 Merge 2013-11-02 16:35:26 -07:00
kervala
48c6c213c6 Fixed: MFC can't be found 2013-10-30 20:46:19 +01: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
Matthew Lagoe
25c7eec853 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #43)
added rrd_graphs directory
2013-10-26 20:59:38 -07:00
Botanic
19086063e2 added rrd_graphs directory 2013-10-26 20:57:16 -07:00
Botanic
5efa0315d6 Merge 2013-10-26 19:12:27 -07:00
Botanic
c50e0cd8a3 config.default.php 2013-10-26 03:19:59 -07:00
Botanic
5b73e366f0 added folder placeholders 2013-10-26 02:04:54 -07:00
Botanic
d467027f11 fixed bad merge 2013-10-26 00:57:50 -07:00
Botanic
906da99801 Merge 2013-10-26 00:50:56 -07:00