Commit graph

6405 commits

Author SHA1 Message Date
kervala
9aea637643 Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 10:19:01 +01:00
kervala
e2cc9e622e Changed: Minor changes
--HG--
branch : develop
2016-01-23 10:18:23 +01:00
kervala
19aa093ea8 Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs
--HG--
branch : develop
2016-01-23 10:18:09 +01:00
kervala
93e1289a77 Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..)
--HG--
branch : develop
2016-01-23 09:44:41 +01:00
kervala
cf414d8c14 Merge with develop
--HG--
branch : compatibility-develop
2016-01-21 15:07:14 +01:00
kervala
963892913f Fixed: Crash in backup service
--HG--
branch : develop
2016-01-21 15:06:40 +01:00
kervala
f5a60e3a60 Fixed: Don't install static libraries if not defining WITH_INSTALL_LIBRARIES
--HG--
branch : develop
2016-01-21 15:06:01 +01:00
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
58a8269cd8 Changed: Allow to specify code path and use egrep
--HG--
branch : develop
2016-01-21 10:04:59 +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
e2c7127f84 Changed: Use egrep because grep syntax different under OS X
--HG--
branch : compatibility-develop
2016-01-20 13:50:46 +01:00
kervala
9059709265 Changed: Updated script to get Ryzom version
--HG--
branch : compatibility-develop
2016-01-20 13:21:51 +01: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
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