Commit graph

3535 commits

Author SHA1 Message Date
kaetemi
0d0907aa08 Add build shadow skin to shape process 2014-02-07 17:16:40 +01:00
kaetemi
991bf1244f Add some useful data to gamedev interfaces (temporary) 2014-02-07 15:53:35 +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
b53926014d Remove weather configuration from data common
--HG--
branch : build_pipeline_py
2014-02-06 23:39:05 +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
Matthew Lagoe
b63e2a7a8e 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
d3912094cf 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
231a6b2e64 remove sleep on ams install 2014-02-05 13:04:18 -08: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
8de55c4cc5 Fix georges sound plugin compilation 2014-02-04 19:21:13 +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
Jan Boon
9062bea4a8 Merged ryzom/ryzomcore into default 2014-02-02 00:52:25 +01:00
kaetemi
2256b2ce15 Properly handle NeL dependencies for Ryzom tools when disabling NeL libraries 2014-02-02 00:47:33 +01:00
kervala
3980513e12 Fixed: Compilation with freetype under Linux 2014-02-01 13:59:47 +01:00
kervala
0c31ab50bf 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
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
Nimetu
cd4ba6e579 Removed debug output
--HG--
branch : shard-admin-tool-mysqli-class
2014-01-29 14:11:08 +02:00
Nimetu
db00b5002d Add mysqli database class to shard admin tool
--HG--
branch : shard-admin-tool-mysqli-class
2014-01-29 14:06:48 +02:00
kervala
19cc4571d3 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
e995784886 Fixed typo issue 60 2014-01-28 11:41:26 -08:00
Nimetu
e3c3d6a4b7 Replace deprecated mysql functions with mysqli in login and ring scripts
--HG--
branch : php-mysqli-refactor-fixed
2014-01-28 00:47:13 +02:00
Nimetu
6f1dc626bd Change shard scripts to work with dash shell (issue #99)
Fix 'Press ENTER key' functionality

--HG--
branch : shard-script-fixes-for-dash
2014-01-27 23:15:31 +02: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
botanic
5317c9f080 Backed out php-mysqli-refactor, broke logins 2014-01-26 01:31:47 -08: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
kervala
ee8edac294 Fixed: #96 cmake and freetype detection on Linux Debian SID 2014-01-22 10:24:35 +01:00
kaetemi
207d7323ce Fix Qt build on Windows 2014-01-21 12:50:23 +01:00
Nimetu
11e5515c5c Replace deprecated mysql functions with mysqli in login and ring scripts
--HG--
branch : php-mysqli-refactor
2014-01-10 14:00:09 +02:00
Nimetu
ea5a36b105 Remove tooltip debug message from logs
--HG--
branch : misc-patches
2014-01-04 00:20:05 +02:00
Nimetu
5b09380bff Hide over the limit landmarks instead deleting them
--HG--
branch : misc-patches
2014-01-03 22:43:00 +02:00
Nimetu
4c2531474a Fix typo (issue #70)
--HG--
branch : misc-patches
2014-01-03 19:51:50 +02:00
Nimetu
0bad9f2f5e Fix inventory items draggable state (issue #78)
--HG--
branch : misc-patches
2014-01-03 20:31:14 +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
botanic
15452f47d3 fixed permissions 2013-12-18 11:45:10 -08:00
botanic
92f8e4ffa8 changed client_default to use shard 2013-12-17 06:54:27 -08:00
botanic
c275d0f7d8 ams needs some urls editable without recompiling 2013-12-17 05:10:28 -08:00
botanic
32cfdada54 fixed permissions on default admin account 2013-12-17 04:59:53 -08:00
botanic
52d4d3c0f5 added the install for ring_open 2013-12-17 00:07:09 -08:00
botanic
0a48856319 a positive and a negative is supposted to be NEGATIVE stupid php 2013-12-16 23:38:24 -08:00
botanic
31de51af19 updated words file 2013-12-16 23:19:29 -08:00
botanic
8aa71de2bc helps if i use the right file... 2013-12-16 23:14:24 -08:00
botanic
8cbc6f01ec forgot a few ; 2013-12-16 23:11:30 -08:00
botanic
4e4d925e54 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
09e5cfc5ef Merge 2013-12-14 19:36:36 -08:00
botanic
fe3a7c0e1c fix for new install 2013-12-14 19:34:07 -08:00
kervala
291c961776 Changed: #71 Crash when entering rooms (patch provided by Tierry Anthony, thanks!) 2013-12-14 09:18:51 +01:00
kervala
19f7bc931e Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported" 2013-11-22 11:27:30 +01: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
"picomancer ext:(%22)
12f646afef README: Update URL for build instructions, fix typo 2013-11-13 17:25:12 -05:00
kervala
ae5becbb0b Fixed: Warning with clang 2013-11-13 22:53:26 +01:00
kervala
98c862136a Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake 2013-11-13 22:52:48 +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
8099217145 Changed: Replaced math.mod by math.fmod in Ring lua files 2013-11-13 21:38:23 +01:00
kervala
36a537a88e Changed: Replaced atof by fromString 2013-11-13 21:37:28 +01:00
kervala
0ce9bca0ac Changed: Replaced strlwr by toLower 2013-11-13 21:33:29 +01:00
kervala
b7082644f0 Changed: Updated OpenGL registry 2013-11-13 20:31:08 +01:00
botanic
be87039624 added reload link to if config permissions are wack 2013-11-11 13:23:33 -08:00
botanic
80e168886a properly write the hostname for permissions creation 2013-11-11 13:17:19 -08:00
botanic
036dac452f changed it to error on bad permissions copying config.php 2013-11-11 10:54:09 -08:00
Botanic
6dfafa7ae1 Merge 2013-11-02 16:35:26 -07:00
kervala
588d262dbf Fixed: MFC can't be found 2013-10-30 20:46:19 +01: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
Matthew Lagoe
61f021f635 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
9e67d9ea09 added rrd_graphs directory
--HG--
branch : rc-botanic-webdev
2013-10-26 20:57:16 -07:00
Botanic
4c5832204f config.default.php 2013-10-26 03:19:59 -07:00
Botanic
3e692705ea added folder placeholders 2013-10-26 02:04:54 -07: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
Botanic
b6de1eca23 Changed installer page to no_visible_elements
--HG--
branch : rc-botanic-webdev
2013-10-24 21:58:11 -07:00
Botanic
284884c573 added installer for nel_tool database
--HG--
branch : rc-botanic-webdev
2013-10-24 20:25:04 -07:00
Botanic
a3cbd69d3b fixed css
--HG--
branch : rc-botanic-webdev
2013-10-24 05:43:38 -07:00
Botanic
03a1dc39af made logo clickable
--HG--
branch : rc-botanic-webdev
2013-10-24 05:03:01 -07:00
Botanic
2d174cf15c fixed more warnings
--HG--
branch : rc-botanic-webdev
2013-10-24 04:43:42 -07:00
Botanic
b8fdefe10d fixed php warning
--HG--
branch : rc-botanic-webdev
2013-10-24 04:10:39 -07:00
Botanic
04619a39a9 made users a dropdown for adding users to group
--HG--
branch : rc-botanic-webdev
2013-10-24 02:21:43 -07:00
Botanic
632a6f2929 fixed missing </div>
--HG--
branch : rc-botanic-webdev
2013-10-24 01:25:05 -07:00
Botanic
91c4784752 Fixed Support Groups
--HG--
branch : rc-botanic-webdev
2013-10-24 01:12:09 -07:00
Botanic
81d1cf93fb added option for assigned and unassigned ie "both"
--HG--
branch : rc-botanic-webdev
2013-10-23 23:58:34 -07:00
Botanic
d1913cbfc5 fixed div in settings template
--HG--
branch : rc-botanic-webdev
2013-10-23 18:35:44 -07:00
Botanic
c4e79a8246 fixed some more static non-static warnings
--HG--
branch : rc-botanic-webdev
2013-10-23 18:26:59 -07:00
Botanic
6b266fd808 fixed missing index errors
--HG--
branch : rc-botanic-webdev
2013-10-23 18:07:09 -07:00
Botanic
8ca55f955e fixed groupid if there are no groups
--HG--
branch : rc-botanic-webdev
2013-10-23 17:12:47 -07:00
Botanic
677c8fa251 cleanup sync
--HG--
branch : rc-botanic-webdev
2013-10-23 17:08:27 -07:00
Botanic
3dbb08f1d1 fixed static call to non static
--HG--
branch : rc-botanic-webdev
2013-10-23 17:06:42 -07:00
Botanic
95c5b9e1a8 added fork on linux as well as implimented pid file to check for other running crons
--HG--
branch : rc-botanic-webdev
2013-10-23 15:26:36 -07:00
Botanic
72290313a4 Implimented lazy cron and fixed syncronize button.
--HG--
branch : rc-botanic-webdev
2013-10-23 15:06:41 -07:00
sfb
892ed1ed3d merge from default
--HG--
branch : gsoc2011-worldeditorqt
2013-10-23 12:08:09 -05:00
Botanic
08ee2b8abc added installing nel db
--HG--
branch : rc-botanic-webdev
2013-10-22 22:03:33 -07:00
Botanic
54d13d93d0 Fixed path bugs
--HG--
branch : rc-botanic-webdev
2013-10-21 23:57:27 -07:00
Botanic
16bd70c50a remove install.php from sql
--HG--
branch : rc-botanic-webdev
2013-10-21 23:31:58 -07:00
Botanic
fd012e9cda added installer
--HG--
branch : rc-botanic-webdev
2013-10-21 23:31:13 -07:00
Botanic
457f2f703f updated TOS url to http://www.gnu.org/licenses/agpl-3.0.html
--HG--
branch : rc-botanic-webdev
2013-10-21 23:14:26 -07:00
Botanic
7a7191e981 added installer for when database is missing
--HG--
branch : rc-botanic-webdev
2013-10-21 23:02:01 -07:00
Botanic
32c729f38e Moved Android app
--HG--
branch : rc-botanic-webdev
2013-10-21 20:05:16 -07:00
kervala
28b9fbe8bc Changed: Search for default installation paths under Windows 2013-10-21 17:50:21 +02:00
Matt Raykowski
0001719d99 Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
2013-10-19 16:02:52 -05:00
Botanic
04221c3696 changed to tabs 2013-10-18 02:25:48 -07:00
Botanic
31ca25b00b connection failure message if mysql conneciton fails 2013-10-18 01:51:30 -07:00
kervala
c180c06d7f Removed: Backup files 2013-10-13 13:34:38 +02:00
kaetemi
3f1ce6020a Merge with default
--HG--
branch : multipass-stereo
2013-10-06 20:09:25 +02:00
kaetemi
563afd027c Fix #67 bad NELID in vertex program parser 2013-10-06 20:06:53 +02:00
kaetemi
af621187f1 Merge with default
--HG--
branch : multipass-stereo
2013-10-06 15:50:49 +02:00
kervala
eb3c58cce9 Fixed: Use multiarch library path under Linux 2013-09-30 09:11:35 +02:00
kervala
30b0f25587 Fixed: server_share needs MySQL headers 2013-09-29 20:33:07 +02:00
kervala
652915412f Changed: Link to opengl library 2013-09-29 18:11:05 +02:00
kervala
de43ea8d86 Fixed: Some warnings 2013-09-29 16:26:24 +02:00
kervala
de42e4d7ff Fixed: Some warnings 2013-09-29 13:52:53 +02:00
kervala
67e0b796ce Changed: Search for OpenGL Qt 4 module 2013-09-29 13:52:21 +02:00
kervala
0b29d3993d Changed: Don't check for D3D radio button under other OSes 2013-09-29 13:51:43 +02:00
kervala
f8179f68ad Changed: Minor change 2013-09-29 13:51:08 +02:00
kervala
f11f5c8b7a Changed: Disable D3D radio button for other OSes 2013-09-29 13:50:38 +02:00