Commit graph

22647 commits

Author SHA1 Message Date
kervala
a728f3b73e Merge with develop
--HG--
branch : compatibility-develop
2017-06-23 16:59:21 +02:00
kervala
1aa708c4de Fixed: Compilation under GCC 4.8.4
--HG--
branch : develop
2017-06-23 16:58:51 +02:00
kervala
cb55615659 Merge with develop
--HG--
branch : compatibility-develop
2017-06-20 12:31:31 +02:00
kervala
de8a6ba1b5 Fixed: Warnings with clang
--HG--
branch : develop
2017-06-20 12:28:46 +02:00
kervala
50cfe0ff7c Changed: No need to use -DWITH_SYMBOLS=ON
--HG--
branch : develop
2017-06-20 12:28:22 +02:00
kervala
0d12fe5604 Fixed: Case of CMake Freetype module
--HG--
branch : develop
2017-06-20 12:27:05 +02:00
Riasan
abe569ce51 Changed: increased RYZOM_VERSION_MINOR for comming client Patch
--HG--
branch : compatibility-develop
2017-06-19 21:46:53 +02:00
Nimetu
2b7dac4450 Merge with develop
--HG--
branch : compatibility-develop
2017-06-08 22:38:03 +03:00
Nimetu
e956f69691 Changed: Enable fps view on game config window
--HG--
branch : develop
2017-06-08 22:37:19 +03:00
Nimetu
e0ab70ca82 Fixed: Correctly expire object if file is removed from cache.
--HG--
branch : develop
2017-06-08 22:37:19 +03:00
Nimetu
f80c8e7d81 Added: Image mouseover effect
--HG--
branch : develop
2017-06-08 22:37:19 +03:00
Nimetu
c6a0b3ed9b Added: Show image tooltips even if not inside link
--HG--
branch : develop
2017-06-08 22:37:19 +03:00
Nimetu
087958eb6c Merge with develop
--HG--
branch : compatibility-develop
2017-06-01 14:06:04 +03:00
Nimetu
9394906182 Added: -ryzom-modulate-color style to enable modulation with global color
--HG--
branch : develop
2017-06-01 13:51:32 +03:00
kishan_grimout
5ea48c7599 fix crash in EGS when client asks to create an item with a sheet ID EGS doesn't know
by avoiding access the null item pointer outside the if(null) scope.

