Commit graph

5933 commits

Author SHA1 Message Date
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
Cédric OCHS
cda8c650a5 Merged in zerotacg/ryzomcore/issue/fix-failing-unit-tests (pull request #132)
fix failing unit tests

--HG--
branch : develop
2016-01-17 20:22:16 +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
Cédric OCHS
c7c159a79a Merged in zerotacg/ryzomcore/feature/enable-unit-tests-for-travis-ci (pull request #131)
run unit tests on travis ci

--HG--
branch : develop
2016-01-17 13:40:25 +01:00
Tobias Peters
f1d0b1b870 Merged github:zerotacg/ryzomcore/feature/enable-unit-tests-for-travis-ci
--HG--
branch : feature/enable-unit-tests-for-travis-ci
2016-01-17 13:36:40 +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
Cédric OCHS
47087e3d22 Merged in zerotacg/ryzomcore/feature-build-with-all-lua-versions (pull request #130)
build travis ci with each lua version enabled

--HG--
branch : develop
2016-01-17 10:37:21 +01:00
Tobias Peters
ae2bdb14b6 Merged github:zerotacg/ryzomcore/feature/build-with-all-lua-versions
--HG--
branch : feature-build-with-all-lua-versions
2016-01-17 08:27:17 +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
f068c6ff66 Fixed: Removed tab
--HG--
branch : develop
2016-01-16 20:56:00 +01:00
kervala
f84b7f781a Fixed: Travis-ci config syntax
--HG--
branch : develop
2016-01-16 19:37:28 +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