Commit graph

5941 commits

Author SHA1 Message Date
Nimetu
6a01e0c28b Merge with develop 2016-01-20 19:15:45 +02:00
Nimetu
5c3e84cf1b Changed: Use url from <base> element for relative urls 2016-01-20 19:15:20 +02:00
kervala
b4e4f87b9b Changed: Use egrep because grep syntax different under OS X 2016-01-20 13:50:46 +01:00
kervala
aea1dbb292 Changed: Updated script to get Ryzom version 2016-01-20 13:21:51 +01:00
kervala
ce54eb820f Changed: Ryzom version 2.9.0 (stable version will be 3.0.0) 2016-01-20 13:08:23 +01:00
kervala
d1fea8d771 Merge with develop 2016-01-20 13:06:47 +01:00
kervala
16a6f7b271 Changed: Use a different original filename for DEV version 2016-01-20 13:06:15 +01:00
kervala
4e1f03e920 Fixed: Compilation in 64 bits under Windows 2016-01-20 13:05:55 +01:00
kervala
d8986e4fe3 Merge with develop 2016-01-19 20:42:11 +01:00
kervala
b31816911a Changed: Removed fromString(const char *, ...) because useless 2016-01-19 20:41:41 +01:00
kervala
c00a1608ec Changed: Local includes against system includes 2016-01-19 20:38:05 +01:00
kervala
5dfd931cf8 Fixed: Compilation without PCH 2016-01-19 20:37:03 +01:00
kervala
28365d4012 Removed: Binary file generated by VC++ 2016-01-19 20:35:59 +01:00
kervala
40617b1f70 Fixed: Some unit tests with fromString 2016-01-19 13:12:53 +01:00
kervala
28d81f9e4e Changed: Updated translations 2016-01-19 09:17:09 +01:00
kervala
9f22359d02 Merge with develop 2016-01-18 21:48:31 +01:00
kervala
655e105d71 Fixed: Updated with new changes 2016-01-18 21:48:00 +01:00
kervala
1c791785f6 Merge with develop 2016-01-18 21:32:01 +01:00
kervala
58d7c95b05 Changed: Minor changes 2016-01-18 21:31:23 +01:00
kervala
eb30647103 Changed: Remove hardcoded L:\\primitives\\ from C++ code (use RYZOM_LEVELDESIGN environment varianle instead) 2016-01-18 21:31:10 +01:00
kervala
3000ae7cdf Changed: Only add search paths that exist 2016-01-18 21:29:43 +01:00
kervala
4f8aa63f78 Changed: Improved CCmdArgs 2016-01-18 21:22:57 +01:00
kervala
53fb7f39f4 Changed: Don't need to create it on heap 2016-01-18 13:27:48 +01:00
kervala
1641e48be0 Fixed: Import static platform plugin 2016-01-18 13:27:23 +01:00
kaetemi
e7b977c780 Faster Qt startup 2016-01-18 11:27:14 +01:00
Cédric OCHS
b9fd5bc3a3 Merged in zerotacg/ryzomcore/issue/fix-failing-unit-tests (pull request #132)
fix failing unit tests
2016-01-17 20:22:16 +01:00
kervala
6dba74ba53 Changed: Remove InstallStatsUrl in client_default.cfg 2016-01-17 20:16:18 +01:00
Tobias Peters
6359017dce Merged github:zerotacg/ryzomcore/issue/fix-failing-unit-tests 2016-01-17 20:05:02 +01:00
Cédric OCHS
a1760b4696 Merged in zerotacg/ryzomcore/feature/enable-unit-tests-for-travis-ci (pull request #131)
run unit tests on travis ci
2016-01-17 13:40:25 +01:00
Tobias Peters
923d79b347 Merged github:zerotacg/ryzomcore/feature/enable-unit-tests-for-travis-ci 2016-01-17 13:36:40 +01:00
kervala
25f98dbca8 Merge with develop 2016-01-17 13:24:01 +01:00
kervala
9ff0f99cea Fixed: Compilation with static Qt 5 2016-01-17 13:23:25 +01:00
kervala
d42d285958 Fixed: Typo in Lua 5.3 module 2016-01-17 13:21:27 +01:00
Cédric OCHS
c440e086db Merged in zerotacg/ryzomcore/feature-build-with-all-lua-versions (pull request #130)
build travis ci with each lua version enabled
2016-01-17 10:37:21 +01:00
Tobias Peters
a964f49c9f Merged github:zerotacg/ryzomcore/feature/build-with-all-lua-versions 2016-01-17 08:27:17 +01:00
kervala
0a77dfbd5a Merge with develop 2016-01-16 23:50:23 +01:00
kervala
06f72437e2 Fixed: Right directories 2016-01-16 23:49:39 +01:00
kervala
2355f81fbd Fixed: Missing ++ 2016-01-16 23:48:44 +01:00
kervala
1cc7c18f1a Changed: Set CMP0020 NEW in root project 2016-01-16 23:48:32 +01:00
kervala
8124033e69 Changed: Minor changes 2016-01-16 23:47:58 +01:00
kervala
852da988fe Added: Config file for translation_tools 2016-01-16 23:47:12 +01:00
kervala
66c8dcab61 Fixed: Use lua_tointeger under Lua 5.2 and prior versions 2016-01-16 21:35:34 +01:00
kervala
6b59d3dfe6 Fixed: Removed tab 2016-01-16 20:56:00 +01:00
kervala
77d4cccc8e Fixed: Travis-ci config syntax 2016-01-16 19:37:28 +01:00
kervala
c0e1abd41d Merge with develop 2016-01-16 15:58:19 +01:00
kervala
45a3bf320e Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals 2016-01-16 15:55:56 +01:00
kervala
5c0fcc5cfc Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 2016-01-16 15:54:46 +01:00
kervala
9ba7bcf720 Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 2016-01-16 15:52:51 +01:00
kervala
bdcfa10c66 Fixed: Link to X11 under Linux 2016-01-16 15:50:45 +01:00
kervala
12bf13239c Fixed: Link to static libxml2 under Linux 2016-01-16 15:50:17 +01:00