--HG--
branch : develop
2017-05-29 16:15:02 +02:00
Riasan
1760d16dd2 Fix: Typo by forceCameraFirstPerson
--HG--
branch : compatibility-develop
2017-05-23 21:59:28 +02:00
Riasan
8b4d189c31 Changed: edit force_camera_fp command
--HG--
branch : develop
2017-05-23 19:38:26 +02:00
Riasan
2dbcb978a4 Changed: edit force_camera_fp command
--HG--
branch : compatibility-develop
2017-05-23 19:38:26 +02:00
Riasan
6fb823a9be Merge with develop
--HG--
branch : compatibility-develop
2017-05-23 18:27:52 +02:00
Riasan
319cab93cd Fixed: force_camera_fp command
--HG--
branch : develop
2017-05-23 18:24:49 +02:00
Riasan
18823c28fa Changed: Add new lua command force_camera_fp to force camarea to first person view
--HG--
branch : develop
2017-05-22 19:50:47 +02:00
Cédric OCHS
603b0e6a84 Merged in Glorf/ryzomcore/fix_item_group (pull request #153)
Fix an issue where item in groups could not be moved

Approved-by: Cédric OCHS <kervala@gmail.com>

--HG--
branch : develop
2017-05-21 18:37:19 +00:00
Guillaume Dupuy
7e1556520f Fix an issue where item in groups could not be moved
Multiple group move would result in some item beeing incorrectly marked as equipped

--HG--
branch : fix_item_group
2017-05-21 19:32:08 +02:00
Riasan
cfc1951be6 Merge
--HG--
branch : compatibility-develop
2017-05-14 19:10:13 +02:00
Riasan
9d01b4dfd8 Merge: with develop
--HG--
branch : compatibility-develop
2017-05-14 19:07:54 +02:00
Nimetu
fcbdbd17b7 Merge with develop
--HG--
branch : compatibility-develop
2017-05-14 01:27:20 +03:00
Nimetu
6c01ded28d Fixed: Redirect for image requests
--HG--
branch : develop
2017-05-14 01:03:49 +03:00
Riasan
28b4474ae4 Changed: Add a new gui window web_lua_action
--HG--
branch : develop
2017-05-12 19:29:10 +02:00
Nimetu
bb3b7e8277 Merge with develop
--HG--
branch : compatibility-develop
2017-05-04 10:35:43 +03:00
Nimetu
4f0717c58a Fixed: Image cookies
--HG--
branch : develop
2017-05-04 10:26:22 +03:00
Nimetu
b8a3405ad7 Merge with develop
--HG--
branch : compatibility-develop
2017-05-03 20:53:28 +03:00
Nimetu
3752884a91 Changed: Add next weather tooltip to ingame map
--HG--
branch : develop
2017-05-03 20:52:02 +03:00
Nimetu
753d9efccb Changed: Add humidity to ingame map
--HG--
branch : develop
2017-05-03 20:52:02 +03:00
Nimetu
e06f8b0976 Changed: Add minutes to ingame map
--HG--
branch : develop
2017-05-03 20:52:02 +03:00
Nimetu
5f8fc673d1 Merge with develop
--HG--
branch : compatibility-develop
2017-05-01 13:18:58 +03:00
kervala
5e27fe01f1 Changed: Updated translations (mostly UTF-16 -> UTF-8 conversion and use of UNIX EOL)
--HG--
branch : compatibility-develop
2017-04-28 13:05:25 +02:00
Nimetu
082704210b Merge with develop
--HG--
branch : compatibility-develop
2017-04-26 08:55:00 +03:00
Nimetu
a47a481c7a Changed: Force max table width if requested.
--HG--
branch : develop
2017-04-26 08:53:02 +03:00
Nimetu
bff8ed488e Changed: CGroupParagraph does not handle text with line-breaks
--HG--
branch : develop
2017-04-25 12:18:53 +03:00
Nimetu
eb23a3b61c Merge with develop
--HG--
branch : compatibility-develop
2017-04-25 00:23:09 +03:00
kervala
f739ed9e62 Merge with develop
--HG--
branch : compatibility-develop
2017-04-22 18:19:33 +02:00
kervala
532a81f5cb Changed: Don't use CSString
--HG--
branch : develop
2017-04-22 18:16:27 +02:00
kervala
e94b06066f Fixed: LibXml must be initialized only once and xmlSetGenericErrorFunc set a global function (calling it for each instance of CIXml is a mistake)
--HG--
branch : develop
2017-04-22 18:15:43 +02:00
kervala
d0a199d22d Merge with develop
--HG--
branch : compatibility-develop
2017-04-21 11:06:24 +02:00
kervala
21ca659c70 Changed: More information for osxcross
--HG--
branch : develop
2017-04-21 11:05:57 +02:00
kervala
4a848b0771 Changed: Centralize Foundation framework search
--HG--
branch : develop
2017-04-21 11:04:09 +02:00
kervala
8dca705f73 Fixed: Misc depends on Carbon under OS X
--HG--
branch : develop
2017-04-21 11:03:39 +02:00
Nimetu
108759952e Changed: Use http cache headers for image cache
--HG--
branch : develop
2017-04-20 21:19:51 +03:00
Nimetu
3d09dd2094 Changed: Save cookies from image request
--HG--
branch : develop
2017-04-20 21:19:01 +03:00
Nimetu
3d48368de6 Changed: Workaround for dancing trees under direct3d (issue #160)
--HG--
branch : develop
2017-04-23 20:01:35 +03:00