Commit graph

22588 commits

Author SHA1 Message Date
Nimetu
afd4e964e3 Fixed: Path to NeL test files
--HG--
branch : develop
2017-08-31 11:53:44 +03:00
ulukyn@gmail.com
27364b29d2 Added: loadBackground(string) lua function to change the texture of next teleport
--HG--
branch : compatibility-develop
2017-08-22 23:23:00 +02:00
ulukyn@gmail.com
3c6dc5ea92 Added: loadBackground(string) lua function to change the texture of next teleport
--HG--
branch : develop
2017-08-22 23:23:00 +02:00
ulukyn@gmail.com
b640c0ce97 Fixed: Resize collision when scale object/npc (using vpb)
--HG--
branch : compatibility-develop
2017-08-22 23:22:06 +02:00
ulukyn@gmail.com
5797b2d64e Fixed: Resize collision when scale object/npc (using vpb)
--HG--
branch : develop
2017-08-22 23:22:06 +02:00
Nimetu
37d6dc50f0 Merge with develop
--HG--
branch : compatibility-develop
2017-08-15 12:39:25 +03:00
Nimetu
9390f9cca5 Changed: Sort tribe fame list
--HG--
branch : develop
2017-08-15 11:54:24 +03:00
Nimetu
655dee03b4 Merge with develop
--HG--
branch : compatibility-develop
2017-07-23 22:54:14 +03:00
Nimetu
d6faf81c81 Changed: Ignore cache status when local file has been deleted
--HG--
branch : develop
2017-07-23 22:50:14 +03:00
Nimetu
8300821d0e Changed: Minor fix for mouseover image
--HG--
branch : develop
2017-07-23 22:40:07 +03:00
Nimetu
e35195252f Changed: Fix issue with table background images not displaying
--HG--
branch : develop
2017-07-23 21:37:42 +03:00
Cédric OCHS
36f5ee7f83 Merged in Glorf/ryzomcore/fix_freespace_check (pull request #156)
Fix ignoreFreeDiskSpaceChecks() usage

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

--HG--
branch : develop
2017-07-15 10:26:50 +00:00
Guillaume Dupuy
d163cde51e Fix ignoreFreeDiskSpaceChecks() usage
Now actually ignore free space, instead of creating an error and refusing to go further everytime

--HG--
branch : fix_freespace_check
2017-07-15 12:14:33 +02:00
Cédric OCHS
1fec1425da Merged in Glorf/ryzomcore/fix_freespace_check (pull request #155)
Fix issue #302 - incorrect freespace on 32 bits system

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

--HG--
branch : develop
2017-07-14 12:53:32 +00:00
Guillaume Dupuy
9172d14dd3 Fix issue #302 - incorrect freespace on 32 bits system
--HG--
branch : fix_freespace_check
2017-07-14 14:49:27 +02:00
kervala
b349fe3c77 Merge with develop
--HG--
branch : compatibility-develop
2017-07-13 22:53:42 +02:00
kervala
524a3d6645 Fixed: Description of "delete profile" action (all files are really deleted)
--HG--
branch : develop
2017-07-13 22:53:20 +02:00
kervala
bee1a57ab9 Merge with develop
--HG--
branch : compatibility-develop
2017-07-13 21:00:17 +02:00
kervala
36bd31c809 Changed: Update Ryzom version to 3.2.1
--HG--
branch : compatibility-develop
2017-07-13 20:59:42 +02:00
kervala
dac136d430 Fixed: Error 60 when creating an account under OS X
--HG--
branch : develop
2017-07-13 20:54:06 +02:00
Nimetu
527d257b93 Merge with develop
--HG--
branch : compatibility-develop
2017-07-12 23:46:23 +03:00
Nimetu
c435f77201 Added: Quality range filter to inventory
--HG--
branch : develop
2017-07-12 23:45:56 +03:00
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 #154)
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 #314)
--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 #314)
--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