Commit graph

7779 commits

Author SHA1 Message Date
Nimetu
30512804d5 Merge with develop
--HG--
branch : compatibility-develop
2017-07-12 21:23:08 +03:00
Nimetu
7350291a56 Added: Text search to inventory
--HG--
branch : develop
2017-07-12 21:19:40 +03:00
Nimetu
455a923031 Added: clear_on_escape property to edit box
--HG--
branch : develop
2017-07-12 20:32:42 +03:00
Nimetu
71d969c40b Changed: Keep track of HSTS header and rewrite http to https as needed
--HG--
branch : develop
2017-07-11 22:23:38 +03:00
Guillaume Dupuy
63138ba784 Use correct comparison between enum
Was previously (badly) relying on int as boolean behaviour
Solves a bug where remove slot was not working with headdress (value 0 in enum TSlotEquipment)

--HG--
branch : develop
2017-07-11 00:27:04 +02:00
kervala
105c95f71b Added tag ryzom-patch-3.2.0 for changeset 4036ecf59e83
--HG--
branch : compatibility-develop
2017-07-10 09:45:30 +02:00
Meelis Mägi
cdf648fd4f Merged in Glorf/ryzomcore/fix_item_group_08072017 (pull request )
Minor item group fixes :

--HG--
branch : develop
2017-07-08 19:20:02 +00:00
Guillaume Dupuy
bc17b5eb1a Don't add multiples identical items to a group
Solves the issue where 2 hand weapon were not properly equipped

--HG--
branch : fix_item_group_08072017
2017-07-08 14:55:18 +02:00
Guillaume Dupuy
59ce9437c8 Swap item serial and create time properties when swapping items
--HG--
branch : fix_item_group_08072017
2017-07-08 13:43:51 +02:00
Nimetu
9a3a352142 Changed: Refactor curl certificate loading (issue )
--HG--
branch : develop
2017-07-04 00:34:11 +03:00
Nimetu
cb65c89d19 Fixed: Clean up dyn bubbles from chat/webig to prevent crash after character change.
--HG--
branch : compatibility-develop
2017-07-03 21:54:35 +03:00
Nimetu
368e1389f2 Fixed: Clean up dyn bubbles from chat/webig to prevent crash after character change.
--HG--
branch : develop
2017-07-03 21:54:35 +03:00
karu
0dfd5af8b3 Added: Load Certificates from Windows into OpenSSL for HTTPS (issue )
--HG--
branch : develop
2017-07-01 21:25:19 +03:00
kervala
feff7422d2 Merge with develop
--HG--
branch : compatibility-develop
2017-06-30 09:45:32 +02:00
kervala
6cd0f9dbd2 Added tag ryzom-patch-3.1.0-april_patch for changeset 043aaeb3d8a2
--HG--
branch : develop
2017-06-30 09:41:06 +02:00
Nuno Gonçalves
648e3ba184 Fixed: update color instead status
--HG--
branch : compatibility-develop
2017-06-27 14:38:08 +02:00
Nuno Gonçalves
c9c0cbe88f Added: New icon for new lock-loot system (in test on yubo)
--HG--
branch : compatibility-develop
2017-06-23 20:13:38 +02:00
kervala
627cec783c Merge with develop
--HG--
branch : compatibility-develop
2017-06-23 17:20:41 +02:00
kervala
d39f91d5d3 Fixed: Compilation under GCC 4.8.4
--HG--
branch : develop
2017-06-23 17:20:21 +02:00
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 )
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