kaetemi
d680b70308
Fix some streaming behaviour in XAudio2 driver
2014-02-16 20:36:58 +01:00
StudioEtrange
0b8db2399c
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
e741f31a64
Merge
2014-02-15 19:56:43 -08:00
botanic
a96f651742
force deleting of file so it works even after server crash
2014-02-15 19:52:08 -08:00
kaetemi
be311fb0f8
Fix for excessive inlining of npc chat serialization, issue #97
...
--HG--
branch : compatibility
2014-02-14 18:36:15 +01:00
kervala
8adf6df76a
Changed: Minor changes
...
--HG--
branch : compatibility
2014-03-23 20:36:46 +01:00
kervala
a62393a9ed
Changed: Removed pwd command
...
--HG--
branch : compatibility
2014-03-23 20:36:05 +01:00
kervala
f4233222e5
Fixed: Removed chmod because useless
...
--HG--
branch : compatibility
2014-03-23 20:34:28 +01:00
kervala
c9651b257d
Fixed: Wrong parameters passed to bash script
...
--HG--
branch : compatibility
2014-03-23 20:32:44 +01:00
kervala
39eb83eb87
Changed: Use BuildName only on Unix
...
--HG--
branch : compatibility
2014-03-23 20:31:59 +01:00
kervala
058aa23813
Changed: Use official settings for client.cfg
...
--HG--
branch : compatibility
2014-03-23 20:27:55 +01:00
kervala
edf3f49afd
Changed: Use fullpath in batch file
...
--HG--
branch : compatibility
2014-03-23 20:27:09 +01:00
kervala
dfb187126a
Changed: Create .sh file under Unix
...
--HG--
branch : compatibility
2014-03-23 20:26:29 +01:00
kervala
91a3e128cc
Changed: Renamed RZ_PATCH to RZ_USE_PATCH
...
--HG--
branch : compatibility
2014-03-23 20:25:48 +01:00
kervala
769a5ca2ee
Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix
...
--HG--
branch : compatibility
2014-03-22 19:36:53 +01:00
kervala
2c396827d5
Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix
...
--HG--
branch : compatibility
2014-03-22 19:36:13 +01:00
kervala
607f39561d
Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP
...
--HG--
branch : compatibility
2014-03-22 18:20:30 +01:00
kaetemi
cd1107adf5
Fix #134 Exit crash after failed response from character selection
...
--HG--
branch : compatibility
2014-02-17 13:57:26 +01:00
kaetemi
d2d87d2644
Make IG load waiting loop more agreeable
...
--HG--
branch : compatibility
2014-02-17 01:54:12 +01:00
kaetemi
6426393210
Additional streaming behaviour fix for XAudio2 driver
...
--HG--
branch : compatibility
2014-02-17 00:20:29 +01:00
kaetemi
4d3d7a000a
Fix #132 You can no longer walk through rezzed players
...
--HG--
branch : compatibility
2014-02-16 23:09:19 +01:00
kaetemi
f703359eaa
Remove some debug
...
--HG--
branch : compatibility
2014-02-16 20:44:58 +01:00
kaetemi
17b99ba796
Fix some streaming behaviour in XAudio2 driver
...
--HG--
branch : compatibility
2014-02-16 20:36:58 +01:00
kervala
c26e4c7426
Changed: Typo
...
--HG--
branch : compatibility
2014-03-22 16:23:28 +01:00
kervala
20ce763f35
Changed: Improvements in patch system
...
--HG--
branch : compatibility
2014-03-22 16:23:17 +01:00
kaetemi
cb6661b10d
Fix for excessive inlining of npc chat serialization, issue #97
2014-02-14 18:36:15 +01:00
kaetemi
1bafddccf6
Fixup paths (could we use the search paths for this?)
2014-02-14 04:52:11 +01:00
kaetemi
62cf064982
Cleanup data_shard
2014-02-14 03:30:15 +01:00
kaetemi
5c4175a54d
Only copy if needed
2014-02-14 02:46:07 +01:00
kaetemi
74363fdb33
Merge
2014-02-14 02:38:53 +01:00
kaetemi
f0688ad8c6
Get path for datasets from config like other services
2014-02-14 02:37:41 +01:00
kaetemi
e569541faa
Fix default directory
2014-02-14 02:03:22 +01:00
kaetemi
106cd007f9
Move mirror sheets back in
2014-02-14 01:58:56 +01:00
kaetemi
497232b470
Extend shard data script to gather executables and configurations
2014-02-14 01:21:05 +01:00
kaetemi
3267b89362
Add directories for patchman to gamedata setup
2014-02-14 01:01:02 +01:00
kaetemi
9939219ebf
Extend shard data script
2014-02-13 22:02:25 +01:00
botanic
2e1b47e3f0
Backed out merge changeset: b2d97621fa3b
...
Backed out merge revision to its first parent (99840e8413f2)
2014-02-13 12:12:28 -08:00
kervala
6b04b77bdd
Fixed: Reverted i18n change
...
--HG--
branch : compatibility
2014-02-13 14:17:32 +01:00
kervala
ab7836187d
Fixed: Reverted OpenGLES support change
...
--HG--
branch : compatibility
2014-02-13 14:15:34 +01:00
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
botanic
b3cca9bd73
add_user code for AMS
2014-02-08 20:15:38 -08:00
botanic
96770ba2db
auto create ring user permissions
2014-02-08 19:26:11 -08:00
botanic
37c3aa49fa
Set permissions in the ams installer
2014-02-08 19:00:21 -08:00
botanic
ea6bec1f91
Backed out changeset: 7d3eaa1bada0
...
--HG--
branch : compatibility
2014-02-08 18:59:38 -08:00
botanic
c99bfa03d4
Set permissions in the ams installer
...
--HG--
branch : compatibility
2014-02-08 18:57:03 -08:00
Matthew Lagoe
0db3345130
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
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
06e8090669
Skip some files in ig build when possible
2014-02-09 00:46:03 +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
ac474c79b9
Compile fix
2014-02-08 16:29:15 +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
275542fa01
Added 7z library to all versions needed for in-game patcher
2014-02-07 20:12:15 -08:00
botanic
666ab7ebec
Added linux patcher!
2014-02-07 20:10:07 -08:00
botanic
e728daa7cd
Add CMAKE option and NVIDIA PerfHUD support
2014-02-07 19:49:40 -08:00
botanic
7518c066b3
Change frontend to use shard.ryzomcore.org by default
2014-02-07 19:32:10 -08:00
botanic
edd9381a3c
General ui fix's
2014-02-07 19:29:36 -08:00
kaetemi
afece9a65e
Merge with default
...
--HG--
branch : multipass-stereo
2014-02-08 02:58:22 +01: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
25ee7f2595
Fix crash in translation_tools
2014-02-07 23:01:36 +01:00
kaetemi
7d05793cc9
Remove temporary file
2014-02-07 20:31:21 +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
774cd59d8f
Update default paths for world editor
2014-02-07 17:47:43 +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
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
kervala
339242d88e
Changed: Virtual destructors
2013-09-29 13:49:53 +02:00
kervala
b638779240
Fixed: Compilation under Linux
2013-09-29 13:49:07 +02:00
kervala
28eb142f24
Changed: Minor changes
2013-09-29 13:47:30 +02:00
kervala
b5e7542602
Fixed: Wrong driver version in Ryzom Configurator
...
Fixed: Typo in "width"
2013-09-29 13:46:43 +02:00
kervala
b0b1c8a0b6
Changed: Added PCH for ryzom configurator qt
2013-09-29 13:44:04 +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
Cédric OCHS
349b8a8b55
Merged in nimetu/ryzomcore (pull request #28 )
...
Fixed: restore correct resolution
2013-09-27 20:07:08 +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