Nimetu
655dee03b4
Merge with develop
...
--HG--
branch : compatibility-develop
2017-07-23 22:54:14 +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
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
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
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
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
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
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
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
087958eb6c
Merge with develop
...
--HG--
branch : compatibility-develop
2017-06-01 14:06:04 +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
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
9d01b4dfd8
Merge: with develop
...
--HG--
branch : compatibility-develop
2017-05-14 19:07:54 +02:00
Riasan
28b4474ae4
Changed: Add a new gui window web_lua_action
...
--HG--
branch : develop
2017-05-12 19:29:10 +02: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
eb23a3b61c
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-25 00:23:09 +03:00
kervala
d0a199d22d
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-21 11:06:24 +02:00
kervala
4a848b0771
Changed: Centralize Foundation framework search
...
--HG--
branch : develop
2017-04-21 11:04:09 +02:00
Nimetu
108759952e
Changed: Use http cache headers for image cache
...
--HG--
branch : develop
2017-04-20 21:19:51 +03:00
kervala
0845ebb5bd
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-20 09:11:30 +02:00
Guillaume Dupuy
9586e39ca4
Use stdpch.h instead for include
...
--HG--
branch : fix_compilation_windows
2017-04-19 09:53:27 +02:00
Guillaume Dupuy
5b3eed58ec
Fix server compilation under windows
...
--HG--
branch : fix_compilation_windows
2017-04-18 20:15:14 +02:00
Nimetu
8f5588e0ec
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-16 22:45:39 +03:00