kervala
|
7abbc07bc7
|
Removed: installscript_osx.vdf because we manage it directly in code now
--HG--
branch : compatibility-develop
|
2016-01-21 10:15:09 +01:00 |
|
kervala
|
5a6580dc38
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-21 10:08:56 +01:00 |
|
kervala
|
aff9cccd0c
|
Changed: Improve toString(const bool &val)...
--HG--
branch : develop
|
2016-01-21 10:06:35 +01:00 |
|
kervala
|
a08cdce803
|
Fixed: Use icon under Windows
--HG--
branch : develop
|
2016-01-21 10:05:26 +01:00 |
|
kervala
|
e281fc1706
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-21 10:05:10 +01:00 |
|
kervala
|
539a99b1e3
|
Changed: Updated translations
--HG--
branch : compatibility-develop
|
2016-01-20 19:50:51 +01:00 |
|
Nimetu
|
6b13fdd770
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-20 19:15:45 +02:00 |
|
Nimetu
|
52dcf1a300
|
Changed: Use url from <base> element for relative urls
--HG--
branch : develop
|
2016-01-20 19:15:20 +02:00 |
|
kervala
|
d03e896702
|
Changed: Ryzom version 2.9.0 (stable version will be 3.0.0)
--HG--
branch : compatibility-develop
|
2016-01-20 13:08:23 +01:00 |
|
kervala
|
bb0d2f6aa0
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-20 13:06:47 +01:00 |
|
kervala
|
1082c49aa6
|
Changed: Use a different original filename for DEV version
--HG--
branch : develop
|
2016-01-20 13:06:15 +01:00 |
|
kervala
|
6c27e927b5
|
Fixed: Compilation in 64 bits under Windows
--HG--
branch : develop
|
2016-01-20 13:05:55 +01:00 |
|
kervala
|
f50c9c0866
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-19 20:42:11 +01:00 |
|
kervala
|
fa22852adb
|
Changed: Removed fromString(const char *, ...) because useless
--HG--
branch : develop
|
2016-01-19 20:41:41 +01:00 |
|
kervala
|
5cc2b2865f
|
Changed: Local includes against system includes
--HG--
branch : develop
|
2016-01-19 20:38:05 +01:00 |
|
kervala
|
00395d6b2e
|
Fixed: Compilation without PCH
--HG--
branch : develop
|
2016-01-19 20:37:03 +01:00 |
|
kervala
|
5fb0c5d279
|
Removed: Binary file generated by VC++
--HG--
branch : develop
|
2016-01-19 20:35:59 +01:00 |
|
kervala
|
1864ad70db
|
Fixed: Some unit tests with fromString
--HG--
branch : develop
|
2016-01-19 13:12:53 +01:00 |
|
kervala
|
3faac85a41
|
Changed: Updated translations
--HG--
branch : compatibility-develop
|
2016-01-19 09:17:09 +01:00 |
|
kervala
|
d96e1da521
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-18 21:48:31 +01:00 |
|
kervala
|
e01f706ccc
|
Fixed: Updated with new changes
--HG--
branch : develop
|
2016-01-18 21:48:00 +01:00 |
|
kervala
|
d54e569b3f
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-18 21:32:01 +01:00 |
|
kervala
|
a79393e9f8
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-18 21:31:23 +01:00 |
|
kervala
|
9073264f59
|
Changed: Remove hardcoded L:\\primitives\\ from C++ code (use RYZOM_LEVELDESIGN environment varianle instead)
--HG--
branch : develop
|
2016-01-18 21:31:10 +01:00 |
|
kervala
|
b0ad9b0315
|
Changed: Only add search paths that exist
--HG--
branch : develop
|
2016-01-18 21:29:43 +01:00 |
|
kervala
|
b91e3bdf0e
|
Changed: Improved CCmdArgs
--HG--
branch : develop
|
2016-01-18 21:22:57 +01:00 |
|
kervala
|
c379c61ab7
|
Changed: Don't need to create it on heap
--HG--
branch : develop
|
2016-01-18 13:27:48 +01:00 |
|
kervala
|
fc645a5668
|
Fixed: Import static platform plugin
--HG--
branch : develop
|
2016-01-18 13:27:23 +01:00 |
|
kaetemi
|
fd950a692b
|
Faster Qt startup
--HG--
branch : develop
|
2016-01-18 11:27:14 +01:00 |
|
kervala
|
016f56578a
|
Changed: Remove InstallStatsUrl in client_default.cfg
--HG--
branch : compatibility-develop
|
2016-01-17 20:16:18 +01:00 |
|
Tobias Peters
|
48c7404c74
|
Merged github:zerotacg/ryzomcore/issue/fix-failing-unit-tests
--HG--
branch : issue/fix-failing-unit-tests
|
2016-01-17 20:05:02 +01:00 |
|
kervala
|
6ea1421fd3
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-17 13:24:01 +01:00 |
|
kervala
|
58d23bbe97
|
Fixed: Compilation with static Qt 5
--HG--
branch : develop
|
2016-01-17 13:23:25 +01:00 |
|
kervala
|
d5749430f7
|
Fixed: Typo in Lua 5.3 module
--HG--
branch : develop
|
2016-01-17 13:21:27 +01:00 |
|
kervala
|
cc282fd3d5
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-16 23:50:23 +01:00 |
|
kervala
|
0be5356f78
|
Fixed: Right directories
--HG--
branch : develop
|
2016-01-16 23:49:39 +01:00 |
|
kervala
|
c5fbf56984
|
Fixed: Missing ++
--HG--
branch : develop
|
2016-01-16 23:48:44 +01:00 |
|
kervala
|
bb9ac688f6
|
Changed: Set CMP0020 NEW in root project
--HG--
branch : develop
|
2016-01-16 23:48:32 +01:00 |
|
kervala
|
5b3e181227
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-16 23:47:58 +01:00 |
|
kervala
|
06eb63183e
|
Added: Config file for translation_tools
--HG--
branch : develop
|
2016-01-16 23:47:12 +01:00 |
|
kervala
|
b3cfd5f6bb
|
Fixed: Use lua_tointeger under Lua 5.2 and prior versions
--HG--
branch : develop
|
2016-01-16 21:35:34 +01:00 |
|
kervala
|
b149c94a26
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-16 15:58:19 +01:00 |
|
kervala
|
4886da5855
|
Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals
--HG--
branch : develop
|
2016-01-16 15:55:56 +01:00 |
|
kervala
|
cd021fc4ef
|
Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist)
--HG--
branch : develop
|
2016-01-16 15:54:46 +01:00 |
|
kervala
|
c427bb216b
|
Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist)
--HG--
branch : develop
|
2016-01-16 15:52:51 +01:00 |
|
kervala
|
8b5dcc345d
|
Fixed: Link to X11 under Linux
--HG--
branch : develop
|
2016-01-16 15:50:45 +01:00 |
|
kervala
|
074fdb5c22
|
Fixed: Link to static libxml2 under Linux
--HG--
branch : develop
|
2016-01-16 15:50:17 +01:00 |
|
kervala
|
5c772f45b4
|
Changed: Update year in copyright automatically
--HG--
branch : develop
|
2016-01-16 15:47:13 +01:00 |
|
kervala
|
cca0dd450e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-16 10:52:18 +01:00 |
|
kaetemi
|
9c687430c8
|
Update mask pixel format in panoply preview tool
--HG--
branch : develop
|
2016-01-15 17:22:27 +01:00 |
|
kaetemi
|
8673d27a13
|
Add panoply preview tool
--HG--
branch : develop
|
2016-01-15 17:11:10 +01:00 |
|
kaetemi
|
8cfaa89620
|
Separate window displayer message stringify
--HG--
branch : develop
|
2016-01-15 17:10:39 +01:00 |
|
kaetemi
|
d5654ad62e
|
Fix bad printf parameters
--HG--
branch : develop
|
2016-01-15 16:42:21 +01:00 |
|
kaetemi
|
53b62c66d2
|
More of that VS2015 magic
--HG--
branch : develop
|
2016-01-15 16:17:23 +01:00 |
|
kaetemi
|
5c6edf6cee
|
And more VS2015 fixes
--HG--
branch : develop
|
2016-01-15 12:33:27 +01:00 |
|
kaetemi
|
e4b72e63a1
|
More of the VS2015 stuff
--HG--
branch : develop
|
2016-01-15 12:29:05 +01:00 |
|
kaetemi
|
f7d05ea8e4
|
VS2015 fixes for NeL Samples
--HG--
branch : develop
|
2016-01-15 12:22:35 +01:00 |
|
kaetemi
|
9a0c6290a2
|
Fix another VS2015 warning
--HG--
branch : develop
|
2016-01-15 12:07:33 +01:00 |
|
kaetemi
|
da02779588
|
More VS2015 fixes
--HG--
branch : develop
|
2016-01-15 12:04:06 +01:00 |
|
kaetemi
|
3632ae4e64
|
Fix VS2015 warnings
--HG--
branch : develop
|
2016-01-15 11:52:09 +01:00 |
|
kaetemi
|
9a477d976b
|
VS2015 compilation fixes
--HG--
branch : develop
|
2016-01-15 11:34:23 +01:00 |
|
kervala
|
fadb57ed00
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-15 10:47:37 +01:00 |
|
kervala
|
fd80a0f22d
|
Changed: Update WindowsSDK CMake module for VC++ 2015
--HG--
branch : develop
|
2016-01-15 10:46:34 +01:00 |
|
kervala
|
72c70dee6a
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-14 23:58:34 +01:00 |
|
kervala
|
9a34434cf8
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-14 23:58:04 +01:00 |
|
kervala
|
f54b41f5cc
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-14 23:54:26 +01:00 |
|
kervala
|
875224d277
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-14 23:53:17 +01:00 |
|
kervala
|
c1d8d4e400
|
Changed: Invert version and help checks
--HG--
branch : develop
|
2016-01-14 23:47:24 +01:00 |
|
kervala
|
c844a0bdd1
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-14 23:46:19 +01:00 |
|
kervala
|
563f92d27b
|
Fixed: Use language name in native language in config window
--HG--
branch : compatibility-develop
|
2016-01-14 22:42:34 +01:00 |
|
kervala
|
f820e7b703
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-14 21:28:47 +01:00 |
|
kervala
|
cb26d897ae
|
Fixed: Warning with clang
--HG--
branch : develop
|
2016-01-14 21:27:42 +01:00 |
|
kervala
|
27ae7dddf0
|
Fixed: Right directory under OS X
--HG--
branch : develop
|
2016-01-14 21:27:10 +01:00 |
|
kervala
|
7d9a8b28c8
|
Fixed: Don't display D3D page under Linux and OS X
--HG--
branch : develop
|
2016-01-14 21:26:47 +01:00 |
|
kervala
|
b7fe07d781
|
Improve CCmdArgs (a generic command line parser in NeL Misc), fixes #257
--HG--
branch : develop
|
2016-01-14 21:26:10 +01:00 |
|
kervala
|
7f5a9f4d91
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-14 10:22:22 +01:00 |
|
kervala
|
c8c563807d
|
Fixed: Compilation under OS X
--HG--
branch : develop
|
2016-01-14 10:21:50 +01:00 |
|
kervala
|
3c4f324bfe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-13 20:05:06 +01:00 |
|
kervala
|
bcb1aa242d
|
Fixed: Use map for faster search for example (implemented a TODO of GUIGUI)
--HG--
branch : develop
|
2016-01-13 20:04:01 +01:00 |
|
kervala
|
ea8edd1e6a
|
Changed: Replace \\ by /
--HG--
branch : develop
|
2016-01-13 20:02:24 +01:00 |
|
kervala
|
3bb45d4f2b
|
Fixed: Remove some hardcoded paths and replaced them by LeveldesignDataPath variable
--HG--
branch : develop
|
2016-01-13 20:01:36 +01:00 |
|
kervala
|
57f216dc3e
|
Changed: Expand environment variables in paths read from cfg files
--HG--
branch : develop
|
2016-01-13 19:59:09 +01:00 |
|
kervala
|
bd5f838d6d
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-13 19:54:23 +01:00 |
|
kervala
|
d0c587e445
|
Changed: Remove duplicate lines
--HG--
branch : develop
|
2016-01-13 19:53:20 +01:00 |
|
kervala
|
a4dd37efc9
|
Changed: Try different alternative paths for game folders
--HG--
branch : develop
|
2016-01-13 19:52:58 +01:00 |
|
kervala
|
6a3292c600
|
Fixed: Convert .bank filenames with / and use existing CFile::fileExists
--HG--
branch : develop
|
2016-01-13 19:51:00 +01:00 |
|
kervala
|
e1c14db5a0
|
Fixed: getLastSeparator should return std::string::size_type instead of an integer
--HG--
branch : develop
|
2016-01-13 19:47:35 +01:00 |
|
kervala
|
a66fa8cc9c
|
Changed: Implement CPath::isAbsolutePath
--HG--
branch : develop
|
2016-01-13 19:46:27 +01:00 |
|
kervala
|
af9610328f
|
Changed: Implement expandEnvironmentVariables function
--HG--
branch : develop
|
2016-01-13 19:45:02 +01:00 |
|
kervala
|
ad36e59a71
|
Fixed: Save filenames in .bank with / instead of system separator
--HG--
branch : develop
|
2016-01-13 19:43:46 +01:00 |
|
kervala
|
df816b2a5d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-12 22:32:22 +01:00 |
|
kervala
|
6ec0ab01cf
|
Changed: Init CLoginProgressPostThread only if InstallStatsUrl is defined
--HG--
branch : develop
|
2016-01-12 22:31:06 +01:00 |
|
kervala
|
49ef5a1ed7
|
Fixed: lua_tointeger doesn't work if value has a decimal part and returns 0
--HG--
branch : develop
|
2016-01-12 22:21:38 +01:00 |
|
kervala
|
f3a971fc21
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-11 13:53:32 +01:00 |
|
kervala
|
7104a6cb29
|
Fixed: Wrong directory
--HG--
branch : develop
|
2016-01-11 13:53:01 +01:00 |
|
kervala
|
9a342f7acf
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-11 12:55:47 +01:00 |
|
kervala
|
fc5e6ca982
|
Fixed: Error when signing bundle
--HG--
branch : develop
|
2016-01-11 12:55:09 +01:00 |
|
kervala
|
6471fada97
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-11 11:44:44 +01:00 |
|
kervala
|
59c06630cd
|
Changed: Table keys are integers
--HG--
branch : develop
|
2016-01-11 11:43:59 +01:00 |
|
kervala
|
839928a57a
|
Fixed: In Lua, all integers are numbers and numbers can be converted to integers
--HG--
branch : develop
|
2016-01-11 11:34:32 +01:00 |
|
kervala
|
4c5de7f9b7
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-11 10:09:58 +01:00 |
|
kervala
|
d375038175
|
Fixed: Ryzom Configuration under OS X
--HG--
branch : develop
|
2016-01-11 10:09:10 +01:00 |
|
Nimetu
|
e44e131365
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-10 16:34:13 +02:00 |
|
Nimetu
|
ad8059c345
|
Fixed: Invalid image width/height on error
--HG--
branch : develop
|
2016-01-10 16:33:42 +02:00 |
|
kervala
|
63983cd5ac
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-10 12:13:59 +01:00 |
|
kervala
|
bb3726fd46
|
Fixed: Compilation of object_viewer_widget in static under Linux
--HG--
branch : develop
|
2016-01-10 12:12:50 +01:00 |
|
kervala
|
de5b3b478f
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-09 19:42:29 +01:00 |
|
kervala
|
fe40e9e6b7
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-09 19:41:45 +01:00 |
|
kervala
|
4ca5d07360
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-09 19:32:59 +01:00 |
|
kervala
|
93c6f521c5
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-09 19:32:20 +01:00 |
|
kervala
|
b1b5e87fe1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-09 18:10:49 +01:00 |
|
kervala
|
f10060eaa1
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-09 18:10:16 +01:00 |
|
kervala
|
343278c586
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-09 17:17:59 +01:00 |
|
kervala
|
688076e056
|
Changed: Enable new LZMA SDK code
--HG--
branch : develop
|
2016-01-09 17:17:24 +01:00 |
|
kervala
|
1a3f5729fe
|
Changed: Update LZMA SDK to latest version
--HG--
branch : develop
|
2016-01-09 17:15:31 +01:00 |
|
kervala
|
ef8c8d0401
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-09 16:32:59 +01:00 |
|
kervala
|
c81301ca30
|
Changed: Don't need to extract the original filename
--HG--
branch : develop
|
2016-01-09 16:31:36 +01:00 |
|
kervala
|
3af2813fbf
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-09 16:29:59 +01:00 |
|
kervala
|
9dc7f5102b
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-09 16:08:34 +01:00 |
|
kervala
|
4e4f19f809
|
Changed: Replace strlwr by toLower
--HG--
branch : develop
|
2016-01-09 16:07:38 +01:00 |
|
kervala
|
14f48d821a
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-09 15:57:20 +01:00 |
|
kervala
|
9ee32071d8
|
Fixed: Compilation under Linux
--HG--
branch : develop
|
2016-01-09 15:56:50 +01:00 |
|
kervala
|
cc0174e800
|
Changed: Moved 7z/lzma code in login_patch_seven_zip.cpp
Fixed: Updated code to work with new versions of LZMA SDK
--HG--
branch : develop
|
2016-01-09 15:53:25 +01:00 |
|
kervala
|
3f4a5010f6
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-07 17:41:02 +01:00 |
|
kervala
|
54ee3d79e9
|
Changed: Minor change
--HG--
branch : develop
|
2016-01-07 17:40:19 +01:00 |
|
kervala
|
9e8cd07e4b
|
Changed: HAVE_X86_64 is defined or not
--HG--
branch : develop
|
2016-01-07 17:39:53 +01:00 |
|
kervala
|
51ec04b761
|
Changed: Added VideoMemory variable in cfg to force video memory to use (useful if Ryzom can't detect the correct amount of video memory or when using several clients at once)
--HG--
branch : develop
|
2016-01-07 17:39:11 +01:00 |
|
kervala
|
b3a392d559
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-07 17:36:17 +01:00 |
|
kervala
|
45367135d5
|
Changed: Entraîneur instead of Moniteur
--HG--
branch : compatibility-develop
|
2016-01-07 15:33:46 +01:00 |
|
Nimetu
|
511a004827
|
Fixed: Wrong DD indent in nested list when tag is not closed
--HG--
branch : develop
|
2016-01-07 01:00:48 +02:00 |
|
kervala
|
ef29c2b5ef
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-06 23:22:57 +01:00 |
|
kervala
|
d494f00ab6
|
Fixed: Compilation with dynamic version of Qt 5
--HG--
branch : develop
|
2016-01-06 23:22:01 +01:00 |
|
kervala
|
76dece0ec2
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-06 23:21:38 +01:00 |
|
kervala
|
59aff6a4bc
|
Changed: Added more fromString tests
--HG--
branch : develop
|
2016-01-06 23:21:22 +01:00 |
|
kervala
|
245726f347
|
Changed: Don't need to use system API, NeL already has equivalent
--HG--
branch : develop
|
2016-01-06 23:20:40 +01:00 |
|
kervala
|
c09476ec03
|
Fixed: Servers compilation
--HG--
branch : develop
|
2016-01-06 23:19:34 +01:00 |
|
kervala
|
ad3df5084a
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-06 16:06:23 +01:00 |
|
kervala
|
8756ba6ebc
|
Changed: Link to Qt5WinExtras under Windows
--HG--
branch : develop
|
2016-01-06 16:05:36 +01:00 |
|
kervala
|
834fcbe8c8
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-06 16:03:39 +01:00 |
|
kervala
|
0e74c167cd
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-06 16:03:20 +01:00 |
|
kervala
|
592bb16c11
|
Fixed: Warnings with GCC
--HG--
branch : develop
|
2016-01-06 16:03:04 +01:00 |
|
kervala
|
ea5b041844
|
Fixed: Compilation with Qt 4
--HG--
branch : develop
|
2016-01-06 16:01:53 +01:00 |
|
kervala
|
ddba3e583c
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-06 13:22:47 +01:00 |
|
kervala
|
ecb47bc2dc
|
Changed: Remove unused variable
--HG--
branch : develop
|
2016-01-06 13:21:47 +01:00 |
|
kervala
|
0ef79083a0
|
Changed: Code simplification
--HG--
branch : develop
|
2016-01-06 13:19:48 +01:00 |
|
kervala
|
80ae07c8b3
|
Changed: Minor changes
--HG--
branch : develop
|
2016-01-06 13:17:07 +01:00 |
|
kervala
|
f0bfd6264e
|
Fixed: Big endian number
--HG--
branch : develop
|
2016-01-06 13:15:01 +01:00 |
|
kervala
|
92fe9a6554
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-06 13:14:29 +01:00 |
|
kervala
|
a53ff71469
|
Changed: Replace strlwr by toLower
--HG--
branch : develop
|
2016-01-06 13:05:49 +01:00 |
|
kervala
|
f323974dba
|
Changed: Don't fix files within panoply_maker, use textures_optimizer (but checks can be enabled)
--HG--
branch : develop
|
2016-01-06 12:43:57 +01:00 |
|